stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-segfault-player-spawnmobj' into 'next'

Browse source 
Fix segfault when trying to spawn an MT_PLAYER from Lua

See merge request STJr/SRB2!2276
This commit is contained in:
sphere 2024-06-04 10:41:00 +00:00
commit 5de350e028
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lua_baselib.c
View file

@ -653,7 +653,7 @@ static int lib_pSpawnMobj(lua_State *L)
NOHUD NOHUD
INLEVEL INLEVEL
NOSPAWNNULL NOSPAWNNULL
LUA_PushUserdata(L, P_SpawnMobj(x, y, z, type), META_MOBJ); LUA_PushUserdata(L, P_SpawnMobj(x, y, z, type, NULL), META_MOBJ);
return 1; return 1;
} }

4
src/p_mobj.c
View file

@ -10760,6 +10760,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, ...)
// when spawning MT_PLAYER, set mobj->player before calling MobjSpawn hook to prevent P_RemoveMobj from succeeding on player mobj. // when spawning MT_PLAYER, set mobj->player before calling MobjSpawn hook to prevent P_RemoveMobj from succeeding on player mobj.
va_start(args, type); va_start(args, type);
mobj->player = va_arg(args, player_t *); mobj->player = va_arg(args, player_t *);
if (mobj->player)
mobj->player->mo = mobj; mobj->player->mo = mobj;
va_end(args); va_end(args);
} }
@ -14302,7 +14303,8 @@ mobj_t *P_SpawnMobjFromMobj(mobj_t *mobj, fixed_t xofs, fixed_t yofs, fixed_t zo
yofs = FixedMul(yofs, mobj->scale); yofs = FixedMul(yofs, mobj->scale);
zofs = FixedMul(zofs, mobj->scale); zofs = FixedMul(zofs, mobj->scale);
newmobj = P_SpawnMobj(mobj->x + xofs, mobj->y + yofs, mobj->z + zofs, type); newmobj = P_SpawnMobj(mobj->x + xofs, mobj->y + yofs, mobj->z + zofs, type, NULL);
if (!newmobj) if (!newmobj)
return NULL; return NULL;