Merge branch 'delete-lua-again' into 'next'

Fix the BotRespawn hook and hooking A_Dye being disabled for no reason

See merge request STJr/SRB2!932
This commit is contained in:
MascaraSnake 2020-05-11 13:30:18 -04:00
commit 7fa68d0e45
3 changed files with 1 additions and 9 deletions

View File

@ -459,7 +459,6 @@ boolean B_CheckRespawn(player_t *player)
if (!sonic || sonic->health <= 0)
return false;
#ifdef HAVE_BLUA
// B_RespawnBot doesn't do anything if the condition above this isn't met
{
UINT8 shouldForce = LUAh_BotRespawn(sonic, tails);
@ -472,7 +471,6 @@ boolean B_CheckRespawn(player_t *player)
else if (shouldForce == 2)
return false;
}
#endif
// Check if Sonic is busy first.
// If he's doing any of these things, he probably doesn't want to see us.

View File

@ -8848,10 +8848,8 @@ void A_Dye(mobj_t *actor)
mobj_t *target = ((locvar1 && actor->target) ? actor->target : actor);
UINT8 color = (UINT8)locvar2;
#ifdef HAVE_BLUA
if (LUA_CallAction("A_Dye", actor))
return;
#endif
if (color >= MAXTRANSLATIONS)
return;
@ -14508,4 +14506,4 @@ void A_ChangeHeight(mobj_t *actor)
actor->height += locvar1;
}
P_SetThingPosition(actor);
}
}

View File

@ -1541,10 +1541,6 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname)
int i;
boolean result = false;
#ifndef HAVE_BLUA
(void)musname;
#endif
for (i = 0; i < MAXPLAYERS; i++)
{
if (!P_IsLocalPlayer(&players[i]))