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

Limbo flag support; fix scripting debug bug

Browse Source 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3174 387891d4-d844-0410-90c0-e4c51a9137d3
This commit is contained in:
wmcoolmon authored and niffiwan committed 2015-04-29 18:42:19 +10:00
1 parent c6367345c9
commit 3f685dae15
2 files changed
+24 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+15 -13
View File
@@ -261,18 +261,20 @@ int lua_get_args(lua_State *L, char *fmt, ...)
char funcname[128];
#ifndef NDEBUG
lua_Debug ar;
lua_getstack(L, 0, &ar);
lua_getinfo(L, "nl", &ar);
strcpy(funcname, "");
if(ar.name != NULL) {
strcat(funcname, ar.name);
}
if(ar.currentline > -1) {
char buf[8];
itoa(ar.currentline, buf, 10);
strcat(funcname, " (Line ");
strcat(funcname, buf);
strcat(funcname, ")");
if(lua_getstack(L, 0, &ar))
{
lua_getinfo(L, "nl", &ar);
strcpy(funcname, "");
if(ar.name != NULL) {
strcat(funcname, ar.name);
}
if(ar.currentline > -1) {
char buf[8];
itoa(ar.currentline, buf, 10);
strcat(funcname, " (Line ");
strcat(funcname, buf);
strcat(funcname, ")");
}
}
if(!strlen(funcname)) {
//WMC - Try and get at function name from upvalues
@@ -3120,7 +3122,7 @@ LUA_FUNC(warpOut, l_Ship, "[boolean Departing]", "True", "Warps ship out; argume
if(!objh->IsValid())
return LUA_RETURN_NIL;
shipfx_warpout_start(objh->objp);
shipfx_warpout_start(objh->objp, b);
return LUA_RETURN_TRUE;
}