lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope

This commit is contained in:
Jaime Passos 2020-11-05 00:42:14 -03:00
parent 8f65b98c24
commit 36550725f3
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lua_baselib.c
View File

@ -921,14 +921,14 @@ static int lib_pCreateFloorSpriteSlope(lua_State *L)
return 1; return 1;
} }
static int lib_pDeleteFloorSpriteSlope(lua_State *L) static int lib_pRemoveFloorSpriteSlope(lua_State *L)
{ {
mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
NOHUD NOHUD
INLEVEL INLEVEL
if (!mobj) if (!mobj)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
P_DeleteFloorSpriteSlope(mobj); P_RemoveFloorSpriteSlope(mobj);
return 1; return 1;
} }
@ -3559,7 +3559,7 @@ static luaL_Reg lib[] = {
{"P_CanRunOnWater",lib_pCanRunOnWater}, {"P_CanRunOnWater",lib_pCanRunOnWater},
{"P_MaceRotate",lib_pMaceRotate}, {"P_MaceRotate",lib_pMaceRotate},
{"P_CreateFloorSpriteSlope",lib_pCreateFloorSpriteSlope}, {"P_CreateFloorSpriteSlope",lib_pCreateFloorSpriteSlope},
{"P_DeleteFloorSpriteSlope",lib_pDeleteFloorSpriteSlope}, {"P_RemoveFloorSpriteSlope",lib_pRemoveFloorSpriteSlope},
{"P_RailThinker",lib_pRailThinker}, {"P_RailThinker",lib_pRailThinker},
{"P_XYMovement",lib_pXYMovement}, {"P_XYMovement",lib_pXYMovement},
{"P_RingXYMovement",lib_pRingXYMovement}, {"P_RingXYMovement",lib_pRingXYMovement},

7
src/p_mobj.c
View File

@ -10884,7 +10884,7 @@ void *P_CreateFloorSpriteSlope(mobj_t *mobj)
return (void *)mobj->floorspriteslope; return (void *)mobj->floorspriteslope;
} }
void P_DeleteFloorSpriteSlope(mobj_t *mobj) void P_RemoveFloorSpriteSlope(mobj_t *mobj)
{ {
if (mobj->floorspriteslope) if (mobj->floorspriteslope)
Z_Free(mobj->floorspriteslope); Z_Free(mobj->floorspriteslope);
@ -10947,14 +10947,13 @@ void P_RemoveMobj(mobj_t *mobj)
P_DelSeclist(sector_list); P_DelSeclist(sector_list);
sector_list = NULL; sector_list = NULL;
} }
mobj->flags |= MF_NOSECTOR|MF_NOBLOCKMAP; mobj->flags |= MF_NOSECTOR|MF_NOBLOCKMAP;
mobj->subsector = NULL; mobj->subsector = NULL;
mobj->state = NULL; mobj->state = NULL;
mobj->player = NULL; mobj->player = NULL;
if (mobj->floorspriteslope) P_RemoveFloorSpriteSlope(mobj);
Z_Free(mobj->floorspriteslope);
mobj->floorspriteslope = NULL;
// stop any playing sound // stop any playing sound
S_StopSound(mobj); S_StopSound(mobj);

2
src/p_mobj.h
View File

@ -477,7 +477,7 @@ void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT
void P_SpawnPrecipitation(void); void P_SpawnPrecipitation(void);
void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, statenum_t nstate, angle_t rotangle, boolean spawncenter); void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, statenum_t nstate, angle_t rotangle, boolean spawncenter);
void *P_CreateFloorSpriteSlope(mobj_t *mobj); void *P_CreateFloorSpriteSlope(mobj_t *mobj);
void P_DeleteFloorSpriteSlope(mobj_t *mobj); void P_RemoveFloorSpriteSlope(mobj_t *mobj);
boolean P_BossTargetPlayer(mobj_t *actor, boolean closest); boolean P_BossTargetPlayer(mobj_t *actor, boolean closest);
boolean P_SupermanLook4Players(mobj_t *actor); boolean P_SupermanLook4Players(mobj_t *actor);
void P_DestroyRobots(void); void P_DestroyRobots(void);