[netrek-cvs] client/netrekxp/src cowmain.c, 1.5, 1.6 newwin.c, 1.5, 1.6 playback.c, 1.5, 1.6

[Bill Balcerski]

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

Modified Files:
	cowmain.c newwin.c playback.c 
Log Message:
Reverted change regarding swapping order of newwin and reset_defaults (turns out it broke message windows).  Instead removed the bitmap loading function from the newwin initialization function, and placed it after the reset_defaults call in both cowmain and the playback main function.

Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- playback.c	16 Apr 2006 14:18:19 -0000	1.5
+++ playback.c	17 Apr 2006 09:44:09 -0000	1.6
@@ -175,9 +175,10 @@
     if ((stringDefault ("indshipMbmpfile")) != NULL)
         ind_ship_bmp_M = stringDefault ("indshipMbmpfile");
 
-    resetdefaults ();
     newwin (display_host, name);
 
+    resetdefaults ();
+
     /* open memory...? */
     openmem ();
 

Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cowmain.c	16 Apr 2006 14:18:19 -0000	1.5
+++ cowmain.c	17 Apr 2006 09:44:08 -0000	1.6
@@ -754,8 +754,6 @@
     if ((stringDefault ("indshipMbmpfile")) != NULL)
         ind_ship_bmp_M = stringDefault ("indshipMbmpfile");
 
-
-    resetdefaults ();
     newwin (display_host, name);
 
 #ifdef META
@@ -777,6 +775,9 @@
 	/* Set observer flag as soon as we know port number */
 	setObserverMode (xtrekPort);
 
+    resetdefaults ();
+    savebitmaps ();
+
     /* open memory...? */
     openmem ();
 

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- newwin.c	16 Apr 2006 14:18:19 -0000	1.5
+++ newwin.c	17 Apr 2006 09:44:08 -0000	1.6
@@ -648,7 +648,6 @@
     fillhint ();
 
     getResources (progname);
-    savebitmaps ();
 }