From b157c21a35cb6246974864c4b096b5e914314270 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 7 Nov 2019 14:56:42 -0800 Subject: [PATCH] There's some whitespace... --- src/hardware/hw_light.c | 2 +- src/info.h | 2 +- src/p_floor.c | 2 +- src/p_map.c | 4 ++-- src/p_spec.c | 2 +- src/p_user.c | 28 ++++++++++++++-------------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c index fa66536b6..8f62f7763 100644 --- a/src/hardware/hw_light.c +++ b/src/hardware/hw_light.c @@ -406,7 +406,7 @@ light_t *t_lspr[NUMSPRITES] = &lspr[NOLIGHT], // SPR_HHPL &lspr[NOLIGHT], // SPR_SHRM &lspr[NOLIGHT], // SPR_HHZM - + // Azure Temple Scenery &lspr[NOLIGHT], // SPR_BGAR &lspr[NOLIGHT], // SPR_RCRY diff --git a/src/info.h b/src/info.h index e7f41f585..57943c389 100644 --- a/src/info.h +++ b/src/info.h @@ -556,7 +556,7 @@ typedef enum sprite SPR_HHPL, // Dr Seuss Trees SPR_SHRM, // Mushroom SPR_HHZM, // Misc - + // Azure Temple Scenery SPR_BGAR, // ATZ Gargoyles SPR_RCRY, // ATZ Red Crystal (Target) diff --git a/src/p_floor.c b/src/p_floor.c index 1360375a7..423fc1b70 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -2459,7 +2459,7 @@ void T_RaiseSector(levelspecthink_t *raise) break; } } - + if (raise->vars[9]) // Dynamically Sinking Platform^tm { #define shaketime 10 diff --git a/src/p_map.c b/src/p_map.c index 159489f70..33ac20265 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1040,7 +1040,7 @@ static boolean PIT_CheckThing(mobj_t *thing) { if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !thing->health) return true; - + if (thing == tmthing->tracer) // don't collide with rider return true; @@ -1054,7 +1054,7 @@ static boolean PIT_CheckThing(mobj_t *thing) P_KillMobj(thing, tmthing, tmthing->tracer, 0); return true; } - + if (thing->type == tmthing->type // bounce against other rollout rocks && (tmthing->momx || tmthing->momy || thing->momx || thing->momy)) { diff --git a/src/p_spec.c b/src/p_spec.c index 50939ae5b..7b23ecbe7 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -6068,7 +6068,7 @@ static void P_AddAirbob(sector_t *sec, line_t *sourceline, boolean noadjust, boo airbob->vars[5] = sec->ceilingheight; airbob->vars[4] = airbob->vars[5] - (sec->ceilingheight - sec->floorheight); - + airbob->vars[9] = dynamic ? 1 : 0; airbob->sourceline = sourceline; diff --git a/src/p_user.c b/src/p_user.c index f81f6d956..561183cd5 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1096,7 +1096,7 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing) // Spinning. if (player->pflags & PF_SPINNING) return true; - + if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)) return true; @@ -7820,7 +7820,7 @@ static void P_MovePlayer(player_t *player) if (!(player->powers[pw_nocontrol] & (1<<15))) player->pflags |= PF_JUMPSTASIS; } - + if (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING) { player->pflags |= PF_STASIS; @@ -10978,19 +10978,19 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) tic_t dashmode = player->dashmode; boolean underwater = mo->eflags & MFE_UNDERWATER; statenum_t stat = fume->state-states; - + if (panim != PA_WALK && panim != PA_RUN && panim != PA_DASH) // turn invisible when not in a coherent movement state { if (stat != fume->info->spawnstate) P_SetMobjState(fume, fume->info->spawnstate); return; } - + if (underwater) // No fume underwater; spawn bubbles instead! { fume->movedir += FixedAngle(FixedDiv(2 * player->speed, 3 * mo->scale)); fume->movefactor += player->speed; - + if (fume->movefactor > FixedDiv(2 * player->normalspeed, 3 * mo->scale)) { INT16 i; @@ -11000,7 +11000,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) fixed_t factorX = P_ReturnThrustX(mo, angle + ANGLE_90, mo->scale); fixed_t factorY = P_ReturnThrustY(mo, angle + ANGLE_90, mo->scale); fixed_t offsetH, offsetV, x, y, z; - + for (i = -1; i < 2; i += 2) { offsetH = i*P_ReturnThrustX(fume, fume->movedir, radiusV); @@ -11010,10 +11010,10 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) z = mo->z + (mo->height >> 1) + offsetV; P_SpawnMobj(x, y, z, MT_SMALLBUBBLE)->scale = mo->scale >> 1; } - + fume->movefactor = 0; } - + if (panim == PA_WALK) { if (stat != fume->info->spawnstate) @@ -11021,13 +11021,13 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) return; } } - + if (stat == fume->info->spawnstate) // If currently inivisble, activate! { P_SetMobjState(fume, (stat = fume->info->seestate)); P_SetScale(fume, mo->scale); } - + if (dashmode > DASHMODE_THRESHOLD && stat != fume->info->seestate) // If in dashmode, grow really big and flash { fume->destscale = mo->scale; @@ -11044,19 +11044,19 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) fume->flags2 = (fume->flags2 & ~MF2_DONTDRAW) | (mo->flags2 & MF2_DONTDRAW); fume->destscale = (mo->scale + FixedDiv(player->speed, player->normalspeed)) / (underwater ? 6 : 3); fume->color = FUME_SKINCOLORS[(dashmode * sizeof(FUME_SKINCOLORS)) / (DASHMODE_MAX + 1)]; - + if (underwater) { fume->frame = (fume->frame & FF_FRAMEMASK) | FF_ANIMATE | (P_RandomRange(0, 9) * FF_TRANS10); } } - + fume->movecount = dashmode; // keeps track of previous dashmode value so we know whether Metal is entering or leaving it fume->eflags = (fume->eflags & ~MFE_VERTICALFLIP) | (mo->eflags & MFE_VERTICALFLIP); // Make sure to flip in reverse gravity! - + // Finally, set its position dist = -mo->radius - FixedMul(fume->info->radius, fume->destscale - mo->scale/3); - + P_UnsetThingPosition(fume); fume->x = mo->x + P_ReturnThrustX(fume, angle, dist); fume->y = mo->y + P_ReturnThrustY(fume, angle, dist);