Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv618/src
Modified Files:
dashboard.c data.c enter.c mswindow.c newwin.c
Log Message:
New graphics for the team select windows
The "Flags" text on COW and KRP dashboards will now turn red if your ship is
weapon temped or engine temped
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- newwin.c 14 Mar 2007 18:36:07 -0000 1.52
+++ newwin.c 14 Mar 2007 23:24:09 -0000 1.53
@@ -1328,6 +1328,19 @@
W_StoreBitmap3 ("bitmaps/misclib/clock.bmp", BMP_CLOCK_WIDTH,
BMP_CLOCK_HEIGHT, BMP_CLOCK, qwin, LR_MONOCHROME);
}
+
+ fedteam =
+ W_StoreBitmap3 ("bitmaps/misclib/color/fedteam.bmp", BMP_TEAM_SELECT_WIDTH,
+ BMP_TEAM_SELECT_HEIGHT, BMP_FEDTEAM, w, LR_DEFAULTCOLOR);
+ romteam =
+ W_StoreBitmap3 ("bitmaps/misclib/color/romteam.bmp", BMP_TEAM_SELECT_WIDTH,
+ BMP_TEAM_SELECT_HEIGHT, BMP_ROMTEAM, w, LR_DEFAULTCOLOR);
+ kliteam =
+ W_StoreBitmap3 ("bitmaps/misclib/color/kliteam.bmp", BMP_TEAM_SELECT_WIDTH,
+ BMP_TEAM_SELECT_HEIGHT, BMP_KLITEAM, w, LR_DEFAULTCOLOR);
+ oriteam =
+ W_StoreBitmap3 ("bitmaps/misclib/color/oriteam.bmp", BMP_TEAM_SELECT_WIDTH,
+ BMP_TEAM_SELECT_HEIGHT, BMP_ORITEAM, w, LR_DEFAULTCOLOR);
genopic =
W_StoreBitmap3 ("bitmaps/misclib/color/genocide.bmp", WINSIDE,
WINSIDE, BMP_GENO, w, LR_DEFAULTCOLOR);
@@ -2049,8 +2062,25 @@
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)
+ {
+ 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;
+ }
(void) sprintf (buf, "%d", num);
W_MaskText (win, 5, 46, shipCol[teamNo + 1], buf, strlen (buf),
W_BigFont);
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- mswindow.c 11 Mar 2007 22:15:58 -0000 1.45
+++ mswindow.c 14 Mar 2007 23:24:09 -0000 1.46
@@ -494,6 +494,10 @@
free (ship_bitmaps[4]);
// Free other bitmaps
+ free (fedteam);
+ free (romteam);
+ free (kliteam);
+ free (oriteam);
free (clockpic);
free (clockhandpic);
Index: enter.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- enter.c 13 Mar 2007 18:35:00 -0000 1.8
+++ enter.c 14 Mar 2007 23:24:08 -0000 1.9
@@ -258,7 +258,7 @@
if (newDashboard)
return;
sprintf (buf,
- "Flags Warp Dam Shd Torps Kills Armies Fuel Wtemp Etemp");
+ "Flags Warp Dam Shd Torps Kills Armies Fuel Wtemp Etemp Time");
W_WriteText (tstatw, 50, 5, textColor, buf, strlen (buf), W_RegularFont);
sprintf (buf,
"Maximum: %2d %3d %3d %3d %6d %3d %3d",
Index: dashboard.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dashboard.c 14 Mar 2007 18:36:07 -0000 1.17
+++ dashboard.c 14 Mar 2007 23:24:08 -0000 1.18
@@ -469,7 +469,10 @@
else
buf[11] = ' ';
- W_WriteText (tstatw, 2, 3, textColor, "Flags", 5, W_RegularFont);
+ if (me->p_flags & (PFWEP | PFENG))
+ W_WriteText (tstatw, 2, 3, W_Red, "Flags", 5, W_RegularFont);
+ else
+ W_WriteText (tstatw, 2, 3, textColor, "Flags", 5, W_RegularFont);
W_WriteText (tstatw, 2, 17, textColor, buf, 12, W_RegularFont);
old_flags = me->p_flags;
}
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- data.c 13 Mar 2007 22:31:17 -0000 1.61
+++ data.c 14 Mar 2007 23:24:08 -0000 1.62
@@ -256,6 +256,7 @@
extern double Sin[], Cos[];
+W_Icon fedteam, romteam, kliteam, oriteam;
W_Icon stipple, clockpic, clockhandpic, genopic, genopic2, icon;
W_Color borderColor, backColor, textColor, myColor, warningColor, shipCol[5],