There's some whitespace...

This commit is contained in:
James R 2019-11-07 14:56:42 -08:00
parent d9a54a6b61
commit b157c21a35
6 changed files with 20 additions and 20 deletions

View File

@ -406,7 +406,7 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_HHPL &lspr[NOLIGHT], // SPR_HHPL
&lspr[NOLIGHT], // SPR_SHRM &lspr[NOLIGHT], // SPR_SHRM
&lspr[NOLIGHT], // SPR_HHZM &lspr[NOLIGHT], // SPR_HHZM
// Azure Temple Scenery // Azure Temple Scenery
&lspr[NOLIGHT], // SPR_BGAR &lspr[NOLIGHT], // SPR_BGAR
&lspr[NOLIGHT], // SPR_RCRY &lspr[NOLIGHT], // SPR_RCRY

View File

@ -556,7 +556,7 @@ typedef enum sprite
SPR_HHPL, // Dr Seuss Trees SPR_HHPL, // Dr Seuss Trees
SPR_SHRM, // Mushroom SPR_SHRM, // Mushroom
SPR_HHZM, // Misc SPR_HHZM, // Misc
// Azure Temple Scenery // Azure Temple Scenery
SPR_BGAR, // ATZ Gargoyles SPR_BGAR, // ATZ Gargoyles
SPR_RCRY, // ATZ Red Crystal (Target) SPR_RCRY, // ATZ Red Crystal (Target)

View File

@ -2459,7 +2459,7 @@ void T_RaiseSector(levelspecthink_t *raise)
break; break;
} }
} }
if (raise->vars[9]) // Dynamically Sinking Platform^tm if (raise->vars[9]) // Dynamically Sinking Platform^tm
{ {
#define shaketime 10 #define shaketime 10

View File

@ -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) if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !thing->health)
return true; return true;
if (thing == tmthing->tracer) // don't collide with rider if (thing == tmthing->tracer) // don't collide with rider
return true; return true;
@ -1054,7 +1054,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
P_KillMobj(thing, tmthing, tmthing->tracer, 0); P_KillMobj(thing, tmthing, tmthing->tracer, 0);
return true; return true;
} }
if (thing->type == tmthing->type // bounce against other rollout rocks if (thing->type == tmthing->type // bounce against other rollout rocks
&& (tmthing->momx || tmthing->momy || thing->momx || thing->momy)) && (tmthing->momx || tmthing->momy || thing->momx || thing->momy))
{ {

View File

@ -6068,7 +6068,7 @@ static void P_AddAirbob(sector_t *sec, line_t *sourceline, boolean noadjust, boo
airbob->vars[5] = sec->ceilingheight; airbob->vars[5] = sec->ceilingheight;
airbob->vars[4] = airbob->vars[5] airbob->vars[4] = airbob->vars[5]
- (sec->ceilingheight - sec->floorheight); - (sec->ceilingheight - sec->floorheight);
airbob->vars[9] = dynamic ? 1 : 0; airbob->vars[9] = dynamic ? 1 : 0;
airbob->sourceline = sourceline; airbob->sourceline = sourceline;

View File

@ -1096,7 +1096,7 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
// Spinning. // Spinning.
if (player->pflags & PF_SPINNING) if (player->pflags & PF_SPINNING)
return true; return true;
if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)) if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE))
return true; return true;
@ -7820,7 +7820,7 @@ static void P_MovePlayer(player_t *player)
if (!(player->powers[pw_nocontrol] & (1<<15))) if (!(player->powers[pw_nocontrol] & (1<<15)))
player->pflags |= PF_JUMPSTASIS; player->pflags |= PF_JUMPSTASIS;
} }
if (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING) if (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING)
{ {
player->pflags |= PF_STASIS; player->pflags |= PF_STASIS;
@ -10978,19 +10978,19 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
tic_t dashmode = player->dashmode; tic_t dashmode = player->dashmode;
boolean underwater = mo->eflags & MFE_UNDERWATER; boolean underwater = mo->eflags & MFE_UNDERWATER;
statenum_t stat = fume->state-states; 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 (panim != PA_WALK && panim != PA_RUN && panim != PA_DASH) // turn invisible when not in a coherent movement state
{ {
if (stat != fume->info->spawnstate) if (stat != fume->info->spawnstate)
P_SetMobjState(fume, fume->info->spawnstate); P_SetMobjState(fume, fume->info->spawnstate);
return; return;
} }
if (underwater) // No fume underwater; spawn bubbles instead! if (underwater) // No fume underwater; spawn bubbles instead!
{ {
fume->movedir += FixedAngle(FixedDiv(2 * player->speed, 3 * mo->scale)); fume->movedir += FixedAngle(FixedDiv(2 * player->speed, 3 * mo->scale));
fume->movefactor += player->speed; fume->movefactor += player->speed;
if (fume->movefactor > FixedDiv(2 * player->normalspeed, 3 * mo->scale)) if (fume->movefactor > FixedDiv(2 * player->normalspeed, 3 * mo->scale))
{ {
INT16 i; 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 factorX = P_ReturnThrustX(mo, angle + ANGLE_90, mo->scale);
fixed_t factorY = P_ReturnThrustY(mo, angle + ANGLE_90, mo->scale); fixed_t factorY = P_ReturnThrustY(mo, angle + ANGLE_90, mo->scale);
fixed_t offsetH, offsetV, x, y, z; fixed_t offsetH, offsetV, x, y, z;
for (i = -1; i < 2; i += 2) for (i = -1; i < 2; i += 2)
{ {
offsetH = i*P_ReturnThrustX(fume, fume->movedir, radiusV); 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; z = mo->z + (mo->height >> 1) + offsetV;
P_SpawnMobj(x, y, z, MT_SMALLBUBBLE)->scale = mo->scale >> 1; P_SpawnMobj(x, y, z, MT_SMALLBUBBLE)->scale = mo->scale >> 1;
} }
fume->movefactor = 0; fume->movefactor = 0;
} }
if (panim == PA_WALK) if (panim == PA_WALK)
{ {
if (stat != fume->info->spawnstate) if (stat != fume->info->spawnstate)
@ -11021,13 +11021,13 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
return; return;
} }
} }
if (stat == fume->info->spawnstate) // If currently inivisble, activate! if (stat == fume->info->spawnstate) // If currently inivisble, activate!
{ {
P_SetMobjState(fume, (stat = fume->info->seestate)); P_SetMobjState(fume, (stat = fume->info->seestate));
P_SetScale(fume, mo->scale); P_SetScale(fume, mo->scale);
} }
if (dashmode > DASHMODE_THRESHOLD && stat != fume->info->seestate) // If in dashmode, grow really big and flash if (dashmode > DASHMODE_THRESHOLD && stat != fume->info->seestate) // If in dashmode, grow really big and flash
{ {
fume->destscale = mo->scale; 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->flags2 = (fume->flags2 & ~MF2_DONTDRAW) | (mo->flags2 & MF2_DONTDRAW);
fume->destscale = (mo->scale + FixedDiv(player->speed, player->normalspeed)) / (underwater ? 6 : 3); fume->destscale = (mo->scale + FixedDiv(player->speed, player->normalspeed)) / (underwater ? 6 : 3);
fume->color = FUME_SKINCOLORS[(dashmode * sizeof(FUME_SKINCOLORS)) / (DASHMODE_MAX + 1)]; fume->color = FUME_SKINCOLORS[(dashmode * sizeof(FUME_SKINCOLORS)) / (DASHMODE_MAX + 1)];
if (underwater) if (underwater)
{ {
fume->frame = (fume->frame & FF_FRAMEMASK) | FF_ANIMATE | (P_RandomRange(0, 9) * FF_TRANS10); 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->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! fume->eflags = (fume->eflags & ~MFE_VERTICALFLIP) | (mo->eflags & MFE_VERTICALFLIP); // Make sure to flip in reverse gravity!
// Finally, set its position // Finally, set its position
dist = -mo->radius - FixedMul(fume->info->radius, fume->destscale - mo->scale/3); dist = -mo->radius - FixedMul(fume->info->radius, fume->destscale - mo->scale/3);
P_UnsetThingPosition(fume); P_UnsetThingPosition(fume);
fume->x = mo->x + P_ReturnThrustX(fume, angle, dist); fume->x = mo->x + P_ReturnThrustX(fume, angle, dist);
fume->y = mo->y + P_ReturnThrustY(fume, angle, dist); fume->y = mo->y + P_ReturnThrustY(fume, angle, dist);