configure.in:

print config info for sound type
source/quakefs.c:
	fix fs_userpath handling for other game types and add support for
	abyss
source/qargs.c:
	add -abyss checking
include/qdefs.h:
	add abyss support

Rudimentary support for the abyss mission pack has been added. Currently this
involves just the addition of -abyss to the supported command line options
(acts just like -rogue and -hipnotic) and adding abyss to the list of game
directories. Any other support that's needed (as with other rogue and hipnotic
modifications) has not been added as it is not known what's needed.
This commit is contained in:
Bill Currie 2000-08-29 20:30:28 +00:00
parent 97fb68093e
commit 60c112bc68
4 changed files with 28 additions and 11 deletions

View file

@ -661,7 +661,6 @@ dnl ==================================================================
dnl Checks for CD-ROM
dnl ==================================================================
SNDTYPE=""
CD_LIBS=""
CD_CFLAGS=""
AC_MSG_CHECKING(for CD audio support)
@ -994,4 +993,5 @@ AC_MSG_RESULT([
System game data directory: $sharepath
Per-user game data directory: $userpath
Global configuration file: $globalconf
Sound sytem: $SNDTYPE
])

View file

@ -183,7 +183,7 @@ extern int current_skill; // skill level for currently loaded level (in case
// running, this reflects the level actually in use)
extern qboolean isDedicated;
extern qboolean rogue, hipnotic, standard_quake;
extern qboolean abyss, rogue, hipnotic, standard_quake;
extern cvar_t *registered;
#endif // __qdefs_h

View file

@ -134,6 +134,12 @@ void COM_InitArgv (int argc, char **argv)
largv[com_argc] = argvdummy;
com_argv = largv;
if (COM_CheckParm ("-abyss"))
{
abyss = true;
standard_quake = false;
}
if (COM_CheckParm ("-rogue"))
{
rogue = true;

View file

@ -69,7 +69,7 @@
#include "va.h"
extern qboolean is_server;
qboolean standard_quake = true, rogue, hipnotic;
qboolean standard_quake = true, abyss, rogue, hipnotic;
cvar_t *registered;
/*
@ -883,6 +883,15 @@ void COM_Gamedir_f (void)
*/
}
void
COM_CreateGameDirectory (char *gamename)
{
if (strcmp (fs_userpath->string, FS_USERPATH))
COM_CreatePath (va("%s/%s/dummy", fs_userpath->string,
gamename));
COM_AddGameDirectory (gamename);
}
/*
COM_InitFilesystem
*/
@ -900,14 +909,16 @@ COM_InitFilesystem ( void )
/*
start up with basegame->string by default
*/
if (strcmp (fs_userpath->string, FS_USERPATH))
COM_CreatePath (va("%s/%s/dummy", fs_userpath->string,
fs_basegame->string));
COM_AddGameDirectory(fs_basegame->string);
if (hipnotic)
COM_AddGameDirectory ("hipnotic");
if (rogue)
COM_AddGameDirectory ("rogue");
COM_CreateGameDirectory(fs_basegame->string);
if (hipnotic) {
COM_CreateGameDirectory("hipnotic");
}
if (rogue) {
COM_CreateGameDirectory("rogue");
}
if (abyss) {
COM_CreateGameDirectory("abyss");
}
// any set gamedirs will be freed up to here
com_base_searchpaths = com_searchpaths;