summaryrefslogtreecommitdiff
path: root/src/qcommon
diff options
context:
space:
mode:
authorBen Millwood <thebenmachine@gmail.com>2009-10-03 12:12:12 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:45 +0000
commit32631d7354556ff88ecfe3ff9a9d80075422fbef (patch)
tree083df63c1aada8cc7d0f6849c19b3dcee056c3fe /src/qcommon
parentec254e3bebdc3957a630b23b3b77d5460f2c7674 (diff)
* Add BG_EventName and use it to simplify a series of debugging messages
* Correct crouch check in ClientTimerActions * Ensure animation togglebit on buildables is only used once per frame (bug 3377) * Make G_FloodLimited more robust and with a pointlessly informative return value * Add a brief comment to the G_SayArg* functions to explain their purpose, which wasn't at all clear to me until I experimented with them * Remove more redundant va()s * Remove an unused variable and associated functions that were causing a compiler warning
Diffstat (limited to 'src/qcommon')
-rw-r--r--src/qcommon/parse.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/qcommon/parse.c b/src/qcommon/parse.c
index 2c7595f0..9308aa6e 100644
--- a/src/qcommon/parse.c
+++ b/src/qcommon/parse.c
@@ -316,8 +316,6 @@ punctuation_t default_punctuations[] =
{NULL, 0}
};
-char basefolder[MAX_QPATH];
-
/*
===============
Parse_CreatePunctuationTable
@@ -1007,16 +1005,11 @@ Parse_LoadScriptFile
static script_t *Parse_LoadScriptFile(const char *filename)
{
fileHandle_t fp;
- char pathname[MAX_QPATH];
int length;
void *buffer;
script_t *script;
- if (strlen(basefolder))
- Com_sprintf(pathname, sizeof(pathname), "%s/%s", basefolder, filename);
- else
- Com_sprintf(pathname, sizeof(pathname), "%s", filename);
- length = FS_FOpenFileRead( pathname, &fp, qfalse );
+ length = FS_FOpenFileRead( filename, &fp, qfalse );
if (!fp) return NULL;
buffer = Z_Malloc(sizeof(script_t) + length + 1);
@@ -1100,16 +1093,6 @@ static void Parse_FreeScript(script_t *script)
/*
===============
-Parse_SetBaseFolder
-===============
-*/
-static void Parse_SetBaseFolder(char *path)
-{
- Com_sprintf(basefolder, sizeof(basefolder), path);
-}
-
-/*
-===============
Parse_SourceError
===============
*/
@@ -3508,7 +3491,6 @@ int Parse_LoadSourceHandle(const char *filename)
}
if (i >= MAX_SOURCEFILES)
return 0;
- Parse_SetBaseFolder("");
source = Parse_LoadSourceFile(filename);
if (!source)
return 0;