Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5111/include
Modified Files:
data.h struct.h
Log Message:
First part of work at redoing ship types.
Use s_desig[] instead of static shiptype arrays for a few cases to get ship type letters.
Define # of typical ships for bronco vs paradise.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- data.h 16 Apr 2008 00:08:00 -0000 1.97
+++ data.h 16 Apr 2008 02:57:07 -0000 1.98
@@ -377,34 +377,34 @@
//Ships
extern W_Icon ship_bitmaps[5];
-extern W_Icon fed_bitmaps[NUM_TYPES][SHIP_VIEWS],
- kli_bitmaps[NUM_TYPES][SHIP_VIEWS], rom_bitmaps[NUM_TYPES][SHIP_VIEWS],
- ori_bitmaps[NUM_TYPES][SHIP_VIEWS], ind_bitmaps[NUM_TYPES][SHIP_VIEWS];
+extern W_Icon fed_bitmaps[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ kli_bitmaps[NUM_TYPES_BRONCO][SHIP_VIEWS], rom_bitmaps[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ ori_bitmaps[NUM_TYPES_BRONCO][SHIP_VIEWS], ind_bitmaps[NUM_TYPES_BRONCO][SHIP_VIEWS];
extern W_Icon ship_bitmaps1[5];
-extern W_Icon fed_bitmaps1[NUM_TYPES][SHIP_VIEWS],
- kli_bitmaps1[NUM_TYPES][SHIP_VIEWS], rom_bitmaps1[NUM_TYPES][SHIP_VIEWS],
- ori_bitmaps1[NUM_TYPES][SHIP_VIEWS], ind_bitmaps1[NUM_TYPES][SHIP_VIEWS];
+extern W_Icon fed_bitmaps1[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ kli_bitmaps1[NUM_TYPES_BRONCO][SHIP_VIEWS], rom_bitmaps1[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ ori_bitmaps1[NUM_TYPES_BRONCO][SHIP_VIEWS], ind_bitmaps1[NUM_TYPES_BRONCO][SHIP_VIEWS];
extern W_Icon ship_bitmapsG[5];
-extern W_Icon fed_bitmapsG[NUM_TYPES][SHIP_VIEWS],
- kli_bitmapsG[NUM_TYPES][SHIP_VIEWS], rom_bitmapsG[NUM_TYPES][SHIP_VIEWS],
- ori_bitmapsG[NUM_TYPES][SHIP_VIEWS], ind_bitmapsG[NUM_TYPES][SHIP_VIEWS];
+extern W_Icon fed_bitmapsG[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ kli_bitmapsG[NUM_TYPES_BRONCO][SHIP_VIEWS], rom_bitmapsG[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ ori_bitmapsG[NUM_TYPES_BRONCO][SHIP_VIEWS], ind_bitmapsG[NUM_TYPES_BRONCO][SHIP_VIEWS];
extern W_Icon ship_bitmapsM[5];
-extern W_Icon fed_bitmapsM[NUM_TYPES][SHIP_VIEWS],
- kli_bitmapsM[NUM_TYPES][SHIP_VIEWS], rom_bitmapsM[NUM_TYPES][SHIP_VIEWS],
- ori_bitmapsM[NUM_TYPES][SHIP_VIEWS], ind_bitmapsM[NUM_TYPES][SHIP_VIEWS];
+extern W_Icon fed_bitmapsM[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ kli_bitmapsM[NUM_TYPES_BRONCO][SHIP_VIEWS], rom_bitmapsM[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ ori_bitmapsM[NUM_TYPES_BRONCO][SHIP_VIEWS], ind_bitmapsM[NUM_TYPES_BRONCO][SHIP_VIEWS];
extern W_Icon ship_bitmapsT[5];
-extern W_Icon fed_bitmapsT[NUM_TYPES][SHIP_VIEWS],
- kli_bitmapsT[NUM_TYPES][SHIP_VIEWS], rom_bitmapsT[NUM_TYPES][SHIP_VIEWS],
- ori_bitmapsT[NUM_TYPES][SHIP_VIEWS], ind_bitmapsT[NUM_TYPES][SHIP_VIEWS];
+extern W_Icon fed_bitmapsT[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ kli_bitmapsT[NUM_TYPES_BRONCO][SHIP_VIEWS], rom_bitmapsT[NUM_TYPES_BRONCO][SHIP_VIEWS],
+ ori_bitmapsT[NUM_TYPES_BRONCO][SHIP_VIEWS], ind_bitmapsT[NUM_TYPES_BRONCO][SHIP_VIEWS];
extern W_Icon ship_bitmapsHR[5];
-extern W_Icon fed_bitmapsHR[NUM_TYPES],
- kli_bitmapsHR[NUM_TYPES], rom_bitmapsHR[NUM_TYPES],
- ori_bitmapsHR[NUM_TYPES], ind_bitmapsHR[NUM_TYPES];
+extern W_Icon fed_bitmapsHR[NUM_TYPES_BRONCO],
+ kli_bitmapsHR[NUM_TYPES_BRONCO], rom_bitmapsHR[NUM_TYPES_BRONCO],
+ ori_bitmapsHR[NUM_TYPES_BRONCO], ind_bitmapsHR[NUM_TYPES_BRONCO];
// Planets
extern W_Icon planet_unknown_bitmap;
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- struct.h 16 Apr 2008 00:08:04 -0000 1.25
+++ struct.h 16 Apr 2008 02:57:08 -0000 1.26
@@ -233,15 +233,15 @@
#define KSHIP2 0x11 /* chain-reaction explosions, overloaded to paradise KASTEROID */
#define KPLASMA2 0x12 /* killed by zapped plasma */
-#define NUM_PSHIP_TYPES 7
+#define NUM_PSHIP_TYPES 7 /* Number of unique paradise ships in the bitmap file */
#define PARADISE_SHIP_OFFSET 7 /* To make jumpship first entry in the paradise ship bitmap array */
+#define NUM_TYPES_PARADISE 15 /* Typical total number of ships on a paradise server */
+#define NUM_TYPES_BRONCO 8 /* Concrete total number of ships on a bronco server */
#ifdef PARADISE
-#define NUM_TYPES 15
#define ATT 6
#define JUMPSHIP 7
#define SGALAXY 8 /* Not sure where to put this .. */
#else
-#define NUM_TYPES 8
#define SGALAXY 6
#define ATT 7
#define JUMPSHIP 8
@@ -252,7 +252,7 @@
#define BATTLESHIP 3
#define ASSAULT 4
#define STARBASE 5
-#define FLAGSHIP 8
+#define FLAGSHIP 8 /* shares bitmap with galaxy class */
#define WARBASE 9
#define LIGHTCRUISER 10
#define CARRIER 11