Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14778/include
Modified Files:
defs.h proto.h struct.h
Log Message:
Second round of the ship and keymap changes, this one focused on fixing the things the last patch broke.
Removed shipchange(function)
Defined ATT_BRONCO since it's defined statically on bronco as type 7 but as type 6 on paradise. Was necessary to get ATT working right on both.
Removed option for ship specific netrekrc file (rcfile-<ship>). Still can use ship specific keymaps and buttonmaps.
Refit string (displayed by client in message window upon entering refit state) now works on paradise servers to provide the correct list of available ships.
Fixed keymap bug in getname and playback - was incorrectly using ship keymap instead of default keymap.
Added call to buildShipKeymap() in getshipdefaults(), which is in turn called during ship initialization by initialize_shiptypes(). This will set up the individual ship keymaps and buttonmaps at client startup.
Fixed help window key remapping to effect not only current ship, but the default keymap and every individual ship keymap as well.
Fixed buildShipKeymap() function so it properly resets the ship's individual keymap before trying to parse the keymap from the netrekrc file. Same with buttonmap.
Fixed broken logic in the team select screen. Spacebar and clicking on a team window now both work properly again.
Fixed options window key remapping to effect not only current ship, but the default keymap and every individual ship keymap as well. Same with buttonmap. Also reduced the amount of duplicate code considerably by calling the keymapAdd and buttonmapAdd functions instead of trying to reprocess the strings inline.
Fixed incorrect comment on how SP_SHIP_CAP is sent by bronco vs paradise.
Redid handleShipCap() so it works the way it is supposed to. It obeys the operation value in the ship cap packet. And adds news ships or modifies ships correctly.
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- defs.h 16 Apr 2008 00:08:00 -0000 1.32
+++ defs.h 19 Apr 2008 16:22:56 -0000 1.33
@@ -298,7 +298,7 @@
#define sendBombReq(state) sendShortPacket(CP_BOMB, (char) state)
#define sendPractrReq() sendShortPacket(CP_PRACTR, 0)
#define sendWarReq(mask) sendShortPacket(CP_WAR, (char) mask)
-#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, (char) ship); shipchange(ship);}
+#define sendRefitReq(ship) sendShortPacket(CP_REFIT, (char) ship)
#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, (char) pnum)
#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, (char) pnum)
#define sendCoupReq() sendShortPacket(CP_COUP, 0)
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- struct.h 18 Apr 2008 03:42:36 -0000 1.27
+++ struct.h 19 Apr 2008 16:22:56 -0000 1.28
@@ -248,6 +248,7 @@
#define ATT 6 /* paradise */
#define SGALAXY 6 /* bronco */
#define JUMPSHIP 7 /* can be ATT on bronco */
+#define ATT_BRONCO 7
#define FLAGSHIP 8
#define WARBASE 9
#define LIGHTCRUISER 10
@@ -288,7 +289,6 @@
unsigned char s_keymap[96]; /* keymap for this ship */
#endif
unsigned char s_buttonmap[23]; /* buttonmap for this ship */
- char *rcfile; /* pointer to ship specific rcfile */
};
struct stats
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- proto.h 18 Apr 2008 03:42:36 -0000 1.62
+++ proto.h 19 Apr 2008 16:22:56 -0000 1.63
@@ -112,7 +112,6 @@
char *geometryDefault (char *str);
int findDefaults (char *deffile, char *file);
void resetdefaults (void);
-void shipchange (int type);
int findfile (char *fname,
char *found);