eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Cleaned up some precompiler conditions.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1558 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-11-03 23:49:49 +00:00
parent f0e4a06704
commit c47a3ae99a
3 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -3011,7 +3011,9 @@ void Host_Init (quakeparms_t *parms)
Plug_Init(); Plug_Init();
#endif #endif
#ifdef CL_MASTER
Master_SetupSockets(); Master_SetupSockets();
#endif
// Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); // Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
Con_TPrintf (TL_HEAPSIZE, parms->memsize/ (1024*1024.0)); Con_TPrintf (TL_HEAPSIZE, parms->memsize/ (1024*1024.0));

2
engine/client/m_download.c
View file

@ -1,5 +1,5 @@
#include "quakedef.h" #include "quakedef.h"
#ifndef MINIMAL #ifdef WEBCLIENT
#define ROOTDOWNLOADABLESSOURCE "http://fteqw.sourceforge.net/downloadables.txt" #define ROOTDOWNLOADABLESSOURCE "http://fteqw.sourceforge.net/downloadables.txt"
#define INSTALLEDFILES "installed.lst" //the file that resides in the quakedir (saying what's installed). #define INSTALLEDFILES "installed.lst" //the file that resides in the quakedir (saying what's installed).

58
engine/client/menu.c
View file

@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details. See the GNU General Public License for more details.
@ -129,7 +129,7 @@ void M_BuildTranslationTable(int top, int bottom)
memcpy (dest + BOTTOM_RANGE, source + bottom, 16); memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
else else
for (j=0 ; j<16 ; j++) for (j=0 ; j<16 ; j++)
dest[BOTTOM_RANGE+j] = source[bottom+15-j]; dest[BOTTOM_RANGE+j] = source[bottom+15-j];
} }
/* /*
@ -207,7 +207,7 @@ void M_DrawTextBox (int x, int y, int width, int lines)
//============================================================================= //=============================================================================
int m_save_demonum; int m_save_demonum;
/* /*
================ ================
M_ToggleMenu_f M_ToggleMenu_f
@ -331,7 +331,7 @@ bindnames_t q2bindnames[] =
{"cmd invprev", "prev item"}, {"cmd invprev", "prev item"},
{"cmd invnext", "next item"}, {"cmd invnext", "next item"},
{"cmd help", "help computer" }, {"cmd help", "help computer" },
{NULL} {NULL}
}; };
#endif #endif
@ -427,7 +427,7 @@ void M_Keys_Draw (void)
M_Print (12, 32, "Press a key or button for this action"); M_Print (12, 32, "Press a key or button for this action");
else else
M_Print (18, 32, "Enter to change, backspace to clear"); M_Print (18, 32, "Enter to change, backspace to clear");
// search for known bindings // search for known bindings
for (i=0 ; ; i++) for (i=0 ; ; i++)
{ {
@ -438,9 +438,9 @@ void M_Keys_Draw (void)
M_Print (16, y, bindnames[i].name); M_Print (16, y, bindnames[i].name);
l = strlen (bindnames[i].command); l = strlen (bindnames[i].command);
M_FindKeysForCommand (bindnames[i].command, keys); M_FindKeysForCommand (bindnames[i].command, keys);
if (keys[0] == -1) if (keys[0] == -1)
{ {
M_Print (140, y, "???"); M_Print (140, y, "???");
@ -457,7 +457,7 @@ void M_Keys_Draw (void)
} }
} }
} }
if (bind_grab) if (bind_grab)
M_DrawCharacter (130, 48 + keys_cursor*8, '='); M_DrawCharacter (130, 48 + keys_cursor*8, '=');
else else
@ -469,7 +469,7 @@ void M_Keys_Key (int k)
{ {
char cmd[80]; char cmd[80];
int keys[2]; int keys[2];
if (bind_grab) if (bind_grab)
{ // defining a key { // defining a key
S_LocalSound ("misc/menu1.wav"); S_LocalSound ("misc/menu1.wav");
@ -479,14 +479,14 @@ void M_Keys_Key (int k)
} }
else if (k != '`') else if (k != '`')
{ {
sprintf (cmd, "bind %s \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor].command); sprintf (cmd, "bind %s \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor].command);
Cbuf_InsertText (cmd, RESTRICT_LOCAL); Cbuf_InsertText (cmd, RESTRICT_LOCAL);
} }
bind_grab = false; bind_grab = false;
return; return;
} }
switch (k) switch (k)
{ {
case K_ESCAPE: case K_ESCAPE:
@ -535,7 +535,7 @@ int helppagemin;
void M_Menu_Help_f (void) void M_Menu_Help_f (void)
{ {
key_dest = key_menu; key_dest = key_menu;
m_state = m_help; m_state = m_help;
m_entersound = true; m_entersound = true;
@ -575,7 +575,7 @@ void M_Help_Key (int key)
case K_ESCAPE: case K_ESCAPE:
M_Menu_Main_f (); M_Menu_Main_f ();
break; break;
case K_UPARROW: case K_UPARROW:
case K_RIGHTARROW: case K_RIGHTARROW:
m_entersound = true; m_entersound = true;
@ -600,14 +600,14 @@ int msgNumber;
int m_quit_prevstate; int m_quit_prevstate;
qboolean wasInMenus; qboolean wasInMenus;
char *quitMessage [] = char *quitMessage [] =
{ {
/* .........1.........2.... */ /* .........1.........2.... */
" Are you gonna quit ", " Are you gonna quit ",
" this game just like ", " this game just like ",
" everything else? ", " everything else? ",
" ", " ",
" Milord, methinks that ", " Milord, methinks that ",
" thou art a lowly ", " thou art a lowly ",
" quitter. Is this true? ", " quitter. Is this true? ",
@ -622,22 +622,22 @@ char *quitMessage [] =
" for trying to quit! ", " for trying to quit! ",
" Press Y to get ", " Press Y to get ",
" smacked out. ", " smacked out. ",
" Press Y to quit like a ", " Press Y to quit like a ",
" big loser in life. ", " big loser in life. ",
" Press N to stay proud ", " Press N to stay proud ",
" and successful! ", " and successful! ",
" If you press Y to ", " If you press Y to ",
" quit, I will summon ", " quit, I will summon ",
" Satan all over your ", " Satan all over your ",
" hard drive! ", " hard drive! ",
" Um, Asmodeus dislikes ", " Um, Asmodeus dislikes ",
" his children trying to ", " his children trying to ",
" quit. Press Y to return", " quit. Press Y to return",
" to your Tinkertoys. ", " to your Tinkertoys. ",
" If you quit now, I'll ", " If you quit now, I'll ",
" throw a blanket-party ", " throw a blanket-party ",
" for you next time! ", " for you next time! ",
@ -698,7 +698,7 @@ void M_Quit_Draw (void)
"0 QuakeWorld", "0 QuakeWorld",
"1 version " VSTR2(VERSION), "1 version " VSTR2(VERSION),
"1modified by Forethought Entertainment", "1modified by Forethought Entertainment",
"0Based on QuakeWorld Version 2.40", "0Based on QuakeWorld Version 2.40",
"1", "1",
"0Additional Programming", "0Additional Programming",
"1 David Walton", "1 David Walton",
@ -773,7 +773,7 @@ qboolean MC_Quit_Key (int key, menu_t *menu)
menu_t quitmenu; menu_t quitmenu;
void M_Menu_Quit_f (void) void M_Menu_Quit_f (void)
{ {
int i; int i;
CL_Disconnect (); CL_Disconnect ();
@ -781,17 +781,17 @@ void M_Menu_Quit_f (void)
key_dest = key_menu; key_dest = key_menu;
m_state = m_complex; m_state = m_complex;
m_entersound = true; m_entersound = true;
M_RemoveMenu(&quitmenu); M_RemoveMenu(&quitmenu);
memset(&quitmenu, 0, sizeof(quitmenu)); memset(&quitmenu, 0, sizeof(quitmenu));
M_AddMenuFront(&quitmenu); M_AddMenuFront(&quitmenu);
quitmenu.exclusive = false; quitmenu.exclusive = false;
quitmenu.key = MC_Quit_Key; quitmenu.key = MC_Quit_Key;
i = rand()&7; i = rand()&7;
MC_AddWhiteText(&quitmenu, 64, 84, quitMessage[i*4+0], false); MC_AddWhiteText(&quitmenu, 64, 84, quitMessage[i*4+0], false);
MC_AddWhiteText(&quitmenu, 64, 92, quitMessage[i*4+1], false); MC_AddWhiteText(&quitmenu, 64, 92, quitMessage[i*4+1], false);
MC_AddWhiteText(&quitmenu, 64, 100, quitMessage[i*4+2], false); MC_AddWhiteText(&quitmenu, 64, 100, quitMessage[i*4+2], false);
@ -828,7 +828,7 @@ void M_Init_Internal (void)
Cmd_AddRemCommand ("menu_single", M_Menu_SinglePlayer_f); Cmd_AddRemCommand ("menu_single", M_Menu_SinglePlayer_f);
Cmd_AddRemCommand ("menu_multi", M_Menu_MultiPlayer_f); Cmd_AddRemCommand ("menu_multi", M_Menu_MultiPlayer_f);
Cmd_AddRemCommand ("menu_demo", M_Menu_Demos_f); Cmd_AddRemCommand ("menu_demo", M_Menu_Demos_f);
Cmd_AddRemCommand ("menu_keys", M_Menu_Keys_f); Cmd_AddRemCommand ("menu_keys", M_Menu_Keys_f);
Cmd_AddRemCommand ("help", M_Menu_Help_f); Cmd_AddRemCommand ("help", M_Menu_Help_f);
Cmd_AddRemCommand ("menu_quit", M_Menu_Quit_f); Cmd_AddRemCommand ("menu_quit", M_Menu_Quit_f);
@ -852,14 +852,14 @@ void M_Init_Internal (void)
Cmd_AddRemCommand ("menu_particles", M_Menu_Particles_f); Cmd_AddRemCommand ("menu_particles", M_Menu_Particles_f);
Cmd_AddRemCommand ("menu_particlesets", M_Menu_ParticleSets_f); Cmd_AddRemCommand ("menu_particlesets", M_Menu_ParticleSets_f);
#ifndef MINIMAL #ifdef WEBCLIENT
Cmd_AddRemCommand ("menu_download", Menu_DownloadStuff_f); Cmd_AddRemCommand ("menu_download", Menu_DownloadStuff_f);
#endif #endif
} }
void M_DeInit_Internal (void) void M_DeInit_Internal (void)
{ {
M_RemoveAllMenus(); M_RemoveAllMenus();
if (!internalmenusregistered) if (!internalmenusregistered)
return; return;
@ -873,7 +873,7 @@ void M_DeInit_Internal (void)
Cmd_RemoveCommand ("menu_single"); Cmd_RemoveCommand ("menu_single");
Cmd_RemoveCommand ("menu_multi"); Cmd_RemoveCommand ("menu_multi");
Cmd_RemoveCommand ("menu_demo"); Cmd_RemoveCommand ("menu_demo");
Cmd_RemoveCommand ("menu_keys"); Cmd_RemoveCommand ("menu_keys");
Cmd_RemoveCommand ("help"); Cmd_RemoveCommand ("help");
Cmd_RemoveCommand ("menu_quit"); Cmd_RemoveCommand ("menu_quit");