fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 07:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Steven's customizations:

Browse source 
host_cmd.c (Host_Startdemos_f): if not running in fitzmode, don't add demos
to the loop and set cls.demonum.to -1.
menu.c (M_Draw): if not running in fitzmode, quit immediately without the
dialog for the m_quit case.
sbar.c (Sbar_SoloScoreboard): restored the original behavior depending on
whether we are running in fitzmode.
Marked the code with /* QuakeSpasm customization: */ in those places.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@50 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-02-18 12:55:19 +00:00
parent 0a26b3bc2d
commit a5c45574d5
3 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Quake/host_cmd.c
View file

@ -2138,6 +2138,14 @@ void Host_Startdemos_f (void)
return; return;
} }
if (!fitzmode)
{ /* QuakeSpasm customization: */
cls.demonum = -1;
/* go straight to menu */
Cbuf_InsertText("menu_main");
return;
}
c = Cmd_Argc() - 1; c = Cmd_Argc() - 1;
if (c > MAX_DEMOS) if (c > MAX_DEMOS)
{ {

6
Quake/menu.c
View file

@ -3026,6 +3026,12 @@ void M_Draw (void)
break; break;
case m_quit: case m_quit:
if (!fitzmode)
{ /* QuakeSpasm customization: */
/* Quit now! S.A. */
key_dest = key_console;
Host_Quit_f ();
}
M_Quit_Draw (); M_Quit_Draw ();
break; break;

35
Quake/sbar.c
View file

@ -490,7 +490,8 @@ Sbar_SoloScoreboard -- johnfitz -- new layout
void Sbar_SoloScoreboard (void) void Sbar_SoloScoreboard (void)
{ {
char str[256]; char str[256];
int len; int minutes, seconds, tens, units;
int len;
sprintf (str,"Kills: %i/%i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]); sprintf (str,"Kills: %i/%i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]);
Sbar_DrawString (8, 12, str); Sbar_DrawString (8, 12, str);
@ -498,18 +499,34 @@ void Sbar_SoloScoreboard (void)
sprintf (str,"Secrets: %i/%i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]); sprintf (str,"Secrets: %i/%i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]);
Sbar_DrawString (312 - strlen(str)*8, 12, str); Sbar_DrawString (312 - strlen(str)*8, 12, str);
sprintf (str,"skill %i", (int)(skill.value + 0.5)); if (!fitzmode)
{ /* QuakeSpasm customization: */
sprintf (str,"skill %i", (int)(skill.value + 0.5));
Sbar_DrawString (160 - strlen(str)*4, 12, str);
sprintf (str,cl.levelname);
strcat (str," (");
strncat (str,cl.mapname,250-strlen(str));
strcat (str,")");
len = strlen (str);
if (len > 40)
Sbar_DrawScrollString (0, 4, 320, str);
else
Sbar_DrawString (160 - len*4, 4, str);
return;
}
minutes = cl.time / 60;
seconds = cl.time - 60*minutes;
tens = seconds / 10;
units = seconds - 10*tens;
sprintf (str,"%i:%i%i", minutes, tens, units);
Sbar_DrawString (160 - strlen(str)*4, 12, str); Sbar_DrawString (160 - strlen(str)*4, 12, str);
sprintf (str,cl.levelname); len = strlen (cl.levelname);
strcat (str," (");
strncat (str,cl.mapname,250-strlen(str));
strcat (str,")");
len = strlen (str);
if (len > 40) if (len > 40)
Sbar_DrawScrollString (0, 4, 320, str); Sbar_DrawScrollString (0, 4, 320, cl.levelname);
else else
Sbar_DrawString (160 - len*4, 4, str); Sbar_DrawString (160 - len*4, 4, cl.levelname);
} }
/* /*