Update of /cvsroot/netrek/client/netrekxp/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7322/include
Modified Files:
data.h defs.h packets.h
Log Message:
Remove SHORT_PACKETS define
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- defs.h 25 May 2009 14:43:53 -0000 1.37
+++ defs.h 8 Jun 2009 22:55:03 -0000 1.38
@@ -395,7 +395,6 @@
#define NETSTAT_DF_NFT_S "2000"
-#ifdef SHORT_PACKETS
#define SPK_VOFF 0 /* variable packets off */
#define SPK_VON 1 /* variable packets on */
#define SPK_MOFF 2 /* message packets off */
@@ -417,7 +416,6 @@
#define SPK_WFIELD 3
#define SPK_TFIELD 4
#define SPK_DONE 5
-#endif
#ifndef NBT
#define NBT
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- data.h 8 Jun 2009 22:26:07 -0000 1.114
+++ data.h 8 Jun 2009 22:55:03 -0000 1.115
@@ -171,7 +171,6 @@
extern int colorfulPhasers;
#endif
-#ifdef SHORT_PACKETS
extern int why_dead;
extern int tryShort, tryShort1;
extern int recv_short;
@@ -184,7 +183,6 @@
/* S_P2 */
extern int shortversion; /* Which version do we use? */
-#endif
extern int globalerr;
extern int ingame; /* If player is in game - to distinguish between whether
@@ -452,11 +450,8 @@
extern W_Window udpWin, phaserwin, hintWin;
extern W_Window waitWin, waitqWin, countWin, motdButtonWin, motdWin;
-#ifdef SHORT_PACKETS
extern W_Window spWin;
-#endif
-
#ifdef NBT
extern W_Window macroWin;
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- packets.h 8 Jun 2009 22:26:07 -0000 1.26
+++ packets.h 8 Jun 2009 22:55:03 -0000 1.27
@@ -91,8 +91,6 @@
#define SP_THINGY 37 /* paradise - thingy location */
#define SP_THINGY_INFO 38 /* paradise - thingy status */
#define SP_SHIP_CAP 39 /* Handles server ship mods */
-
-#ifdef SHORT_PACKETS
#define SP_S_REPLY 40 /* reply to send-short
* request */
#define SP_S_MESSAGE 41 /* var. Message Packet */
@@ -102,11 +100,7 @@
#define SP_S_YOU_SS 44 /* your ship status */
#define SP_S_PLAYER 45 /* variable length player
* packet */
-#endif
-
#define SP_PING 46 /* ping packet */
-
-#ifdef SHORT_PACKETS
#define SP_S_TORP 47 /* variable length torp
* packet */
#define SP_S_TORP_INFO 48 /* SP_S_TORP with TorpInfo */
@@ -136,7 +130,6 @@
#define VPLAYER_SIZE 4
#define SHORTVERSION 11 /* S_P2 */
#define OLDSHORTVERSION 10 /* Short packets version 1*/
-#endif
/* packets sent from remote client to xtrek server */
@@ -193,13 +186,11 @@
#define CP_PING_RESPONSE 42 /* client response */
-#ifdef SHORT_PACKETS
#define CP_S_REQ 43
#define CP_S_THRS 44
#define CP_S_MESSAGE 45 /* vari. Message Packet */
#define CP_S_RESERVED 46
#define CP_S_DUMMY 47
-#endif
#define CP_FEATURE 60
#define SP_FEATURE 60
@@ -1051,7 +1042,6 @@
#define FLAGS_ALL_CLOAK_OFF_SHIELDS_UP 2
#define FLAGS_ALL_CLOAK_OFF_SHIELDS_DOWN 3
-#ifdef SHORT_PACKETS
struct shortreq_cpacket
{ /* CP_S_REQ */
char type;
@@ -1234,7 +1224,6 @@
unsigned int sbmaxkills; /* max kills as sb * 100 */
};
-#endif
/* Shapes of thingys. It would be best to add to the end of this list and
try to coordinate your additions with other hackers. */