Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16:/tmp/cvs-serv22272/include
Modified Files:
data.h defs.h wlib.h
Log Message:
Yanked RACE_COLOR define, this is standard now.
Moved color defines to a common area (defs.h).
Added new color to colortable for God messages (default is white).
Added all color settings to netrekrc, and added them to the in game
save function. The settings in netrekrc are to the "bright" color settings,
as players seem to prefer these.
Bug fix with phaser misses (check to make sure x,y less than GWIDTH)
Index: wlib.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wlib.h 5 Apr 2007 12:57:22 -0000 1.11
+++ wlib.h 11 Apr 2007 23:06:31 -0000 1.12
@@ -55,9 +55,8 @@
extern W_Font W_BigFont, W_RegularFont, W_UnderlineFont, W_HighlightFont,
W_IndyFont;
extern W_Color W_White, W_Black, W_Red, W_Green, W_Yellow, W_Cyan, W_Grey;
-#ifdef RACE_COLORS
-extern W_Color W_Ind, W_Fed, W_Rom, W_Kli, W_Ori;
-#endif
+extern W_Color W_God, W_Ind, W_Fed, W_Rom, W_Kli, W_Ori;
+
extern int W_Textwidth, W_Textheight;
extern int W_FastClear;
extern W_Font W_MyPlanetFont, W_FriendlyPlanetFont, W_EnemyPlanetFont;
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- defs.h 9 Apr 2007 02:52:30 -0000 1.21
+++ defs.h 11 Apr 2007 23:06:31 -0000 1.22
@@ -463,4 +463,20 @@
/* The maximum length of message in buffer */
#define MAX_MLENGTH 286
+/* Colors */
+#define WHITE 0
+#define BLACK 1
+#define RED 2
+#define GREEN 3
+#define YELLOW 4
+#define CYAN 5
+#define GREY 6
+#define C_GOD 7
+#define C_ROM 8
+#define C_KLI 9
+#define C_FED 10
+#define C_ORI 11
+#define C_IND 12
+#define COLORS 13
+
#endif /* _h_defs */
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- data.h 9 Apr 2007 02:52:30 -0000 1.74
+++ data.h 11 Apr 2007 23:06:31 -0000 1.75
@@ -364,6 +364,7 @@
extern W_Icon bmplanets[MPLANET_VIEWS];
extern W_Color borderColor, backColor, textColor, myColor, warningColor,
shipCol[5], rColor, yColor, gColor, unColor, foreColor;
+extern char *colornames[COLORS];
/* jn - SMARTMACRO */
extern char lastMessage[];