[netrek-cvs] client/netrekxp/include data.h, 1.113, 1.114 packets.h, 1.25, 1.26 proto.h, 1.68, 1.69

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4835/include

Modified Files:
	data.h packets.h proto.h 
Log Message:
Remove unnecessary defines (SERVER and all SERVER related defines,
COW, RCD, PING, FEATURE_PACKETS).
Discovered a nasty crash bug with RCDs/RCMs and %S on paradise servers, fixed.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- data.h	6 Jun 2009 03:29:08 -0000	1.113
+++ data.h	8 Jun 2009 22:26:07 -0000	1.114
@@ -433,7 +433,6 @@
 /* jn - SMARTMACRO */
 extern char lastMessage[];
 extern int MacroNum;
-extern char *classes[];
 extern char teamlet[];
 extern char *teamshort[];
 extern char pseudo[PSEUDOSIZE];
@@ -637,11 +636,8 @@
 
 #endif
 
-#ifdef FEATURE_PACKETS
 extern int F_feature_packets;
 
-#endif
-
 extern int F_cloak_maxwarp;
 extern int F_self_8flags;
 extern int F_self_8flags2;

Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- packets.h	4 Jun 2009 02:02:29 -0000	1.25
+++ packets.h	8 Jun 2009 22:26:07 -0000	1.26
@@ -104,9 +104,7 @@
                                  * packet */
 #endif
 
-#ifdef PING
 #define SP_PING         46      /* ping packet */
-#endif
 
 #ifdef SHORT_PACKETS
 #define SP_S_TORP       47      /* variable length torp
@@ -203,10 +201,8 @@
 #define CP_S_DUMMY      47
 #endif
 
-#ifdef FEATURE_PACKETS
 #define CP_FEATURE	60
 #define SP_FEATURE	60
-#endif
 
 /* special paradise type tells us when to update the display on playback.
     Not sent or received, only placed in the recorder file */
@@ -842,7 +838,6 @@
     char name[16];
 };
 
-#ifdef FEATURE_PACKETS
 struct feature_cpacket
 {
     char type;
@@ -852,8 +847,6 @@
     char name[80];
 };
 
-#endif
-
 struct rank_spacket
 {
     char        type;           /* SP_RANK */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- proto.h	3 Jun 2009 02:42:55 -0000	1.68
+++ proto.h	8 Jun 2009 22:26:07 -0000	1.69
@@ -180,7 +180,6 @@
 /******************************************************************************/
 /***  feature.c                                                             ***/
 /******************************************************************************/
-#ifdef FEATURE_PACKETS
 void sendFeature (char *name,
                   char feature_type,
                   int value,
@@ -188,7 +187,6 @@
                   char arg2);
 struct feature_cpacket;
 void handleFeature (struct feature_cpacket *packet);
-#endif
 
 /******************************************************************************/
 /***  findslot.c                                                            ***/