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

common.c (com_basedir): added new global char array.

Browse source 
(COM_InitFilesystem): used global com_basedir instead of the automatic
basedir variable.
common.h (com_basedir): added extern.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@95 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-03-01 11:55:13 +00:00
parent 6feadde1c2
commit 3724ddbb02
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Quake/common.c
View file

@ -1354,6 +1354,7 @@ typedef struct
char com_cachedir[MAX_OSPATH]; char com_cachedir[MAX_OSPATH];
char com_gamedir[MAX_OSPATH]; char com_gamedir[MAX_OSPATH];
char com_basedir[MAX_OSPATH];
typedef struct searchpath_s typedef struct searchpath_s
{ {
@ -1855,23 +1856,22 @@ static void kill_id1_conback (void) /* QuakeSpasm customization: */
COM_InitFilesystem COM_InitFilesystem
================= =================
*/ */
void COM_InitFilesystem () //johnfitz -- modified based on topaz's tutorial void COM_InitFilesystem (void) //johnfitz -- modified based on topaz's tutorial
{ {
int i, j; int i, j;
char basedir[MAX_OSPATH];
searchpath_t *search; searchpath_t *search;
i = COM_CheckParm ("-basedir"); i = COM_CheckParm ("-basedir");
if (i && i < com_argc-1) if (i && i < com_argc-1)
strcpy (basedir, com_argv[i+1]); strcpy (com_basedir, com_argv[i + 1]);
else else
strcpy (basedir, host_parms.basedir); strcpy (com_basedir, host_parms.basedir);
j = strlen (basedir); j = strlen (com_basedir);
if (j > 0) if (j > 0)
{ {
if ((basedir[j-1] == '\\') || (basedir[j-1] == '/')) if ((com_basedir[j-1] == '\\') || (com_basedir[j-1] == '/'))
basedir[j-1] = 0; com_basedir[j-1] = 0;
} }
i = COM_CheckParm ("-cachedir"); i = COM_CheckParm ("-cachedir");
@ -1888,8 +1888,8 @@ void COM_InitFilesystem () //johnfitz -- modified based on topaz's tutorial
com_cachedir[0] = 0; com_cachedir[0] = 0;
// start up with GAMENAME by default (id1) // start up with GAMENAME by default (id1)
COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); COM_AddGameDirectory (va("%s/"GAMENAME, com_basedir));
strcpy (com_gamedir, va("%s/"GAMENAME, basedir)); strcpy (com_gamedir, va("%s/"GAMENAME, com_basedir));
if (!fitzmode) if (!fitzmode)
{ /* QuakeSpasm customization: */ { /* QuakeSpasm customization: */
@ -1901,17 +1901,17 @@ void COM_InitFilesystem () //johnfitz -- modified based on topaz's tutorial
com_nummissionpacks = 0; com_nummissionpacks = 0;
if (COM_CheckParm ("-rogue")) if (COM_CheckParm ("-rogue"))
{ {
COM_AddGameDirectory (va("%s/rogue", basedir) ); COM_AddGameDirectory (va("%s/rogue", com_basedir));
com_nummissionpacks++; com_nummissionpacks++;
} }
if (COM_CheckParm ("-hipnotic")) if (COM_CheckParm ("-hipnotic"))
{ {
COM_AddGameDirectory (va("%s/hipnotic", basedir) ); COM_AddGameDirectory (va("%s/hipnotic", com_basedir));
com_nummissionpacks++; com_nummissionpacks++;
} }
if (COM_CheckParm ("-quoth")) if (COM_CheckParm ("-quoth"))
{ {
COM_AddGameDirectory (va("%s/quoth", basedir) ); COM_AddGameDirectory (va("%s/quoth", com_basedir));
com_nummissionpacks++; com_nummissionpacks++;
} }
//johnfitz //johnfitz
@ -1920,7 +1920,7 @@ void COM_InitFilesystem () //johnfitz -- modified based on topaz's tutorial
if (i && i < com_argc-1) if (i && i < com_argc-1)
{ {
com_modified = true; com_modified = true;
COM_AddGameDirectory (va("%s/%s", basedir, com_argv[i+1])); COM_AddGameDirectory (va("%s/%s", com_basedir, com_argv[i + 1]));
} }
i = COM_CheckParm ("-path"); i = COM_CheckParm ("-path");

1
Quake/common.h
View file

@ -173,6 +173,7 @@ char *va(char *format, ...);
extern int com_filesize; extern int com_filesize;
struct cache_user_s; struct cache_user_s;
extern char com_basedir[MAX_OSPATH];
extern char com_gamedir[MAX_OSPATH]; extern char com_gamedir[MAX_OSPATH];
void COM_WriteFile (char *filename, void *data, int len); void COM_WriteFile (char *filename, void *data, int len);