Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29199/include
Modified Files:
data.h proto.h
Log Message:
Following COW patch "50 fps, accept new UPS feature packet", client and server
now negotiate
a update rate. Default is 50, but it still works with older servers running at
10 fps.
Preliminary work on compiling with cygwin - added some headers for compile
purposes, a few new
Cygwin #ifdefs, 3 new cygwin makefiles that don't work yet (and probably never
will without outside
help).
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- data.h 22 Feb 2007 16:22:12 -0000 1.47
+++ data.h 23 Feb 2007 13:43:55 -0000 1.48
@@ -137,7 +137,9 @@
extern int old_rotate_deg;
#endif
-extern int updatesPerSec;
+extern int updatesPerSec; /* client requested updates per second */
+extern int server_ups; /* server responded updates per second */
+extern int server_fps; /* server configured frames per second */
extern int SBhours;
@@ -575,8 +577,6 @@
extern int portSwap;
#endif
-extern int fps;
-
// Load Ship Bitmaps from .BMP files
extern char *fed_ship_bmp;
extern char *rom_ship_bmp;
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- proto.h 21 Feb 2007 15:17:02 -0000 1.30
+++ proto.h 23 Feb 2007 13:43:55 -0000 1.31
@@ -27,7 +27,7 @@
void litedefaults (void);
void liteplanet (struct planet *l);
void liteplayer (struct player *j);
-makelite (struct distress * dist, char *pm);
+int makelite (struct distress * dist, char *pm);
/******************************************************************************/
/*** check.c
***/
@@ -95,8 +95,10 @@
char *getServerNick (char *srvName);
int getServerType (char *srvName);
#ifndef __BORLANDC__
+#ifndef CYGWIN
int strncmpi (char *str1, char *str2, int max);
#endif
+#endif
int booleanDefault (char *def, int preferred);
int intDefault (char *def, int preferred);
char *stringDefault (char *str);
_______________________________________________
netrek-cvs mailing list
[email protected]
http://mailman.us.netrek.org/mailman/listinfo/netrek-cvs
