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

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

No files matched your search

+7 -6
View File
@@ -507,20 +507,19 @@ static char* Test_file = "python.tbl";
int python_test()
{
int rval;
// open localization
lcl_ext_open();
if ((rval = setjmp(parse_abort)) != 0)
{
nprintf(("Warning", "Unable to parse %s! Code = %i.\n", Test_file, rval));
mprintf(("PYTHON: Unable to parse '%s'! Error code = %i.\n", Test_file, rval));
lcl_ext_close();
return 0;
}
else
{
read_file_text(Test_file);
reset_parse();
}
read_file_text(Test_file);
reset_parse();
Temp_session = py_session_create();
//py_session_import_module(&my_session, "gr");
@@ -536,7 +535,9 @@ int python_test()
}
}
// close localization
lcl_ext_close();
return 1;
}
void python_do_frame()