Module twilight: Change committed
warp at icculus.org
warp at icculus.org
Thu Jul 3 11:16:45 EDT 2003
Commiter : warp
CVSROOT : /cvs/cvsroot/twilight
Module : twilight
Commit time: 2003-07-03 15:16:45 UTC
Log message:
Some HUD tweaks.
(Thanks to Tomaz for getting me to do it, and helping with the numbers.)
Update some dsp files.
(Like the rest of the past few days, completely Tomaz.)
Modified files:
src/client/hud.c src/image/twilight_image.dsp
src/sound/twilight_sound.dsp src/tools/lhbin2c.dsp
------=MIME.ae95f8736c3a4c9ae16625997d163f10
Content-Type: text/plain; name="twilight.20030703.151645.warp.diff"
Content-Disposition: attachment; filename="twilight.20030703.151645.warp.diff"
Content-Transfer-Encoding: 8bit
Index: twilight/src/client/hud.c
diff -u twilight/src/client/hud.c:1.12 twilight/src/client/hud.c:1.13
--- twilight/src/client/hud.c:1.12 Thu Jul 3 10:43:32 2003
+++ twilight/src/client/hud.c Thu Jul 3 11:16:34 2003
@@ -24,7 +24,7 @@
*/
static const char rcsid[] =
- "$Id: hud.c,v 1.12 2003/07/03 14:43:32 warp Exp $";
+ "$Id: hud.c,v 1.13 2003/07/03 15:16:34 warp Exp $";
#include "twiconfig.h"
@@ -926,18 +926,26 @@
}
void
-HUD_Draw_Single_Stats (void)
+HUD_Draw_Single_Stats (qboolean completed)
{
image_t *pic;
double time;
- int dig, num, x;
+ int dig, num, x, y;
- x = (vid.width_2d / 2) - 137;
+ x = (vid.width_2d / 2) - 160;
if (x < 0)
x = 0;
+ y = (vid.height_2d / 2) - 120;
+ if (y < 0)
+ y = 0;
+
+ if (completed) {
+ pic = Draw_CacheImg ("gfx/complete");
+ Draw_Img (x + 64, y + 24, pic);
+ }
pic = Draw_CacheImg ("gfx/inter");
- Draw_Img (x + 0, 56, pic);
+ Draw_Img (x + 0, y + 56, pic);
// time
if (ccl.completed_time)
@@ -946,19 +954,19 @@
time = ccl.time;
dig = time / 60;
- HUD_DrawNum (x + 160, 64, dig, 3, 0);
+ HUD_DrawNum (x + 160, y + 64, dig, 3, 0);
num = time - dig * 60;
- Draw_Img (x + 234, 64, sb_colon);
- Draw_Img (x + 246, 64, sb_nums[0][num / 10]);
- Draw_Img (x + 266, 64, sb_nums[0][num % 10]);
-
- HUD_DrawNum (x + 160, 104, ccl.stats[STAT_SECRETS], 3, 0);
- Draw_Img (x + 232, 104, sb_slash);
- HUD_DrawNum (x + 240, 104, ccl.stats[STAT_TOTALSECRETS], 3, 0);
-
- HUD_DrawNum (x + 160, 144, ccl.stats[STAT_MONSTERS], 3, 0);
- Draw_Img (x + 232, 144, sb_slash);
- HUD_DrawNum (x + 240, 144, ccl.stats[STAT_TOTALMONSTERS], 3, 0);
+ Draw_Img (x + 234, y + 64, sb_colon);
+ Draw_Img (x + 246, y + 64, sb_nums[0][num / 10]);
+ Draw_Img (x + 266, y + 64, sb_nums[0][num % 10]);
+
+ HUD_DrawNum (x + 160, y + 104, ccl.stats[STAT_SECRETS], 3, 0);
+ Draw_Img (x + 232, y + 104, sb_slash);
+ HUD_DrawNum (x + 240, y + 104, ccl.stats[STAT_TOTALSECRETS], 3, 0);
+
+ HUD_DrawNum (x + 160, y + 144, ccl.stats[STAT_MONSTERS], 3, 0);
+ Draw_Img (x + 232, y + 144, sb_slash);
+ HUD_DrawNum (x + 240, y + 144, ccl.stats[STAT_TOTALMONSTERS], 3, 0);
}
void
@@ -985,7 +993,7 @@
if (show) {
if (ccl.game_teams == GAME_COOP || ccl.game_teams == GAME_SINGLE) {
- HUD_Draw_Single_Stats ();
+ HUD_Draw_Single_Stats (false);
return;
}
@@ -1003,8 +1011,6 @@
void
HUD_IntermissionOverlay (void)
{
- image_t *pic;
-
if (ccls.state != ca_active)
return;
@@ -1017,9 +1023,7 @@
break;
case GAME_COOP:
case GAME_SINGLE:
- pic = Draw_CacheImg ("gfx/complete");
- Draw_Img (64, 24, pic);
- HUD_Draw_Single_Stats ();
+ HUD_Draw_Single_Stats (true);
break;
}
}
Index: twilight/src/image/twilight_image.dsp
diff -u twilight/src/image/twilight_image.dsp:1.6 twilight/src/image/twilight_image.dsp:1.7
--- twilight/src/image/twilight_image.dsp:1.6 Tue Jul 1 18:53:55 2003
+++ twilight/src/image/twilight_image.dsp Thu Jul 3 11:16:34 2003
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../base" /I "../fs" /I "../include" /I "../renderer" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../base" /I "../fs" /I "../include" /I "../renderer" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /c
# ADD BASE RSC /l 0x419 /d "NDEBUG"
# ADD RSC /l 0x419 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../base" /I "../fs" /I "../include" /I "../renderer" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../base" /I "../fs" /I "../include" /I "../renderer" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /GZ /c
# ADD BASE RSC /l 0x419 /d "_DEBUG"
# ADD RSC /l 0x419 /d "_DEBUG"
BSC32=bscmake.exe
Index: twilight/src/sound/twilight_sound.dsp
diff -u twilight/src/sound/twilight_sound.dsp:1.5 twilight/src/sound/twilight_sound.dsp:1.6
--- twilight/src/sound/twilight_sound.dsp:1.5 Tue Jul 1 18:53:55 2003
+++ twilight/src/sound/twilight_sound.dsp Thu Jul 3 11:16:35 2003
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /c
# ADD BASE RSC /l 0x419 /d "NDEBUG"
# ADD RSC /l 0x419 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_SDL_H" /YX /FD /GZ /c
# ADD BASE RSC /l 0x419 /d "_DEBUG"
# ADD RSC /l 0x419 /d "_DEBUG"
BSC32=bscmake.exe
Index: twilight/src/tools/lhbin2c.dsp
diff -u twilight/src/tools/lhbin2c.dsp:1.3 twilight/src/tools/lhbin2c.dsp:1.4
--- twilight/src/tools/lhbin2c.dsp:1.3 Wed Jul 2 13:56:31 2003
+++ twilight/src/tools/lhbin2c.dsp Thu Jul 3 11:16:35 2003
@@ -28,33 +28,9 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "lhbin2c - Win32 Debug"
+!IF "$(CFG)" == "lhbin2c - Win32 Release"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x41d /d "_DEBUG"
-# ADD RSC /l 0x41d /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"lhbin2c-debug.exe" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "lhbin2c - Win32 Release"
-
-# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
@@ -66,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x41d /d "NDEBUG"
# ADD RSC /l 0x41d /d "NDEBUG"
BSC32=bscmake.exe
@@ -75,6 +51,30 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"lhbin2c.exe"
+
+!ELSEIF "$(CFG)" == "lhbin2c - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x41d /d "_DEBUG"
+# ADD RSC /l 0x41d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"lhbin2c-debug.exe" /pdbtype:sept
!ENDIF
More information about the twilight-commits
mailing list