qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-22 04:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

some oldtree cruft for rogue/hipnotic removed (we'll support them in a

Browse source 
very different way than did Id Software did later on, it'll be a major
improvement, that's for sure..)

fs_basegame Cvar created, defaults to whatever you selected in config.h,
most likely id1.
This commit is contained in:
Joseph Carter 2000-05-29 12:45:05 +00:00
parent 91e380d3b3
commit efb2d99e22
4 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/commdef.h
View file

@ -60,7 +60,6 @@ extern qboolean host_initialized; /* True if into command execution. */
extern double host_frametime;
extern double realtime; /* Not bounded in any way, changed at
start of every frame, never reset */
extern qboolean standard_quake, rogue, hipnotic;
char *va(char *format, ...);
// does a varargs printf into a temp buffer

13
source/qargs.c
View file

@ -60,7 +60,6 @@ int com_argc;
char **com_argv;
char *com_cmdline;
cvar_t *cmdline;
qboolean standard_quake = true, rogue, hipnotic;
/*
================
@ -133,18 +132,6 @@ void COM_InitArgv (int argc, char **argv)
largv[com_argc] = argvdummy;
com_argv = largv;
if (COM_CheckParm ("-rogue"))
{
rogue = true;
standard_quake = false;
}
if (COM_CheckParm ("-hipnotic"))
{
hipnotic = true;
standard_quake = false;
}
}
/*

35
source/quakefs.c
View file

@ -104,6 +104,7 @@ char gamedirfile[MAX_OSPATH];
cvar_t *fs_userpath;
cvar_t *fs_sharepath;
cvar_t *fs_basegame;
int com_filesize;
@ -830,9 +831,10 @@ COM_Gamedir (char *dir)
//
Cache_Flush ();
if (strcmp (dir, BASEGAME) == 0)
if (strcmp (dir, fs_basegame->string) == 0)
return;
if (strcmp (dir, "qw") == 0)
if (strcmp (dir, "qw") == 0
&& strcmp (fs_basegame->string, "id1") == 0)
return;
COM_AddGameDirectory (dir);
@ -886,27 +888,26 @@ void
COM_InitFilesystem ( void )
{
fs_sharepath = Cvar_Get ("fs_sharepath", FS_SHAREPATH, CVAR_ROM,
"The location of shared game directories");
"location of shared (read only) game directories");
fs_userpath = Cvar_Get ("fs_userpath", FS_USERPATH, CVAR_ROM,
"The location of your game directories");
"location of your game directories");
fs_basegame = Cvar_Get ("fs_basegame", BASEGAME, CVAR_ROM,
"game to use by default");
Cmd_AddCommand ("gamedir", COM_Gamedir_f);
/*
start up with BASEGAME by default
start up with basegame->string by default
*/
COM_CreatePath (va("%s/%s/dummy", fs_userpath->string,BASEGAME));
COM_AddGameDirectory (BASEGAME);
if (hipnotic) {
COM_CreatePath (va("%s/%s/dummy", fs_userpath->string,"hipnotic"));
COM_AddGameDirectory ("hipnotic");
}
if (rogue) {
COM_CreatePath (va("%s/%s/dummy", fs_userpath->string,"rogue"));
COM_AddGameDirectory ("rogue");
}
COM_CreatePath (va("%s/%s/dummy", fs_userpath->string,
fs_basegame->string));
COM_AddGameDirectory(fs_basegame->string);
COM_CreatePath (va("%s/qw/dummy", fs_userpath->string));
COM_AddGameDirectory ("qw");
// If we're dealing with id1, use qw too
if (stricmp (fs_basegame->string, "id1") == 0)
{
COM_CreatePath (va("%s/qw/dummy", fs_userpath->string));
COM_AddGameDirectory ("qw");
}
// any set gamedirs will be freed up to here
com_base_searchpaths = com_searchpaths;

6
source/sv_sys_unix.c
View file

@ -181,12 +181,6 @@ int main(int argc, char *argv[])
parms.basedir = BASEDIR;
/*
if (Sys_FileTime ("id1/pak0.pak") != -1)
else
parms.basedir = "/raid/quake/v2";
*/
SV_Init (&parms);
// run one frame immediately for first heartbeat