remove quakespasm extensions to fitzquake
parent
dd68032f7d
commit
9b0adc84c5
|
@ -36,8 +36,6 @@ cvar_t cmdline = {"cmdline", "", CVAR_ROM/*|CVAR_SERVERINFO*/}; /* sending cmdl
|
||||||
|
|
||||||
static bool com_modified; // set true if using non-id files
|
static bool com_modified; // set true if using non-id files
|
||||||
|
|
||||||
bool fitzmode;
|
|
||||||
|
|
||||||
static void COM_Path_f(void);
|
static void COM_Path_f(void);
|
||||||
|
|
||||||
// if a packfile directory differs from this, it is assumed to be hacked
|
// if a packfile directory differs from this, it is assumed to be hacked
|
||||||
|
@ -1299,17 +1297,6 @@ void COM_InitArgv(int32_t argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
================
|
|
||||||
Test_f -- johnfitz
|
|
||||||
================
|
|
||||||
*/
|
|
||||||
#ifdef _DEBUG
|
|
||||||
static void FitzTest_f(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
================
|
================
|
||||||
COM_Init
|
COM_Init
|
||||||
|
@ -1355,12 +1342,6 @@ void COM_Init(void)
|
||||||
BigFloat = FloatSwap;
|
BigFloat = FloatSwap;
|
||||||
LittleFloat = FloatNoSwap;
|
LittleFloat = FloatNoSwap;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(COM_CheckParm("-fitz"))
|
|
||||||
fitzmode = true;
|
|
||||||
#ifdef _DEBUG
|
|
||||||
Cmd_AddCommand("fitztest", FitzTest_f); //johnfitz
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1944,7 +1925,7 @@ static void COM_AddGameDirectory(const char *base, const char *dir)
|
||||||
int32_t i;
|
int32_t i;
|
||||||
uint32_t path_id;
|
uint32_t path_id;
|
||||||
searchpath_t *search;
|
searchpath_t *search;
|
||||||
pack_t *pak, *qspak;
|
pack_t *pak;
|
||||||
char pakfile[MAX_OSPATH];
|
char pakfile[MAX_OSPATH];
|
||||||
bool been_here = false;
|
bool been_here = false;
|
||||||
|
|
||||||
|
@ -1968,16 +1949,6 @@ _add_path:
|
||||||
{
|
{
|
||||||
q_snprintf(pakfile, sizeof(pakfile), "%s/pak%" PRIi32 ".pak", com_gamedir, i);
|
q_snprintf(pakfile, sizeof(pakfile), "%s/pak%" PRIi32 ".pak", com_gamedir, i);
|
||||||
pak = COM_LoadPackFile(pakfile);
|
pak = COM_LoadPackFile(pakfile);
|
||||||
if(i != 0 || path_id != 1 || fitzmode)
|
|
||||||
qspak = NULL;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
bool old = com_modified;
|
|
||||||
if(been_here) base = host_parms->userdir;
|
|
||||||
q_snprintf(pakfile, sizeof(pakfile), "%s/quakespasm.pak", base);
|
|
||||||
qspak = COM_LoadPackFile(pakfile);
|
|
||||||
com_modified = old;
|
|
||||||
}
|
|
||||||
if(pak)
|
if(pak)
|
||||||
{
|
{
|
||||||
search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
|
search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
|
||||||
|
@ -1986,14 +1957,6 @@ _add_path:
|
||||||
search->next = com_searchpaths;
|
search->next = com_searchpaths;
|
||||||
com_searchpaths = search;
|
com_searchpaths = search;
|
||||||
}
|
}
|
||||||
if(qspak)
|
|
||||||
{
|
|
||||||
search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
|
|
||||||
search->path_id = path_id;
|
|
||||||
search->pack = qspak;
|
|
||||||
search->next = com_searchpaths;
|
|
||||||
com_searchpaths = search;
|
|
||||||
}
|
|
||||||
if(!pak) break;
|
if(!pak) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -295,7 +295,6 @@ long FS_filelength(fshandle_t *fh);
|
||||||
|
|
||||||
|
|
||||||
extern bool standard_quake, rogue, hipnotic;
|
extern bool standard_quake, rogue, hipnotic;
|
||||||
extern bool fitzmode;
|
|
||||||
/* if true, run in fitzquake mode disabling custom quakespasm hacks */
|
/* if true, run in fitzquake mode disabling custom quakespasm hacks */
|
||||||
|
|
||||||
struct cvar_s;
|
struct cvar_s;
|
||||||
|
|
|
@ -77,8 +77,6 @@ cvar_t pausable = {"pausable", "1", CVAR_NONE};
|
||||||
|
|
||||||
cvar_t developer = {"developer", "0", CVAR_NONE};
|
cvar_t developer = {"developer", "0", CVAR_NONE};
|
||||||
|
|
||||||
cvar_t temp1 = {"temp1", "0", CVAR_NONE};
|
|
||||||
|
|
||||||
cvar_t devstats = {"devstats", "0", CVAR_NONE}; //johnfitz -- track developer statistics that vary every frame
|
cvar_t devstats = {"devstats", "0", CVAR_NONE}; //johnfitz -- track developer statistics that vary every frame
|
||||||
|
|
||||||
devstats_t dev_stats, dev_peakstats;
|
devstats_t dev_stats, dev_peakstats;
|
||||||
|
@ -282,8 +280,6 @@ void Host_InitLocal(void)
|
||||||
|
|
||||||
Cvar_RegisterVariable(&pausable);
|
Cvar_RegisterVariable(&pausable);
|
||||||
|
|
||||||
Cvar_RegisterVariable(&temp1);
|
|
||||||
|
|
||||||
Host_FindMaxClients();
|
Host_FindMaxClients();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2242,14 +2242,6 @@ void Host_Startdemos_f(void)
|
||||||
if(!sv.active && cls.demonum != -1 && !cls.demoplayback)
|
if(!sv.active && cls.demonum != -1 && !cls.demoplayback)
|
||||||
{
|
{
|
||||||
cls.demonum = 0;
|
cls.demonum = 0;
|
||||||
if(!fitzmode)
|
|
||||||
{
|
|
||||||
/* QuakeSpasm customization: */
|
|
||||||
/* go straight to menu, no CL_NextDemo */
|
|
||||||
cls.demonum = -1;
|
|
||||||
Cbuf_InsertText("menu_main\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
CL_NextDemo();
|
CL_NextDemo();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -281,8 +281,6 @@ void M_Main_Key(int32_t key)
|
||||||
key_dest = key_game;
|
key_dest = key_game;
|
||||||
m_state = m_none;
|
m_state = m_none;
|
||||||
cls.demonum = m_save_demonum;
|
cls.demonum = m_save_demonum;
|
||||||
if(!fitzmode) /* QuakeSpasm customization: */
|
|
||||||
break;
|
|
||||||
if(cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
|
if(cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
|
||||||
CL_NextDemo();
|
CL_NextDemo();
|
||||||
break;
|
break;
|
||||||
|
@ -2641,13 +2639,6 @@ 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;
|
||||||
|
|
||||||
|
|
|
@ -506,20 +506,6 @@ void Sbar_SoloScoreboard(void)
|
||||||
sprintf(str, "Secrets: %" PRIi32 "/%" PRIi32 "", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]);
|
sprintf(str, "Secrets: %" PRIi32 "/%" PRIi32 "", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]);
|
||||||
Sbar_DrawString(312 - strlen(str) * 8, 12, str);
|
Sbar_DrawString(312 - strlen(str) * 8, 12, str);
|
||||||
|
|
||||||
if(!fitzmode)
|
|
||||||
{
|
|
||||||
/* QuakeSpasm customization: */
|
|
||||||
q_snprintf(str, sizeof(str), "skill %" PRIi32 "", (int32_t)(skill.value + 0.5));
|
|
||||||
Sbar_DrawString(160 - strlen(str) * 4, 12, str);
|
|
||||||
|
|
||||||
q_snprintf(str, sizeof(str), "%s (%s)", cl.levelname, cl.mapname);
|
|
||||||
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;
|
minutes = cl.time / 60;
|
||||||
seconds = cl.time - 60 * minutes;
|
seconds = cl.time - 60 * minutes;
|
||||||
tens = seconds / 10;
|
tens = seconds / 10;
|
||||||
|
|
Loading…
Reference in New Issue