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:
commit
7fa68d0e45
|
@ -459,7 +459,6 @@ boolean B_CheckRespawn(player_t *player)
|
||||||
if (!sonic || sonic->health <= 0)
|
if (!sonic || sonic->health <= 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
#ifdef HAVE_BLUA
|
|
||||||
// B_RespawnBot doesn't do anything if the condition above this isn't met
|
// B_RespawnBot doesn't do anything if the condition above this isn't met
|
||||||
{
|
{
|
||||||
UINT8 shouldForce = LUAh_BotRespawn(sonic, tails);
|
UINT8 shouldForce = LUAh_BotRespawn(sonic, tails);
|
||||||
|
@ -472,7 +471,6 @@ boolean B_CheckRespawn(player_t *player)
|
||||||
else if (shouldForce == 2)
|
else if (shouldForce == 2)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// Check if Sonic is busy first.
|
// Check if Sonic is busy first.
|
||||||
// If he's doing any of these things, he probably doesn't want to see us.
|
// If he's doing any of these things, he probably doesn't want to see us.
|
||||||
|
|
|
@ -8848,10 +8848,8 @@ void A_Dye(mobj_t *actor)
|
||||||
|
|
||||||
mobj_t *target = ((locvar1 && actor->target) ? actor->target : actor);
|
mobj_t *target = ((locvar1 && actor->target) ? actor->target : actor);
|
||||||
UINT8 color = (UINT8)locvar2;
|
UINT8 color = (UINT8)locvar2;
|
||||||
#ifdef HAVE_BLUA
|
|
||||||
if (LUA_CallAction("A_Dye", actor))
|
if (LUA_CallAction("A_Dye", actor))
|
||||||
return;
|
return;
|
||||||
#endif
|
|
||||||
if (color >= MAXTRANSLATIONS)
|
if (color >= MAXTRANSLATIONS)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -1541,10 +1541,6 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname)
|
||||||
int i;
|
int i;
|
||||||
boolean result = false;
|
boolean result = false;
|
||||||
|
|
||||||
#ifndef HAVE_BLUA
|
|
||||||
(void)musname;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if (!P_IsLocalPlayer(&players[i]))
|
if (!P_IsLocalPlayer(&players[i]))
|
||||||
|
|
Loading…
Reference in a new issue