Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/include
Modified Files:
bitmaps.h data.h defs.h
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defs.h 26 Apr 2006 02:04:24 -0000 1.5
+++ defs.h 29 Apr 2006 19:22:38 -0000 1.6
@@ -124,9 +124,10 @@
#define ROM 0x2
#define KLI 0x4
#define ORI 0x8
-#define ALLTEAM (FED|ROM|KLI|ORI)
-#define MAXTEAM (ORI)
-#define NUMTEAM 4
+#define IND 0x16
+#define ALLTEAM (FED|ROM|KLI|ORI|IND)
+#define MAXTEAM (IND)
+#define NUMTEAM 5
/* * These are random configuration variables */
#define VICTORY 3 /* Number of systems needed
* to conquer the galaxy */
Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bitmaps.h 21 Apr 2006 12:00:06 -0000 1.4
+++ bitmaps.h 29 Apr 2006 19:22:38 -0000 1.5
@@ -27,41 +27,11 @@
// Weapons
// -------
-#ifdef COLORIZE
-#define BMP_FED_TORP 1
-#define BMP_FED_TORP_DET 9
-#define BMP_FED_PLASMA 14
-#define BMP_FED_PLASMA_DET 22
-#define BMP_ORI_TORP 27
-#define BMP_ORI_TORP_DET 35
-#define BMP_ORI_PLASMA 40
-#define BMP_ORI_PLASMA_DET 48
-#define BMP_KLI_TORP 53
-#define BMP_KLI_TORP_DET 61
-#define BMP_KLI_PLASMA 66
-#define BMP_KLI_PLASMA_DET 74
-#define BMP_ROM_TORP 79
-#define BMP_ROM_TORP_DET 87
-#define BMP_ROM_PLASMA 92
-#define BMP_ROM_PLASMA_DET 100
-#define BMP_IND_TORP 105
-#define BMP_IND_TORP_DET 113
-#define BMP_IND_PLASMA 118
-#define BMP_IND_PLASMA_DET 126
+#define NUM_CTORP_TYPES 6
#define BMP_TORPDET_FRAMES 5
#define BMP_TORP_FRAMES 8
-#define BMP_TORP_WIDTH 5
-#define BMP_TORP_HEIGHT 5
-#define BMP_PLASMATORP_WIDTH 7
-#define BMP_PLASMATORP_HEIGHT 7
-
-#define BMP_TORPDET_WIDTH 9
-#define BMP_TORPDET_HEIGHT 9
-#define BMP_PLASMATORPDET_WIDTH 15
-#define BMP_PLASMATORPDET_HEIGHT 15
-#else /* COLORIZE */
#define BMP_EPLASMA 6
#define BMP_ETORP 7
#define BMP_MPLASMA 8
@@ -69,26 +39,33 @@
#define BMP_CLOUD 1
#define BMP_PLCLOUD 10
-#define BMP_TORPDET_FRAMES 5
-#define BMP_TORP_FRAMES 8
+#define BMP_PLASMAC 6
+#define BMP_TORPC 7
+#define BMP_MPLASMAC 8
+#define BMP_MTORPC 9
+#define BMP_CLOUDC 1
+#define BMP_PLCLOUDC 10
#define BMP_TORP_WIDTH 3
#define BMP_TORP_HEIGHT 3
+#define BMP_CTORP_WIDTH 5
+#define BMP_CTORP_HEIGHT 5
+#define BMP_TORPDET_WIDTH 8
+#define BMP_TORPDET_HEIGHT 8
+#define BMP_CTORPDET_WIDTH 9
+#define BMP_CTORPDET_HEIGHT 9
+
#define BMP_EPLASMA_WIDTH 7
#define BMP_EPLASMA_HEIGHT 7
#define BMP_MPLASMA_WIDTH 5
#define BMP_MPLASMA_HEIGHT 5
+#define BMP_PLASMATORPDET_WIDTH 13
+#define BMP_PLASMATORPDET_HEIGHT 13
+#define BMP_CPLASMATORP_WIDTH 7
+#define BMP_CPLASMATORP_HEIGHT 7
+#define BMP_CPLASMATORPDET_WIDTH 15
+#define BMP_CPLASMATORPDET_HEIGHT 15
-#define BMP_TORPDET_WIDTH 9
-#define BMP_TORPDET_HEIGHT 9
-#define BMP_PLASMATORPDET_WIDTH 15
-#define BMP_PLASMATORPDET_HEIGHT 15
-
-#define BMP_TORPDET_WIDTH 9
-#define BMP_TORPDET_HEIGHT 9
-#define BMP_PLASMATORPDET_WIDTH 15
-#define BMP_PLASMATORPDET_HEIGHT 15
-#endif /* COLORIZE */
// Miscellaneous
// ----------
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- data.h 27 Apr 2006 22:38:41 -0000 1.9
+++ data.h 29 Apr 2006 19:22:38 -0000 1.10
@@ -20,7 +20,6 @@
#define cloak_width 20
#define cloak_height 20
-#ifndef COLORIZE
#define etorp_width 3
#define etorp_height 3
#define eplasmatorp_width 7
@@ -29,7 +28,6 @@
#define mplasmatorp_height 5
#define mtorp_width 3
#define mtorp_height 3
-#endif
extern struct player *players;
extern struct player *me;
@@ -162,6 +160,7 @@
extern int shrinkPhaserOnMiss;
extern int colorClient;
extern int dynamicBitmaps;
+extern int colorWeapons;
extern int newDashboard, old_db;
extern int niftyNewMessages;
extern int fastQuit;
@@ -239,17 +238,24 @@
extern W_Icon expview[BMP_SHIPEXPL_FRAMES];
extern W_Icon base_sbexpview;
extern W_Icon sbexpview[BMP_SBEXPL_FRAMES];
-#ifdef COLORIZE
-extern W_Icon cloud[5][BMP_TORPDET_FRAMES];
-extern W_Icon plasmacloud[5][BMP_TORPDET_FRAMES];
-extern W_Icon torpIcon[5][BMP_TORP_FRAMES];
-extern W_Icon plasmatorpIcon[5][BMP_TORP_FRAMES];
-#else
+
+extern W_Icon torp_cloud_bitmaps;
+extern W_Icon cloudC[NUM_CTORP_TYPES][BMP_TORPDET_FRAMES];
+extern W_Icon plasma_cloud_bitmaps;
+extern W_Icon plcloudC[NUM_CTORP_TYPES][BMP_TORPDET_FRAMES];
+extern W_Icon mtorp_bitmaps;
+extern W_Icon mtorpC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+extern W_Icon torp_bitmaps;
+extern W_Icon torpC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+extern W_Icon mplasma_bitmaps;
+extern W_Icon mplasmaC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+extern W_Icon plasma_bitmaps;
+extern W_Icon plasmaC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+
extern W_Icon cloud[BMP_TORPDET_FRAMES];
extern W_Icon plasmacloud[BMP_TORPDET_FRAMES];
extern W_Icon etorp, mtorp;
extern W_Icon eplasmatorp, mplasmatorp;
-#endif
#ifdef VSHIELD_BITMAPS
#define SHIELD_FRAMES 5