[netrek-cvs] client/netrekxp/src defaults.c, 1.106, 1.107 input.c, 1.55, 1.56

[Bill Balcerski]

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

Modified Files:
	defaults.c input.c 
Log Message:
Removed DIST_KEY_NAME define, this allows distress macros
to be remapped to different keys.  Unnecessary to use a define
for this default behavior.

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- input.c	9 Jun 2009 00:16:36 -0000	1.55
+++ input.c	9 Jun 2009 02:09:45 -0000	1.56
@@ -2232,8 +2232,6 @@
     if (found)
         return;
 
-
-#ifdef DIST_KEY_NAME
     /* scan for distress call here */
 
     for (i = take; distmacro[i].name; i++)
@@ -2245,9 +2243,6 @@
         }
     }
 
-#endif
-
-
     warning ("Unknown macro");
     W_Beep ();
 }

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- defaults.c	9 Jun 2009 01:33:49 -0000	1.106
+++ defaults.c	9 Jun 2009 02:09:45 -0000	1.107
@@ -1282,13 +1282,11 @@
                 {
                     dm->macro = strdup (v);
 
-#ifdef DIST_KEY_NAME
                     if (c)
                     {
                         dm->c = c;
                         dm_def->c = c;
                     }
-#endif /* DIST_KEY_NAME */
 
                     notdone = 0;
                 }