[netrek-cvs] client/netrekxp/src cowmain.c, 1.34, 1.35 data.c, 1.99, 1.100 defaults.c, 1.87, 1.88 main.c, 1.14, 1.15 option.c, 1.50, 1.51

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/src

Modified Files:
	cowmain.c data.c defaults.c main.c option.c 
Log Message:
Added hideConsole netrekrc.txt option.
Added zlib1.dll for paradise support.

Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cowmain.c	28 Apr 2007 12:09:51 -0000	1.34
+++ cowmain.c	29 Jul 2007 01:38:41 -0000	1.35
@@ -781,6 +781,9 @@
     resetdefaults ();
     newwin (display_host, name);
 
+    if (hideConsole)
+        FreeConsole ();
+
 #ifdef META
     if (usemeta)
     {

Index: main.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- main.c	14 May 2007 02:56:41 -0000	1.14
+++ main.c	29 Jul 2007 01:38:44 -0000	1.15
@@ -73,7 +73,6 @@
 #endif
 
     LineToConsole (" [-D]   output debug info\n");
-    LineToConsole (" [-n]   hide console window\n");
     LineToConsole (" [-u]   show usage\n");
     LineToConsole (" [-v]   display client version info\n");
 
@@ -88,7 +87,6 @@
 {
     int usage = 0;
     int err = 0;
-    int hideConsole = 0;
     char *name, *ptr;
     int i;
     time_t tm;
@@ -360,10 +358,6 @@
             case 'D':           /* add debug info */
                 debug++;
                 break;
-            
-            case 'n':           /* hide console window */
-                hideConsole = 1;
-                break;
 
             case 'v':           /* output version info */
                 LineToConsole ("%s %s\n", version, mvers);
@@ -395,12 +389,10 @@
     if (usage || err)
     {
         printUsage (name);
-        if (hideConsole)
-            FreeConsole ();
+//        if (hideConsole)
+//            FreeConsole ();
         exit (err);
     }
-    if (hideConsole)
-        FreeConsole ();
 
 #ifdef GATEWAY
     if (!hset) use_trekhopd = 0;        /* allow use via normal connections */

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- defaults.c	18 May 2007 19:54:37 -0000	1.87
+++ defaults.c	29 Jul 2007 01:38:43 -0000	1.88
@@ -245,6 +245,12 @@
             NULL
         }
     },
+    {"hideConsole", &hideConsole, RC_BOOL,
+        {
+            "Hide the DOS console window",
+            NULL
+        }
+    },
     {"highlightFriendlyPhasers", &highlightFriendlyPhasers, RC_BOOL,
         {
             "Highlight friendly phasers",
@@ -1897,6 +1903,7 @@
     showPlanetNames = booleanDefault ("showPlanetNames", 1);
     reportKills = booleanDefault ("reportKills", reportKills);
     fullBitmapRotation = booleanDefault ("fullBitmapRotation", fullBitmapRotation);
+    hideConsole = booleanDefault ("hideConsole", hideConsole);
 
     udpDebug = intDefault ("udpDebug", udpDebug);
     udpClientSend = intDefault ("udpClientSend", udpClientSend);

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- option.c	18 May 2007 19:54:38 -0000	1.50
+++ option.c	29 Jul 2007 01:38:44 -0000	1.51
@@ -359,6 +359,7 @@
     {1, "", &playerListMessaging, 0, 0, 0, plistmessagingmess, NULL},
     {1, "have only msg key start msg", &messageKeyOnly, 0, 0, 0, NULL, NULL},
     {1, "beep on private message", &beepOnPrivateMessage, 0, 0, 0, NULL, NULL},
+    {1, "hide console window", &hideConsole, 0, 0, 0, NULL, NULL},
     {1, "done", &notdone, 0, 0, 0, NULL, NULL},
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}
 };

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- data.c	28 Jul 2007 23:20:47 -0000	1.99
+++ data.c	29 Jul 2007 01:38:41 -0000	1.100
@@ -912,3 +912,4 @@
 int scaleFactor = 40;           /* allows for scaling of tactical window */
 int mapscaleFactor = 40;        /* allows for scaling of galactic window, unused */
 int fullBitmapRotation = 1;     /* draw old bitmap sets to all angles */
+int hideConsole = 0;            /* show console window or not */