thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge lua_hooklib.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-05 14:03:24 -04:00
parent 9b778d6ce6
commit 9a9f7b8b1f
1 changed files with 4 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/lua_hooklib.c
View file

@ -14,13 +14,8 @@
#include "doomstat.h" #include "doomstat.h"
#include "p_mobj.h" #include "p_mobj.h"
#include "g_game.h" #include "g_game.h"
<<<<<<< HEAD
#include "r_things.h"
#include "k_bot.h"
=======
#include "r_skins.h" #include "r_skins.h"
#include "b_bot.h" #include "k_bot.h"
>>>>>>> srb2/next
#include "z_zone.h" #include "z_zone.h"
#include "lua_script.h" #include "lua_script.h"
@ -69,7 +64,6 @@ const char *const hookNames[hook_MAX+1] = {
"FollowMobj", "FollowMobj",
"PlayerCanDamage", "PlayerCanDamage",
"PlayerQuit", "PlayerQuit",
<<<<<<< HEAD
"MusicChange", "MusicChange",
"ShouldSpin", "ShouldSpin",
"ShouldExplode", "ShouldExplode",
@ -80,14 +74,11 @@ const char *const hookNames[hook_MAX+1] = {
"PlayerCmd", "PlayerCmd",
"IntermissionThinker", "IntermissionThinker",
"VoteThinker", "VoteThinker",
=======
"IntermissionThinker",
"TeamSwitch", "TeamSwitch",
"ViewpointSwitch", "ViewpointSwitch",
"SeenPlayer", "SeenPlayer",
"PlayerThink", "PlayerThink",
"ShouldJingleContinue", "ShouldJingleContinue",
>>>>>>> srb2/next
NULL NULL
}; };
@ -1331,7 +1322,6 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg, int mute)
if (lua_gettop(gL) == 0) if (lua_gettop(gL) == 0)
{ {
<<<<<<< HEAD
if (lua_gettop(gL) == 0) if (lua_gettop(gL) == 0)
{ {
LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
@ -1370,33 +1360,6 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg, int mute)
} }
if (lua_toboolean(gL, -1)) if (lua_toboolean(gL, -1))
hooked = true; hooked = true;
=======
LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c
lua_pushinteger(gL, 3); // type
lua_pushnil(gL); // target
} else if (target == -1) { // sayteam
lua_pushinteger(gL, 1); // type
lua_pushnil(gL); // target
} else if (target == 0) { // say
lua_pushinteger(gL, 0); // type
lua_pushnil(gL); // target
} else { // sayto
lua_pushinteger(gL, 2); // type
LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target
}
lua_pushstring(gL, msg); // msg
}
lua_pushfstring(gL, FMT_HOOKID, hookp->id);
lua_gettable(gL, LUA_REGISTRYINDEX);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
lua_pushvalue(gL, -5);
if (lua_pcall(gL, 4, 1, 0)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
>>>>>>> srb2/next
lua_pop(gL, 1); lua_pop(gL, 1);
hookp->error = true; hookp->error = true;
continue; continue;
@ -1897,7 +1860,9 @@ boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
lua_settop(gL, 0); lua_settop(gL, 0);
hud_running = false; hud_running = false;
<<<<<<< HEAD return keepplaying;
}
// Hook for music changes // Hook for music changes
boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping, boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping,
UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms) UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms)
@ -2220,9 +2185,3 @@ boolean LUAh_PlayerExplode(player_t *player, mobj_t *inflictor, mobj_t *source)
lua_settop(gL, 0); lua_settop(gL, 0);
return hooked; return hooked;
} }
#endif
=======
return keepplaying;
}
>>>>>>> srb2/next