[netrek-cvs] client/netrekxp/src data.c, 1.63, 1.64 defaults.c, 1.55, 1.56 newwin.c, 1.53, 1.54

[Bill Balcerski]

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

Modified Files:
	data.c defaults.c newwin.c 
Log Message:
Netrekrc option newTeams for using new graphical team windows

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- newwin.c	14 Mar 2007 23:24:09 -0000	1.53
+++ newwin.c	15 Mar 2007 04:34:44 -0000	1.54
@@ -2062,25 +2062,28 @@
         return;
 
     W_ClearWindow (win);
-#if 0 /* Old team windows */
-    W_WriteText (win, 5, 5, shipCol[teamNo + 1], teams[teamNo],
-                 strlen (teams[teamNo]), W_RegularFont);
-#endif
-    switch (teamNo)
+    if (newTeams)
     {
-        case 0:
-            W_WriteBitmap ( 0, 0, fedteam, foreColor, win);
-            break;
-        case 1:
-            W_WriteBitmap ( 0, 0, romteam, foreColor, win);
-            break;
-        case 2:
-            W_WriteBitmap ( 0, 0, kliteam, foreColor, win);
-            break;
-        case 3:
-            W_WriteBitmap ( 0, 0, oriteam, foreColor, win);
-            break;
+        switch (teamNo)
+        {
+            case 0:
+                W_WriteBitmap ( 0, 0, fedteam, foreColor, win);
+                break;
+            case 1:
+                W_WriteBitmap ( 0, 0, romteam, foreColor, win);
+                break;
+            case 2:
+                W_WriteBitmap ( 0, 0, kliteam, foreColor, win);
+                break;
+            case 3:
+                W_WriteBitmap ( 0, 0, oriteam, foreColor, win);
+                break;
+        }
     }
+    else
+        W_WriteText (win, 5, 5, shipCol[teamNo + 1], teams[teamNo],
+                 strlen (teams[teamNo]), W_RegularFont);
+
     (void) sprintf (buf, "%d", num);
     W_MaskText (win, 5, 46, shipCol[teamNo + 1], buf, strlen (buf),
                 W_BigFont);

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- defaults.c	14 Mar 2007 18:36:07 -0000	1.55
+++ defaults.c	15 Mar 2007 04:34:44 -0000	1.56
@@ -357,6 +357,12 @@
             NULL
         }
     },
+    {"newTeams", &newTeams, RC_BOOL,
+        {
+            "Use new team windows",
+            NULL
+        }
+    },
     {"omitTeamLetter", &omitTeamLetter, RC_BOOL,
         {
             "Omit team letter on galaxy",
@@ -1556,6 +1562,7 @@
     doubleBuffering = booleanDefault ("doubleBuffering", doubleBuffering);
     allowWheelActions = booleanDefault ("allowWheelActions", allowWheelActions);
     newQuit = booleanDefault ("newQuit", newQuit);
+    newTeams = booleanDefault ("newTeams", newTeams);
     soundVolume= intDefault ("soundVolume", soundVolume);
     soundEffects= booleanDefault ("soundEffects", soundEffects);
     soundMusic = booleanDefault ("soundMusic", soundMusic);

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- data.c	15 Mar 2007 01:44:33 -0000	1.63
+++ data.c	15 Mar 2007 04:34:44 -0000	1.64
@@ -800,6 +800,7 @@
 
 int richText = 0;   		/* temporary variable to select rich text message windows */
 int newQuit = 0;    		/* new quit clock */
+int newTeams = 0;		/* new team windows */
 int soundVolume = 64;		/* Starting sound volume (0-128 range) */
 int soundEffects = 1;		/* Use sound effects playback */
 int soundMusic = 1;		/* Use music playback */