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

consolidate the "for reals" crap into a proper ship flag; also move the limbo flags over to SF2_*; etc.

Browse Source 
this should fix Mantis #977
--Goober5000
This commit is contained in:
Goober5000 committed 2006-07-09 01:55:42 +00:00
1 parent 25e33a5b14
commit 782231cfbe
19 files changed
+232 -148
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+6 -4
View File
@@ -3164,12 +3164,12 @@ LUA_VAR(IsInLimbo, l_Ship, "Boolean", "Ship's limbo status")
if(LUA_SETTING_VAR)
{
if(newlimbo)
shipp->flags |= SF_LIMBO;
shipp->flags2 |= SF2_IN_LIMBO;
else
shipp->flags &= ~SF_LIMBO;
shipp->flags2 &= ~SF2_IN_LIMBO;
}
return lua_set_args(L, "b", (shipp->flags & SF_LIMBO) != 0);
return lua_set_args(L, "b", (shipp->flags2 & SF2_IN_LIMBO) != 0);
}
LUA_VAR(PrimaryBanks, l_Ship, "weaponbanktype", "Array of primary weapon banks")
@@ -3465,7 +3465,9 @@ LUA_FUNC(warpOut, l_Ship, "[boolean Departing]", "True", "Warps ship out; argume
if(!objh->IsValid())
return LUA_RETURN_NIL;
shipfx_warpout_start(objh->objp, b);
if (!b)
Ships[objh->objp->instance].flags2 |= SF2_DEPART_TO_LIMBO;
shipfx_warpout_start(objh->objp);
return LUA_RETURN_TRUE;
}