[netrek-cvs] client/netrekxp/src planetlist.c, 1.11, 1.12 socket.c, 1.40, 1.41

[Bill Balcerski]

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

Modified Files:
	planetlist.c socket.c 
Log Message:
MAXSECTORS to 20.  No need to define this differently for paradise or bronco.
Added in resizing planet window when paradise mode is received (need bigger window) and when planets above the assumed 40 are received (also need to make it bigger).
Fixed bug in paradise planet list where wrong team name variable was being used.

Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- socket.c	13 Apr 2008 02:25:52 -0000	1.40
+++ socket.c	13 Apr 2008 13:50:19 -0000	1.41
@@ -1921,11 +1921,18 @@
     loginAccept = packet->accept;
 #ifdef PARADISE
     if ((packet->pad2 == 69) && (packet->pad3 == 42))
-	paradise = 1;
+    {
+        paradise = 1;
+        // Now we have to resize certain windows that are set too small by default
+        // First resize planet window
+        W_DestroyWindow (planetw);
+        planetw = W_MakeTextWindow ("planet", TWINSIDE + 2 * THICKBORDER + 10, 10, 75, nplanets + 9, baseWin, 2);
+        W_SetWindowExposeHandler (planetw, planetlist);
+    }
     else {
-	/*nshiptypes = 8;*/
-	/*nplayers=20;*/
-	/*nplanets=40;*/
+        /*nshiptypes = 8;*/
+        /*nplayers=36;*/
+        /*nplanets=40;*/
     }
 #endif
     if (packet->accept)
@@ -2836,7 +2843,7 @@
       if (nplanets > 40)
       {
         W_DestroyWindow (planetw);
-        planetw = W_MakeTextWindow ("planet", TWINSIDE + 2 * THICKBORDER + 10, 10, 75, nplanets + 8, baseWin, 2);
+        planetw = W_MakeTextWindow ("planet", TWINSIDE + 2 * THICKBORDER + 10, 10, 75, nplanets + 9, baseWin, 2);
         W_SetWindowExposeHandler (planetw, planetlist);
       }
     }
@@ -2849,7 +2856,7 @@
         if (nplanets > 40)
         {
           W_DestroyWindow (planetw);
-          planetw = W_MakeTextWindow ("planet", TWINSIDE + 2 * THICKBORDER + 10, 10, 75, nplanets + 8, baseWin, 2);
+          planetw = W_MakeTextWindow ("planet", TWINSIDE + 2 * THICKBORDER + 10, 10, 75, nplanets + 9, baseWin, 2);
           W_SetWindowExposeHandler (planetw, planetlist);
         }
       }

Index: planetlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/planetlist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- planetlist.c	13 Apr 2008 02:25:51 -0000	1.11
+++ planetlist.c	13 Apr 2008 13:50:19 -0000	1.12
@@ -184,8 +184,7 @@
 	W_Color cur_color;
 
 	cur_color = shipCol[i];
-	//sprintf(buf, "%s: ", teaminfo[i-1].shortname);
-	sprintf(buf, "%s : ", teamname[i]);
+	sprintf(buf, "%s: ", teaminfo[i-1].shortname);
 	W_WriteText(wind, i * 7 + 2, k, cur_color, buf, strlen(buf), 
 		    W_RegularFont);
 	sprintf(buf, " %-2d", team_pcount[i]);