Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17624/src
Modified Files:
data.c defaults.c helpwin.c input.c newwin.c
Log Message:
Remove NBT define. Was defined in 2 places, what dreck.
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- newwin.c 8 Jun 2009 22:55:04 -0000 1.79
+++ newwin.c 9 Jun 2009 00:16:36 -0000 1.80
@@ -1899,12 +1899,8 @@
else
#endif
fillhelp ();
-
-#ifdef NBT
else if (event.Window == macroWin)
fillmacro ();
-#endif
-
else if (event.Window == playerw)
RedrawPlayerList ();
else if (event.Window == warnw)
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- input.c 8 Jun 2009 22:55:03 -0000 1.54
+++ input.c 9 Jun 2009 00:16:36 -0000 1.55
@@ -2055,19 +2055,14 @@
*target;
int targettype;
enum dist_type i;
-
-#ifdef NBT
int c;
char who;
int found = 0;
-#endif
-
warning (" "); /* We are here now, so turn off macro mode */
MacroMode = 0;
-#ifdef NBT
if (data->key == '?')
{
showMacroWin ();
@@ -2255,8 +2250,6 @@
warning ("Unknown macro");
W_Beep ();
-
-#endif
}
/******************************************************************************/
@@ -2285,10 +2278,7 @@
destroyInfo ();
W_UnmapWindow (helpWin);
W_UnmapWindow (playerw2);
-
-#ifdef NBT
W_UnmapWindow (macroWin);
-#endif
#ifdef XTREKRC_HELP
if (defWin)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- data.c 8 Jun 2009 22:55:03 -0000 1.127
+++ data.c 9 Jun 2009 00:16:36 -0000 1.128
@@ -272,14 +272,10 @@
#endif
#endif
-
-#ifdef NBT
struct macro_list macro[MAX_MACRO]; /* NBT 2/26/93 */
int MacroMode = 0;
int macrocnt = 0;
-#endif
-
extern double Sin[], Cos[];
int paradise = 0; /* is the server a paradise server */
@@ -463,12 +459,8 @@
W_Window waitWin, waitqWin, countWin, motdButtonWin, motdWin;
W_Window spWin = NULL;
-
-#ifdef NBT
W_Window macroWin = NULL;
-#endif
-
#ifdef META
W_Window metaWin = NULL;
Index: helpwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/helpwin.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- helpwin.c 8 Jun 2009 22:55:03 -0000 1.16
+++ helpwin.c 9 Jun 2009 00:16:36 -0000 1.17
@@ -140,11 +140,8 @@
"| Update medium",
" (space) Unmap special windows",
"\\ Reset user timer",
-
-#ifdef NBT
"X Enter Macro Mode",
"X? Show current Macros",
-#endif
#ifdef TOOLS
"M Toggle shell tools window",
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- defaults.c 8 Jun 2009 22:55:03 -0000 1.101
+++ defaults.c 9 Jun 2009 00:16:36 -0000 1.102
@@ -1104,9 +1104,7 @@
LineToConsole ("Reading defaults file %s\n", deffile);
-#ifdef NBT
macrocnt = 0; /* reset macros */
-#endif
STRNCPY (defaultsFile, deffile, sizeof (defaultsFile));
while (fgets (file, 250, fp))
@@ -1129,7 +1127,6 @@
v++;
}
-#ifdef NBT
/* not very robust but if it breaks nothing will die horribly I think -
* jmn */
if (strncmpi (file, "macro.", 6) == 0)
@@ -1171,7 +1168,6 @@
}
}
else
-#endif
if (strncmpi (file, "mac.", 4) == 0)
{
@@ -3098,7 +3094,6 @@
{
switch (macro[i].type)
{
-#ifdef NBT
case NBTM:
if (macro[i].key != 0)
{
@@ -3118,7 +3113,6 @@
fputs ("\n", fp);
}
break;
-#endif /* NBT */
case NEWM:
if (macro[i].key != 0)
{
@@ -3190,7 +3184,6 @@
fputs ("\n", fp);
}
break;
-#ifdef NBT
#ifdef MULTILINE_MACROS
case NEWMULTIM:
if (macro[i].key != 0)
@@ -3213,7 +3206,6 @@
}
break;
#endif /* MULTILINE_MACROS */
-#endif /* NBT */
}
}
}