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

Fix indentation in MOBJCONSISTANCY conditional

This commit is contained in:
X.organic 2021-02-16 23:27:44 +01:00
parent 90611ed547
commit 0cbf9a791b
No known key found for this signature in database
GPG Key ID: E8A896BE6A3BC4E0
1 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/d_clisrv.c
View File

@ -4480,74 +4480,75 @@ static INT16 Consistancy(void)
ret += P_GetRandSeed(); ret += P_GetRandSeed();
#ifdef MOBJCONSISTANCY #ifdef MOBJCONSISTANCY
if (gamestate == GS_LEVEL) { if (gamestate == GS_LEVEL)
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
{ {
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
continue;
mo = (mobj_t *)th;
if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN | MF_STICKY))
{ {
ret -= mo->type; if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
ret += mo->x; continue;
ret -= mo->y;
ret += mo->z; mo = (mobj_t *)th;
ret -= mo->momx;
ret += mo->momy; if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN | MF_STICKY))
ret -= mo->momz;
ret += mo->angle;
ret -= mo->flags;
ret += mo->flags2;
ret -= mo->eflags;
if (mo->target)
{ {
ret += mo->target->type; ret -= mo->type;
ret -= mo->target->x; ret += mo->x;
ret += mo->target->y; ret -= mo->y;
ret -= mo->target->z; ret += mo->z;
ret += mo->target->momx; ret -= mo->momx;
ret -= mo->target->momy; ret += mo->momy;
ret += mo->target->momz; ret -= mo->momz;
ret -= mo->target->angle; ret += mo->angle;
ret += mo->target->flags; ret -= mo->flags;
ret -= mo->target->flags2; ret += mo->flags2;
ret += mo->target->eflags; ret -= mo->eflags;
ret -= mo->target->state - states; if (mo->target)
ret += mo->target->tics; {
ret -= mo->target->sprite; ret += mo->target->type;
ret += mo->target->frame; ret -= mo->target->x;
ret += mo->target->y;
ret -= mo->target->z;
ret += mo->target->momx;
ret -= mo->target->momy;
ret += mo->target->momz;
ret -= mo->target->angle;
ret += mo->target->flags;
ret -= mo->target->flags2;
ret += mo->target->eflags;
ret -= mo->target->state - states;
ret += mo->target->tics;
ret -= mo->target->sprite;
ret += mo->target->frame;
}
else
ret ^= 0x3333;
if (mo->tracer && mo->tracer->type != MT_OVERLAY)
{
ret += mo->tracer->type;
ret -= mo->tracer->x;
ret += mo->tracer->y;
ret -= mo->tracer->z;
ret += mo->tracer->momx;
ret -= mo->tracer->momy;
ret += mo->tracer->momz;
ret -= mo->tracer->angle;
ret += mo->tracer->flags;
ret -= mo->tracer->flags2;
ret += mo->tracer->eflags;
ret -= mo->tracer->state - states;
ret += mo->tracer->tics;
ret -= mo->tracer->sprite;
ret += mo->tracer->frame;
}
else
ret ^= 0xAAAA;
ret -= mo->state - states;
ret += mo->tics;
ret -= mo->sprite;
ret += mo->frame;
} }
else
ret ^= 0x3333;
if (mo->tracer && mo->tracer->type != MT_OVERLAY)
{
ret += mo->tracer->type;
ret -= mo->tracer->x;
ret += mo->tracer->y;
ret -= mo->tracer->z;
ret += mo->tracer->momx;
ret -= mo->tracer->momy;
ret += mo->tracer->momz;
ret -= mo->tracer->angle;
ret += mo->tracer->flags;
ret -= mo->tracer->flags2;
ret += mo->tracer->eflags;
ret -= mo->tracer->state - states;
ret += mo->tracer->tics;
ret -= mo->tracer->sprite;
ret += mo->tracer->frame;
}
else
ret ^= 0xAAAA;
ret -= mo->state - states;
ret += mo->tics;
ret -= mo->sprite;
ret += mo->frame;
} }
} }
}
#endif #endif
DEBFILE(va("Consistancy = %u\n", (ret & 0xFFFF))); DEBFILE(va("Consistancy = %u\n", (ret & 0xFFFF)));