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

Merge branch 'master' into antipodes

Browse Source 
Conflicts:
	code/globalincs/pstypes.h
	code/globalincs/windebug.cpp
	code/windows_stub/stubs.cpp
	projects/MSVC_2015/Freespace2.vcxproj
	projects/MSVC_2015/code.vcxproj
This commit is contained in:
asarium committed 2015-08-15 16:41:34 +02:00
2 parents 1d46578f00 2240e17413
commit 84279530d7
45 files changed
+860 -218
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+2 -2
View File
@@ -702,7 +702,7 @@ void script_state::SetHookVar(char *name, char format, void *data)
}
else
{
LuaError(LuaState, "Could not get HookVariable library to set hook variable '%s' - get a coder", name);
LuaError(LuaState, "Could not get HookVariable library to set hook variable '%s'", name);
if(data_ldx)
lua_pop(LuaState, 1);
}
@@ -740,7 +740,7 @@ bool script_state::GetHookVar(char *name, char format, void *data)
}
else
{
LuaError(LuaState, "Could not get HookVariable library to get hook variable '%' - get a coder", name);
LuaError(LuaState, "Could not get HookVariable library to get hook variable '%s'", name);
}
}