Trunk sync r7593

This commit is contained in:
The_E committed 2011-08-30 18:17:09 +00:00
1 parent ad3b01c2f2
commit d8a728d5f1
72 files changed
+2524 -1925

No files matched your search

+2 -2
View File
@@ -564,7 +564,7 @@ void script_state::SetHookVar(char *name, char format, void *data)
if(format == 's')
ade_set_args(LuaState, fmt, data);
else
ade_set_args(LuaState, fmt, *(ade_odata*)data);
ade_set_args(LuaState, fmt, *(ade_odata*)data); //-V510
}
//--------------------
//WMC - This was a separate function
@@ -893,7 +893,7 @@ int script_state::OutputMeta(char *filename)
return 0;
}
if (FS_VERSION_BUILD == 0 && FS_VERSION_REVIS == 0)
if (FS_VERSION_BUILD == 0 && FS_VERSION_REVIS == 0) //-V547
{
fprintf(fp, "<html>\n<head>\n\t<title>Script Output - FSO v%i.%i (%s)</title>\n</head>\n", FS_VERSION_MAJOR, FS_VERSION_MINOR, StateName);
fputs("<body>", fp);