Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26913/src
Modified Files:
data.c death.c mswindow.c newwin.c
Log Message:
Added pretty geno bitmap (no it's not Kathy Ireland, it's a color galaxy picture)
Index: death.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- death.c 21 Apr 2006 12:00:06 -0000 1.3
+++ death.c 1 May 2006 16:10:18 -0000 1.4
@@ -112,20 +112,20 @@
break;
case KPHASER:
sprintf (deathmessage,
- "You were phasered to death by %s (%c%c)",
+ "You were phasered to death by %s (%c%c).",
players[me->p_whodead].p_name,
teamlet[players[me->p_whodead].p_team],
shipnos[me->p_whodead]);
break;
case KPLANET:
sprintf (deathmessage,
- "You were killed by planetary fire from %s (%c)",
+ "You were killed by planetary fire from %s (%c).",
planets[me->p_whodead].pl_name,
teamlet[planets[me->p_whodead].pl_owner]);
break;
case KSHIP:
sprintf (deathmessage,
- "You were killed by the explosion of %s (%c%c)",
+ "You were killed by the explosion of %s (%c%c).",
players[me->p_whodead].p_name,
teamlet[players[me->p_whodead].p_team],
shipnos[me->p_whodead]);
@@ -134,12 +134,13 @@
strcpy (deathmessage, "You were killed by a dying daemon.");
break;
case KWINNER:
- sprintf (deathmessage, "Galaxy has been conquered by %s (%c%c) %s",
+ sprintf (deathmessage, "Galaxy has been conquered by %s (%c%c) %s.",
players[me->p_whodead].p_name,
teamlet[players[me->p_whodead].p_team],
shipnos[players[me->p_whodead].p_no],
teamstring[players[me->p_whodead].p_team]);
deathFont = W_BoldFont;
+ W_TileWindow (mapw, genopic);
break;
case KGHOST:
strcpy (deathmessage, "You were killed by a confused daemon.");
@@ -158,7 +159,7 @@
break;
case KPLASMA:
sprintf (deathmessage,
- "You were SMACKed by a plasma torpedo from %s (%c%c) ",
+ "You were SMACKed by a plasma torpedo from %s (%c%c).",
players[me->p_whodead].p_name,
teamlet[players[me->p_whodead].p_team],
shipnos[me->p_whodead]);
@@ -176,13 +177,13 @@
strcpy (deathmessage, "Your netrek executable didn't verify correctly.");
break;
case KTORP2:
- strcpy (deathmessage, "You were killed by detonated torpedo");
+ strcpy (deathmessage, "You were killed by detonated torpedo.");
break;
case KSHIP2:
- strcpy (deathmessage, "You were killed by chain reaction explosion");
+ strcpy (deathmessage, "You were killed by chain reaction explosion.");
break;
case KPLASMA2:
- strcpy (deathmessage, "You were killed by zapped plasma");
+ strcpy (deathmessage, "You were killed by zapped plasma.");
break;
default:
strcpy (deathmessage, "You were killed by something unknown to this game?");
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- newwin.c 30 Apr 2006 15:59:40 -0000 1.15
+++ newwin.c 1 May 2006 16:10:18 -0000 1.16
@@ -1030,6 +1030,9 @@
clockpic =
W_StoreBitmap3 ("bitmaps/misclib/clock.bmp", BMP_CLOCK_WIDTH,
BMP_CLOCK_HEIGHT, BMP_CLOCK, qwin, LR_MONOCHROME);
+ genopic =
+ W_StoreBitmap3 ("bitmaps/misclib/genocide.bmp", WINSIDE,
+ WINSIDE, BMP_GENO, w, LR_DEFAULTCOLOR);
}
@@ -1383,6 +1386,7 @@
for (i = 0; i < 4; i++)
W_UnmapWindow (teamWin[i]);
W_UnmapWindow (qwin);
+ W_UnTileWindow (mapw);
}
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mswindow.c 30 Apr 2006 15:59:40 -0000 1.9
+++ mswindow.c 1 May 2006 16:10:18 -0000 1.10
@@ -497,6 +497,7 @@
free (cloakicon);
free (stipple);
+ free (genopic);
//Remove default objects
while (defaults)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- data.c 29 Apr 2006 19:22:38 -0000 1.14
+++ data.c 1 May 2006 16:10:18 -0000 1.15
@@ -236,7 +236,7 @@
extern double Sin[], Cos[];
-W_Icon stipple, clockpic, icon;
+W_Icon stipple, clockpic, genopic, icon;
W_Color borderColor, backColor, textColor, myColor, warningColor, shipCol[5],
rColor, yColor, gColor, unColor, foreColor;