Update of /cvsroot/netrek/client/cow
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8087
Modified Files:
ChangeLog newwin.c inform.c planetlist.c
Log Message:
add PLCORE
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/newwin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- newwin.c 22 Jun 2002 04:43:24 -0000 1.4
+++ newwin.c 16 May 2006 06:16:35 -0000 1.5
@@ -2,6 +2,9 @@
/* newwin.c
*
* $Log$
+ * Revision 1.5 2006/05/16 06:16:35 quozl
+ * add PLCORE
+ *
* Revision 1.4 2002/06/22 04:43:24 tanner
* Clean up of SDL code. #ifdef'd out functions not needed in SDL.
*
@@ -171,7 +174,7 @@
W_SetWindowKeyDownHandler(messagew, handleMessageWindowKeyDown);
W_SetWindowButtonHandler(messagew, handleMessageWindowButton);
- planetw = W_MakeTextWindow("planet", 10, 10, 53, MAXPLANETS + 3, w, 2);
+ planetw = W_MakeTextWindow("planet", 10, 10, 57, MAXPLANETS + 3, w, 2);
W_SetWindowExposeHandler(planetw, planetlist);
rankw = W_MakeTextWindow("rank", 50, 300, 65, NUMRANKS + 9, w, 2);
Index: inform.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/inform.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- inform.c 1 Nov 1998 17:24:10 -0000 1.1.1.1
+++ inform.c 16 May 2006 06:16:35 -0000 1.2
@@ -2,6 +2,9 @@
/* inform.c
*
* $Log$
+ * Revision 1.2 2006/05/16 06:16:35 quozl
+ * add PLCORE
+ *
* Revision 1.1.1.1 1998/11/01 17:24:10 siegl
* COW 3.0 initial revision
* */
@@ -204,12 +207,12 @@
else
{ /* Planet */
/* Too close to the edge? */
- if (mx + 20 * W_Textwidth + 2 > windowWidth)
- mx = windowWidth - 25 * W_Textwidth - 2;
+ if (mx + 23 * W_Textwidth + 2 > windowWidth)
+ mx = windowWidth - 28 * W_Textwidth - 2;
if (my + 3 * W_Textheight + 2 > windowHeight)
my = windowHeight - 3 * W_Textheight - 2;
- infow = W_MakeWindow("info", mx, my, W_Textwidth * 25, W_Textheight * 3, ww,
+ infow = W_MakeWindow("info", mx, my, W_Textwidth * 28, W_Textheight * 3, ww,
2, foreColor);
W_MapWindow(infow);
k = &planets[target->o_num];
@@ -229,10 +232,11 @@
(void) sprintf(buf, "Armies %d", k->pl_armies);
W_WriteText(infow, W_Textwidth, W_Textheight * line++, planetColor(k), buf, strlen(buf),
W_RegularFont);
- (void) sprintf(buf, "%s %s %s %c%c%c%c",
+ (void) sprintf(buf, "%s %s %s %s %c%c%c%c",
(k->pl_flags & PLREPAIR ? "REPAIR" : " "),
(k->pl_flags & PLFUEL ? "FUEL" : " "),
(k->pl_flags & PLAGRI ? "AGRI" : " "),
+ (k->pl_flags & PLCORE ? "CORE" : " "),
(k->pl_info & FED ? 'F' : ' '),
(k->pl_info & ROM ? 'R' : ' '),
(k->pl_info & KLI ? 'K' : ' '),
Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/client/cow/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog 14 Apr 2006 10:35:37 -0000 1.27
+++ ChangeLog 16 May 2006 06:16:35 -0000 1.28
@@ -1,3 +1,9 @@
+Tue May 16 15:51:12 2006 Bill Balcerski <williamb at its.caltech.edu>
+
+ * newwin.c (newwin): enlarge planet list window.
+ * inform.c (inform): add PLCORE.
+ * planetlist.c (planetlist): add PLCORE.
+
Fri Apr 14 20:33:28 2006 James Cameron <quozl at us.netrek.org>
* parsemeta.c (parseInput): fix format string for sscanf, more
Index: planetlist.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/planetlist.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- planetlist.c 1 Nov 1998 17:24:11 -0000 1.1.1.1
+++ planetlist.c 16 May 2006 06:16:35 -0000 1.2
@@ -2,6 +2,9 @@
/* planetlist.c
*
* $Log$
+ * Revision 1.2 2006/05/16 06:16:35 quozl
+ * add PLCORE
+ *
* Revision 1.1.1.1 1998/11/01 17:24:11 siegl
* COW 3.0 initial revision
* */
@@ -38,20 +41,21 @@
register struct planet *j;
/* W_ClearWindow(planetw); */
- (void) sprintf(buf, "Planet Name own armies REPAIR FUEL AGRI info");
+ (void) sprintf(buf, "Planet Name own armies REPAIR FUEL AGRI CORE info");
W_WriteText(planetw, 2, 1, textColor, buf, strlen(buf), W_RegularFont);
k = 2;
for (i = 0, j = &planets[i]; i < MAXPLANETS; i++, j++)
{
if (j->pl_info & me->p_team)
{
- (void) sprintf(buf, "%-16s %3s %3d %6s %4s %4s %c%c%c%c",
+ (void) sprintf(buf, "%-16s %3s %3d %6s %4s %4s %4s %c%c%c%c",
j->pl_name,
teamname[j->pl_owner],
j->pl_armies,
(j->pl_flags & PLREPAIR ? "REPAIR" : " "),
(j->pl_flags & PLFUEL ? "FUEL" : " "),
(j->pl_flags & PLAGRI ? "AGRI" : " "),
+ (j->pl_flags & PLCORE ? "CORE" : " "),
(j->pl_info & FED ? 'F' : ' '),
(j->pl_info & ROM ? 'R' : ' '),
(j->pl_info & KLI ? 'K' : ' '),