stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-01 08:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

A little bit of semantic cleanup

Browse source
This commit is contained in:
Arthur 2024-02-27 07:12:22 -05:00
parent 7e880d7698
commit e19b9e7d24
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_inter.c
View file

@ -412,7 +412,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
{ {
if (special->type == MT_STEAM) if (special->type == MT_STEAM)
{ {
fixed_t speed = special->info->mass; // conveniently, both fans and gas jets use this for the vertical thrust if (player && player->mo->state == &states[player->mo->info->painstate]) // can't use gas jets when player is in pain!
return;
fixed_t speed = special->info->mass; // gas jets use this for the vertical thrust
SINT8 flipval = P_MobjFlip(special); // virtually everything here centers around the thruster's gravity, not the object's! SINT8 flipval = P_MobjFlip(special); // virtually everything here centers around the thruster's gravity, not the object's!
if (special->state != &states[S_STEAM1]) // Only when it bursts if (special->state != &states[S_STEAM1]) // Only when it bursts

32
src/p_map.c
View file

@ -502,53 +502,53 @@ springstate:
return final; return final;
} }
static void P_DoFan(mobj_t *spring, mobj_t *object) static void P_DoFan(mobj_t *fan, mobj_t *object)
{ {
player_t *p = object->player; // will be NULL if not a player player_t *p = object->player; // will be NULL if not a player
fixed_t zdist; // distance between bottoms fixed_t zdist; // distance between bottoms
fixed_t speed = spring->info->mass; // conveniently, both fans and gas jets use this for the vertical thrust fixed_t speed = fan->info->mass; // fans use this for the vertical thrust
SINT8 flipval = P_MobjFlip(spring); // virtually everything here centers around the thruster's gravity, not the object's! SINT8 flipval = P_MobjFlip(fan); // virtually everything here centers around the thruster's gravity, not the object's!
if (p && object->state == &states[object->info->painstate]) // can't use fans and gas jets when player is in pain! if (p && object->state == &states[object->info->painstate]) // can't use fans when player is in pain!
return; return;
// is object's top below thruster's position? if not, calculate distance between their bottoms // is object's top below thruster's position? if not, calculate distance between their bottoms
if (spring->eflags & MFE_VERTICALFLIP) if (fan->eflags & MFE_VERTICALFLIP)
{ {
if (object->z > spring->z + spring->height) if (object->z > fan->z + fan->height)
return; return;
zdist = (spring->z + spring->height) - (object->z + object->height); zdist = (fan->z + fan->height) - (object->z + object->height);
} }
else else
{ {
if (object->z + object->height < spring->z) if (object->z + object->height < fan->z)
return; return;
zdist = object->z - spring->z; zdist = object->z - fan->z;
} }
object->standingslope = NULL; // No launching off at silly angles for you. object->standingslope = NULL; // No launching off at silly angles for you.
switch (spring->type) switch (fan->type)
{ {
case MT_FAN: // fan case MT_FAN: // fan
if (zdist > (spring->health << FRACBITS)) // max z distance determined by health (set by map thing args[0]) if (zdist > (fan->health << FRACBITS)) // max z distance determined by health (set by map thing args[0])
break; break;
if (flipval*object->momz >= FixedMul(speed, spring->scale)) // if object's already moving faster than your best, don't bother if (flipval*object->momz >= FixedMul(speed, fan->scale)) // if object's already moving faster than your best, don't bother
break; break;
if (p && (p->climbing || p->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities! if (p && (p->climbing || p->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities!
break; break;
object->momz += flipval*FixedMul(speed/4, spring->scale); object->momz += flipval*FixedMul(speed/4, fan->scale);
// limit the speed if too high // limit the speed if too high
if (flipval*object->momz > FixedMul(speed, spring->scale)) if (flipval*object->momz > FixedMul(speed, fan->scale))
object->momz = flipval*FixedMul(speed, spring->scale); object->momz = flipval*FixedMul(speed, fan->scale);
if (p && !p->powers[pw_tailsfly] && !p->powers[pw_carry]) // doesn't reset anim for Tails' flight if (p && !p->powers[pw_tailsfly] && !p->powers[pw_carry]) // doesn't reset anim for Tails' flight
{ {
P_ResetPlayer(p); P_ResetPlayer(p);
P_SetMobjState(object, S_PLAY_FALL); P_SetMobjState(object, S_PLAY_FALL);
P_SetTarget(&object->tracer, spring); P_SetTarget(&object->tracer, fan);
p->powers[pw_carry] = CR_FAN; p->powers[pw_carry] = CR_FAN;
} }
break; break;