scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -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 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4251 387891d4-d844-0410-90c0-e4c51a9137d3
This commit is contained in:
Goober5000 authored and niffiwan committed 2015-04-29 18:43:04 +10:00
1 parent add1b9aba7
commit d68a225582
46 files changed
+964 -772
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
@@ -64,14 +64,12 @@ void script_parse_table(char *filename)
int rval;
if ((rval = setjmp(parse_abort)) != 0)
{
mprintf(("TABLES: Unable to parse '%s'. Code = %i.\n", filename, rval));
mprintf(("TABLES: Unable to parse '%s'! Error code = %i.\n", filename, rval));
return;
}
else
{
read_file_text(filename);
reset_parse();
}
read_file_text(filename);
reset_parse();
if(optional_string("#Global Hooks"))
{