thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-05 15:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove return values from a few elevator functions that don't use them

Browse source
This commit is contained in:
MascaraSnake 2020-04-18 10:52:58 +02:00
parent 1d35442e16
commit 09f369846e
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_floor.c
View file

@ -1800,9 +1800,9 @@ void T_PlaneDisplace(planedisplace_t *pd)
// (egg capsule button), P_PlayerInSpecialSector (buttons), // (egg capsule button), P_PlayerInSpecialSector (buttons),
// and P_SpawnSpecials (continuous floor movers and instant lower). // and P_SpawnSpecials (continuous floor movers and instant lower).
// //
INT32 EV_DoFloor(line_t *line, floor_e floortype) void EV_DoFloor(line_t *line, floor_e floortype)
{ {
INT32 rtn = 0, firstone = 1; INT32 firstone = 1;
INT32 secnum = -1; INT32 secnum = -1;
sector_t *sec; sector_t *sec;
floormove_t *dofloor; floormove_t *dofloor;
@ -1815,7 +1815,6 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
continue; // then don't add another one continue; // then don't add another one
// new floor thinker // new floor thinker
rtn = 1;
dofloor = Z_Calloc(sizeof (*dofloor), PU_LEVSPEC, NULL); dofloor = Z_Calloc(sizeof (*dofloor), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &dofloor->thinker); P_AddThinker(THINK_MAIN, &dofloor->thinker);
@ -2005,8 +2004,6 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
firstone = 0; firstone = 0;
} }
return rtn;
} }
// SoM: Boom elevator support. // SoM: Boom elevator support.
@ -2019,10 +2016,9 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
// //
// jff 2/22/98 new type to move floor and ceiling in parallel // jff 2/22/98 new type to move floor and ceiling in parallel
// //
INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed) void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
{ {
INT32 secnum = -1; INT32 secnum = -1;
INT32 rtn = 0;
sector_t *sec; sector_t *sec;
elevator_t *elevator; elevator_t *elevator;
@ -2036,7 +2032,6 @@ INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
continue; continue;
// create and initialize new elevator thinker // create and initialize new elevator thinker
rtn = 1;
elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL); elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &elevator->thinker); P_AddThinker(THINK_MAIN, &elevator->thinker);
sec->floordata = elevator; sec->floordata = elevator;
@ -2138,7 +2133,6 @@ INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
break; break;
} }
} }
return rtn;
} }
void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
@ -2271,13 +2265,13 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
} }
// Used for bobbing platforms on the water // Used for bobbing platforms on the water
INT32 EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline) void EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
{ {
bouncecheese_t *bouncer; bouncecheese_t *bouncer;
// create and initialize new thinker // create and initialize new thinker
if (sec->ceilingdata) // One at a time, ma'am. if (sec->ceilingdata) // One at a time, ma'am.
return 0; return;
bouncer = Z_Calloc(sizeof (*bouncer), PU_LEVSPEC, NULL); bouncer = Z_Calloc(sizeof (*bouncer), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &bouncer->thinker); P_AddThinker(THINK_MAIN, &bouncer->thinker);
@ -2290,8 +2284,6 @@ INT32 EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
bouncer->speed = momz/2; bouncer->speed = momz/2;
bouncer->distance = FRACUNIT; bouncer->distance = FRACUNIT;
bouncer->low = true; bouncer->low = true;
return 1;
} }
// For T_ContinuousFalling special // For T_ContinuousFalling special

6
src/p_spec.h
View file

@ -424,10 +424,10 @@ typedef enum
result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crush, result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crush,
boolean ceiling, INT32 direction); boolean ceiling, INT32 direction);
INT32 EV_DoFloor(line_t *line, floor_e floortype); void EV_DoFloor(line_t *line, floor_e floortype);
INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed); void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed);
void EV_CrumbleChain(sector_t *sec, ffloor_t *rover); void EV_CrumbleChain(sector_t *sec, ffloor_t *rover);
INT32 EV_BounceSector(sector_t *sector, fixed_t momz, line_t *sourceline); void EV_BounceSector(sector_t *sector, fixed_t momz, line_t *sourceline);
// Some other special 3dfloor types // Some other special 3dfloor types
INT32 EV_StartCrumble(sector_t *sector, ffloor_t *rover, INT32 EV_StartCrumble(sector_t *sector, ffloor_t *rover,