diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index d4fe72682dfe62702e9fb16a2950f672e9cd5290..b3390eb95279a6bc27a586d035f8432e1fcdaf03 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -108,6 +108,12 @@ static hook_p linedefexecutorhooks;
// For other hooks, a unique linked list
hook_p roothook;
+static void PushHook(lua_State *L, hook_p hookp)
+{
+ lua_pushfstring(L, FMT_HOOKID, hookp->id);
+ lua_gettable(L, LUA_REGISTRYINDEX);
+}
+
// Takes hook, function, and additional arguments (mobj type to act on, etc.)
static int lib_addHook(lua_State *L)
{
@@ -253,6 +259,7 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
I_Assert(mo->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -260,12 +267,11 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ if (lua_pcall(gL, 1, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -282,12 +288,11 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ if (lua_pcall(gL, 1, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -311,18 +316,18 @@ boolean LUAh_PlayerHook(player_t *plr, enum hook which)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = playerhooks; hookp; hookp = hookp->next)
{
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, plr, META_PLAYER);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ if (lua_pcall(gL, 1, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -346,6 +351,7 @@ void LUAh_MapChange(INT16 mapnumber)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_pushinteger(gL, mapnumber);
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -353,10 +359,12 @@ void LUAh_MapChange(INT16 mapnumber)
if (hookp->type != hook_MapChange)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -370,6 +378,7 @@ void LUAh_MapLoad(void)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_pushinteger(gL, gamemap);
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -377,10 +386,12 @@ void LUAh_MapLoad(void)
if (hookp->type != hook_MapLoad)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -394,6 +405,7 @@ void LUAh_PlayerJoin(int playernum)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_pushinteger(gL, playernum);
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -401,10 +413,12 @@ void LUAh_PlayerJoin(int playernum)
if (hookp->type != hook_PlayerJoin)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -417,20 +431,23 @@ void LUAh_PreThinkFrame(void)
if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PreThinkFrame)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ PushHook(gL, hookp);
+ if (lua_pcall(gL, 0, 0, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
hookp->error = true;
}
}
+
+ lua_pop(gL, 1); // Pop error handler
}
// Hook for frame (after mobj and player thinkers)
@@ -440,22 +457,24 @@ void LUAh_ThinkFrame(void)
if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_ThinkFrame)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ PushHook(gL, hookp);
+ if (lua_pcall(gL, 0, 0, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
hookp->error = true;
}
}
-}
+ lua_pop(gL, 1); // Pop error handler
+}
// Hook for frame (at end of tick, ie after overlays, precipitation, specials)
void LUAh_PostThinkFrame(void)
@@ -464,20 +483,23 @@ void LUAh_PostThinkFrame(void)
if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PostThinkFrame)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ PushHook(gL, hookp);
+ if (lua_pcall(gL, 0, 0, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
hookp->error = true;
}
}
+
+ lua_pop(gL, 1); // Pop error handler
}
// Hook for mobj collisions
@@ -491,6 +513,7 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
I_Assert(thing1->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj collision hooks
for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -498,16 +521,15 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing1, META_MOBJ);
LUA_PushUserdata(gL, thing2, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -529,16 +551,15 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing1, META_MOBJ);
LUA_PushUserdata(gL, thing2, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -569,6 +590,7 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
I_Assert(thing->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj collision hooks
for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -576,16 +598,15 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing, META_MOBJ);
LUA_PushUserdata(gL, line, META_LINE);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -607,16 +628,15 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing, META_MOBJ);
LUA_PushUserdata(gL, line, META_LINE);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -648,16 +668,16 @@ boolean LUAh_MobjThinker(mobj_t *mo)
I_Assert(mo->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj thinker hooks
for (hookp = mobjthinkerhooks[MT_NULL]; hookp; hookp = hookp->next)
{
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ if (lua_pcall(gL, 1, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -671,12 +691,11 @@ boolean LUAh_MobjThinker(mobj_t *mo)
for (hookp = mobjthinkerhooks[mo->type]; hookp; hookp = hookp->next)
{
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ if (lua_pcall(gL, 1, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -703,6 +722,7 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
I_Assert(special->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic touch special hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -710,16 +730,15 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (hookp->type != hook_TouchSpecial)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, special, META_MOBJ);
LUA_PushUserdata(gL, toucher, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -736,16 +755,15 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (hookp->type != hook_TouchSpecial)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, special, META_MOBJ);
LUA_PushUserdata(gL, toucher, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -772,6 +790,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic should damage hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -779,7 +798,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_ShouldDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -787,14 +806,13 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 0)) {
+ if (lua_pcall(gL, 5, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -815,7 +833,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
{
if (hookp->type != hook_ShouldDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -823,14 +841,13 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 0)) {
+ if (lua_pcall(gL, 5, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -862,6 +879,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj damage hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -869,7 +887,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_MobjDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -877,14 +895,13 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 0)) {
+ if (lua_pcall(gL, 5, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -901,7 +918,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_MobjDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -909,14 +926,13 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 0)) {
+ if (lua_pcall(gL, 5, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -943,6 +959,7 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj death hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -950,20 +967,19 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
if (hookp->type != hook_MobjDeath)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
LUA_PushUserdata(gL, source, META_MOBJ);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 0)) {
+ if (lua_pcall(gL, 4, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -980,20 +996,19 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
if (hookp->type != hook_MobjDeath)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
LUA_PushUserdata(gL, source, META_MOBJ);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 0)) {
+ if (lua_pcall(gL, 4, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1018,22 +1033,22 @@ boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_BotTiccmd)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, bot, META_PLAYER);
LUA_PushUserdata(gL, cmd, META_TICCMD);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1058,6 +1073,7 @@ boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
@@ -1065,16 +1081,15 @@ boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
|| (hookp->s.str && strcmp(hookp->s.str, ((skin_t*)tails->skin)->name)))
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, sonic, META_MOBJ);
LUA_PushUserdata(gL, tails, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 8, 0)) {
+ if (lua_pcall(gL, 2, 8, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1121,22 +1136,22 @@ boolean LUAh_BotRespawn(mobj_t *sonic, mobj_t *tails)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_BotRespawn)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, sonic, META_MOBJ);
LUA_PushUserdata(gL, tails, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1166,24 +1181,27 @@ boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = linedefexecutorhooks; hookp; hookp = hookp->next)
{
if (strcmp(hookp->s.str, line->text))
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, line, META_LINE);
LUA_PushUserdata(gL, mo, META_MOBJ);
LUA_PushUserdata(gL, sector, META_SECTOR);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
- LUA_Call(gL, 3);
+ if (lua_pcall(gL, 3, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
hooked = true;
}
@@ -1200,13 +1218,14 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PlayerMsg)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c
@@ -1224,13 +1243,12 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg)
}
lua_pushstring(gL, msg); // msg
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 0)) {
+ if (lua_pcall(gL, 4, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1256,6 +1274,7 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
@@ -1263,20 +1282,19 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8
|| (hookp->s.mt && !(inflictor && hookp->s.mt == inflictor->type)))
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
LUA_PushUserdata(gL, source, META_MOBJ);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 0)) {
+ if (lua_pcall(gL, 4, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1295,7 +1313,7 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8
void LUAh_NetArchiveHook(lua_CFunction archFunc)
{
hook_p hookp;
-
+ int errorhandlerindex;
if (!gL || !(hooksAvailable[hook_NetVars/8] & (1<<(hook_NetVars%8))))
return;
@@ -1303,8 +1321,11 @@ void LUAh_NetArchiveHook(lua_CFunction archFunc)
I_Assert(lua_gettop(gL) > 0);
I_Assert(lua_istable(gL, -1));
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+ errorhandlerindex = lua_gettop(gL);
+
// tables becomes an upvalue of archFunc
- lua_pushvalue(gL, -1);
+ lua_pushvalue(gL, -2);
lua_pushcclosure(gL, archFunc, 1);
// stack: tables, archFunc
@@ -1313,13 +1334,15 @@ void LUAh_NetArchiveHook(lua_CFunction archFunc)
if (hookp->type != hook_NetVars)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2); // archFunc
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, errorhandlerindex)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
- lua_pop(gL, 1); // pop archFunc
+ lua_pop(gL, 2); // Pop archFunc and error handler
// stack: tables
}
@@ -1331,6 +1354,7 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj map thing spawn hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -1338,16 +1362,15 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (hookp->type != hook_MapThingSpawn)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, mo, META_MOBJ);
LUA_PushUserdata(gL, mthing, META_MAPTHING);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1364,16 +1387,15 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (hookp->type != hook_MapThingSpawn)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, mo, META_MOBJ);
LUA_PushUserdata(gL, mthing, META_MAPTHING);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1398,6 +1420,7 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj follow item hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -1405,16 +1428,15 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
if (hookp->type != hook_FollowMobj)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, mobj, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1431,16 +1453,15 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
if (hookp->type != hook_FollowMobj)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, mobj, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1465,22 +1486,22 @@ UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj)
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = playerhooks; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PlayerCanDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, mobj, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1508,22 +1529,25 @@ void LUAh_PlayerQuit(player_t *plr, kickreason_t reason)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PlayerQuit)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
lua_pushinteger(gL, reason); // Reason for quitting
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- LUA_Call(gL, 2);
+ if (lua_pcall(gL, 2, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -1536,20 +1560,23 @@ void LUAh_IntermissionThinker(void)
if (!gL || !(hooksAvailable[hook_IntermissionThinker/8] & (1<<(hook_IntermissionThinker%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_IntermissionThinker)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ PushHook(gL, hookp);
+ if (lua_pcall(gL, 0, 0, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
hookp->error = true;
}
}
+
+ lua_pop(gL, 1); // Pop error handler
}
// Hook for team switching
@@ -1562,13 +1589,14 @@ boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, b
return true;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = playerhooks; hookp; hookp = hookp->next)
{
if (hookp->type != hook_TeamSwitch)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
lua_pushinteger(gL, newteam);
@@ -1576,14 +1604,13 @@ boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, b
lua_pushboolean(gL, tryingautobalance);
lua_pushboolean(gL, tryingscramble);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 0)) {
+ if (lua_pcall(gL, 5, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1608,6 +1635,8 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
hud_running = true; // local hook
for (hookp = playerhooks; hookp; hookp = hookp->next)
@@ -1615,18 +1644,17 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
if (hookp->type != hook_ViewpointSwitch)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER);
lua_pushboolean(gL, forced);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
- if (lua_pcall(gL, 3, 1, 0)) {
+ if (lua_pcall(gL, 3, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1644,6 +1672,7 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
}
lua_settop(gL, 0);
+
hud_running = false;
return canSwitchView;
@@ -1659,6 +1688,8 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
return true;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
hud_running = true; // local hook
for (hookp = playerhooks; hookp; hookp = hookp->next)
@@ -1666,16 +1697,15 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
if (hookp->type != hook_SeenPlayer)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, seenfriend, META_PLAYER);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1688,6 +1718,7 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
}
lua_settop(gL, 0);
+
hud_running = false;
return hasSeenPlayer;
@@ -1702,6 +1733,8 @@ boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
return true;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
hud_running = true; // local hook
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -1710,16 +1743,15 @@ boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
|| (hookp->s.str && strcmp(hookp->s.str, musname)))
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
lua_pushstring(gL, musname);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ if (lua_pcall(gL, 2, 1, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1732,6 +1764,7 @@ boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
}
lua_settop(gL, 0);
+
hud_running = false;
return keepplaying;
diff --git a/src/lua_script.c b/src/lua_script.c
index 4f94b007eca31f8bda5bf383d960c613a43cd6fa..06ea18b0ee9e574604a38cc524ed4da9c185ffd5 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -78,6 +78,58 @@ FUNCNORETURN static int LUA_Panic(lua_State *L)
#endif
}
+#define LEVELS1 12 // size of the first part of the stack
+#define LEVELS2 10 // size of the second part of the stack
+
+// Error handler used with pcall() when loading scripts or calling hooks
+// Takes a string with the original error message,
+// appends the traceback to it, and return the result
+int LUA_GetErrorMessage(lua_State *L)
+{
+ int level = 1;
+ int firstpart = 1; // still before eventual `...'
+ lua_Debug ar;
+
+ lua_pushliteral(L, "\nstack traceback:");
+ while (lua_getstack(L, level++, &ar))
+ {
+ if (level > LEVELS1 && firstpart)
+ {
+ // no more than `LEVELS2' more levels?
+ if (!lua_getstack(L, level + LEVELS2, &ar))
+ level--; // keep going
+ else
+ {
+ lua_pushliteral(L, "\n ..."); // too many levels
+ while (lua_getstack(L, level + LEVELS2, &ar)) // find last levels
+ level++;
+ }
+ firstpart = 0;
+ continue;
+ }
+ lua_pushliteral(L, "\n ");
+ lua_getinfo(L, "Snl", &ar);
+ lua_pushfstring(L, "%s:", ar.short_src);
+ if (ar.currentline > 0)
+ lua_pushfstring(L, "%d:", ar.currentline);
+ if (*ar.namewhat != '\0') // is there a name?
+ lua_pushfstring(L, " in function " LUA_QS, ar.name);
+ else
+ {
+ if (*ar.what == 'm') // main?
+ lua_pushfstring(L, " in main chunk");
+ else if (*ar.what == 'C' || *ar.what == 't')
+ lua_pushliteral(L, " ?"); // C function or tail call
+ else
+ lua_pushfstring(L, " in function <%s:%d>",
+ ar.short_src, ar.linedefined);
+ }
+ lua_concat(L, lua_gettop(L));
+ }
+ lua_concat(L, lua_gettop(L));
+ return 1;
+}
+
// Moved here from lib_getenum.
int LUA_PushGlobals(lua_State *L, const char *word)
{
@@ -410,11 +462,13 @@ static inline void LUA_LoadFile(MYFILE *f, char *name)
lua_lumploading = true; // turn on loading flag
- if (luaL_loadbuffer(gL, f->data, f->size, va("@%s",name)) || lua_pcall(gL, 0, 0, 0)) {
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+ if (luaL_loadbuffer(gL, f->data, f->size, va("@%s",name)) || lua_pcall(gL, 0, 0, lua_gettop(gL) - 1)) {
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL,-1));
lua_pop(gL,1);
}
lua_gc(gL, LUA_GCCOLLECT, 0);
+ lua_pop(gL, 1); // Pop error handler
lua_lumploading = false; // turn off again
}
diff --git a/src/lua_script.h b/src/lua_script.h
index 8d5bed7c72524fd393e064fa5e943fd250ab395d..9568503e13e33a94538254fc498e5580e24d6cb3 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -39,6 +39,7 @@ void LUA_ClearExtVars(void);
extern boolean lua_lumploading; // is LUA_LoadLump being called?
+int LUA_GetErrorMessage(lua_State *L);
void LUA_LoadLump(UINT16 wad, UINT16 lump);
#ifdef LUA_ALLOW_BYTECODE
void LUA_DumpFile(const char *filename);