Skip to content
Snippets Groups Projects
Commit c7cd6458 authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case

parent ec103678
No related branches found
No related tags found
No related merge requests found
...@@ -231,6 +231,8 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which) ...@@ -231,6 +231,8 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
return false; return false;
I_Assert(mo->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic mobj hooks // Look for all generic mobj hooks
...@@ -406,6 +408,8 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which) ...@@ -406,6 +408,8 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
return 0; return 0;
I_Assert(thing1->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic mobj collision hooks // Look for all generic mobj collision hooks
...@@ -479,6 +483,8 @@ boolean LUAh_MobjThinker(mobj_t *mo) ...@@ -479,6 +483,8 @@ boolean LUAh_MobjThinker(mobj_t *mo)
if (!gL || !(hooksAvailable[hook_MobjThinker/8] & (1<<(hook_MobjThinker%8)))) if (!gL || !(hooksAvailable[hook_MobjThinker/8] & (1<<(hook_MobjThinker%8))))
return false; return false;
I_Assert(mo->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic mobj thinker hooks // Look for all generic mobj thinker hooks
...@@ -532,6 +538,8 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher) ...@@ -532,6 +538,8 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8)))) if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8))))
return 0; return 0;
I_Assert(special->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic touch special hooks // Look for all generic touch special hooks
...@@ -595,6 +603,8 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 ...@@ -595,6 +603,8 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (!gL || !(hooksAvailable[hook_ShouldDamage/8] & (1<<(hook_ShouldDamage%8)))) if (!gL || !(hooksAvailable[hook_ShouldDamage/8] & (1<<(hook_ShouldDamage%8))))
return 0; return 0;
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic should damage hooks // Look for all generic should damage hooks
...@@ -676,6 +686,8 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 ...@@ -676,6 +686,8 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8)))) if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8))))
return 0; return 0;
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic mobj damage hooks // Look for all generic mobj damage hooks
...@@ -747,6 +759,8 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source) ...@@ -747,6 +759,8 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8)))) if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8))))
return 0; return 0;
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0); lua_settop(gL, 0);
// Look for all generic mobj death hooks // Look for all generic mobj death hooks
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment