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

Merge branch 'master' into opengl_core_materials

Browse Source
This commit is contained in:
SamuelCho committed 2016-08-25 20:04:14 -07:00
2 parents 6fd1f8fbb0 0a67a788e4
commit 6442307c27
52 files changed
+204 -351
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+1 -1
View File
@@ -10741,7 +10741,7 @@ ADE_VIRTVAR(DestroyedByWeapon, l_Weapon, "boolean", "Whether weapon was destroye
wp->weapon_flags.set(Weapon::Weapon_Flags::Destroyed_by_weapon, b);
}
return ade_set_args(L, "b", (wp->weapon_flags[Weapon::Weapon_Flags::Destroyed_by_weapon]) > 0);
return ade_set_args(L, "b", wp->weapon_flags[Weapon::Weapon_Flags::Destroyed_by_weapon]);
}
ADE_VIRTVAR(LifeLeft, l_Weapon, "number", "Weapon life left (in seconds)", "number", "Life left (seconds) or 0 if weapon handle is invalid")