Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25543/include
Modified Files:
data.h defs.h proto.h
Log Message:
Remove constant hockey_mode() calls with a single check on initial client connect, setting
new global bool playing_hockey.
Minor changes inspired by COW implementation of XP 2006 patches.
Map window, player redraw: cleared up some confusing references to lastUpdate, renamed
it a more fitting lastRedraw. Still needs testing once server is fixed regarding orbit/stationary
ship position updates.
Inlined SDB_lookup as it gets called more than any other function.
Made music and sound arrays static.
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defs.h 26 Feb 2007 06:54:48 -0000 1.12
+++ defs.h 28 Feb 2007 07:44:00 -0000 1.13
@@ -132,8 +132,6 @@
* to conquer the galaxy */
#define WARNTIME 30 /* Number of 1/10th seconds to have
* a warning on the screen */
-#define MESSTIME 30 /* Number of 1/10th seconds to have
- * a message on the screen */
/* These are server defined times */
#define REFITTIME 5 /* Number of seconds it takes
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- data.h 24 Feb 2007 10:19:54 -0000 1.49
+++ data.h 28 Feb 2007 07:44:00 -0000 1.50
@@ -544,7 +544,7 @@
extern struct s_line map_hockey_lines[NUM_HOCKEY_LINES + 1];
extern int showHockeyLinesLocal;
extern int showHockeyLinesMap;
-
+extern int playing_hockey;
#endif
#ifdef MULTILINE_MACROS
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- proto.h 26 Feb 2007 06:54:48 -0000 1.32
+++ proto.h 28 Feb 2007 07:44:00 -0000 1.33
@@ -165,7 +165,7 @@
void rotateTeams (void);
void drawTstats (void);
#ifdef HOCKEY_LINES
-int hockey_mode (void);
+void check_hockey_mode (void);
void init_hockey_lines (void);
#endif