From 10224b1d00e91e6b8656e868f7d92d4dc6f0711a Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 11 May 2000 11:43:49 +0000 Subject: [PATCH] delay setting the CVAR_ROM bit for fs_*path so they can be overridden by the command line --- common/host.c | 7 +++++++ common/quakefs.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/host.c b/common/host.c index d5ea580..0dc4e0f 100644 --- a/common/host.c +++ b/common/host.c @@ -53,6 +53,7 @@ #include #include #include +#include #ifdef QUAKEWORLD #include #endif @@ -577,6 +578,12 @@ Host_Init (quakeparms_t *parms) Cmd_StuffCmds_f (); Cbuf_Execute (); + // make these read-only + fs_basepath = Cvar_Get ("fs_basepath", fs_basepath->string, CVAR_ROM, + "the location of your game directories"); + fs_sharepath = Cvar_Get ("fs_sharepath", fs_sharepath->string, + CVAR_ROM, "read-only game directories"); + V_Init (); Chase_Init (); diff --git a/common/quakefs.c b/common/quakefs.c index a31a26c..7060fd6 100644 --- a/common/quakefs.c +++ b/common/quakefs.c @@ -983,10 +983,10 @@ COM_InitFilesystem ( void ) int i; #endif - fs_basepath = Cvar_Get ("fs_basepath", FS_BASEPATH, CVAR_ROM, + fs_basepath = Cvar_Get ("fs_basepath", FS_BASEPATH, CVAR_NONE, "the location of your game directories"); fs_sharepath = Cvar_Get ("fs_sharepath", fs_basepath->string, - CVAR_ROM, "read-only game directories"); + CVAR_NONE, "read-only game directories"); Cmd_AddCommand ("gamedir", COM_Gamedir_f); /*