Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29533/src
Modified Files:
data.c defaults.c macrowin.c smessage.c
Log Message:
Remove NEWMACRO and SMARTMACRO defines. They really
didn't do anything. Almost all the code was outside the defines, and
it's related to an ancient feature packet negotiation that doesn't exist
anymore.
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- data.c 9 Jun 2009 01:23:01 -0000 1.131
+++ data.c 9 Jun 2009 01:33:49 -0000 1.132
@@ -420,12 +420,7 @@
W_Icon paradise_bplanets[PARADISE_PLANET_VIEWS];
W_Icon paradise_bmplanets[PARADISE_PLANET_VIEWS];
-/* jn - SMARTMACRO */
-
-#ifdef NEWMACRO
int MacroNum = 0;
-
-#endif /* NEWMACRO */
char lastMessage[80];
char teamlet[] = { 'I', 'F', 'R', 'X', 'K', 'X', 'X', 'X', 'O', 'X', 'X', 'X',
'X', 'X', 'X', 'A'
Index: smessage.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/smessage.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smessage.c 16 Apr 2008 00:08:22 -0000 1.10
+++ smessage.c 9 Jun 2009 01:33:49 -0000 1.11
@@ -651,7 +651,7 @@
#endif
-/* Used in NEWMACRO, useful elsewhere also */
+/* Used in newmacro, useful elsewhere also */
int
getgroup (char addr,
int *recip)
Index: macrowin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/macrowin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- macrowin.c 6 Apr 2007 06:46:32 -0000 1.3
+++ macrowin.c 9 Jun 2009 01:33:49 -0000 1.4
@@ -264,13 +264,9 @@
strcat (macromessage, " SHELL ");
break;
#endif
-
-#ifdef NEWMACRO
case '\0':
strcat (macromessage, " SPEC ");
break;
-#endif
-
default:
strcat (macromessage, " ---- ");
break;
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- defaults.c 9 Jun 2009 01:23:01 -0000 1.105
+++ defaults.c 9 Jun 2009 01:33:49 -0000 1.106
@@ -2975,7 +2975,7 @@
fputs ("# %m the last message you sent\n", fp);
fputs ("# %M the last message you sent in all caps\n", fp);
fputs ("#\n", fp);
- fputs ("# As a further extension to NEWMACRO, a macro may now be sent to any of the following destinations:\n", fp);
+ fputs ("# As a further extension, a macro may now be sent to any of the following destinations:\n", fp);
fputs ("# %i %I %c send message to self\n", fp);
fputs ("# %u %U %p send message to player nearest mouse\n", fp);
fputs ("# %t %z %Z send message to team of player nearest mouse\n", fp);