scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 02:01:29 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable

Browse Source
This commit is contained in:
Goober5000 committed 2007-09-02 02:10:29 +00:00
1 parent c314641a80
commit 6ab0b17acc
47 files changed
+837 -577
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+4 -6
View File
@@ -27,14 +27,12 @@ int script_test(script_state *st)
int rval;
if ((rval = setjmp(parse_abort)) != 0)
{
mprintf(("Unable to parse scripting.tbl! Code = %i.\n", rval));
mprintf(("TABLES: Unable to parse '%s'! Error code = %i.\n", "scripting.tbl", rval));
return 0;
}
else
{
read_file_text("scripting.tbl");
reset_parse();
}
read_file_text("scripting.tbl");
reset_parse();
if(optional_string("#Global Hooks"))
{