From 2d91786516ed3edb576db7418cac30c588bd2af0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 7 Nov 2021 19:35:55 +0100 Subject: [PATCH] - changed all sector variables being passed to pushmove to full ints --- source/games/blood/src/actor.cpp | 2 +- source/games/blood/src/nnexts.cpp | 2 +- source/games/blood/src/player.cpp | 2 +- source/games/blood/src/prediction.cpp | 2 +- source/games/blood/src/view.h | 2 +- source/games/duke/src/actors.cpp | 4 +--- source/games/duke/src/player.cpp | 2 +- source/games/duke/src/player_d.cpp | 2 +- source/games/duke/src/player_r.cpp | 8 ++++---- source/games/duke/src/sectors_d.cpp | 2 +- source/games/exhumed/src/player.cpp | 2 +- source/games/exhumed/src/set.cpp | 5 ++++- source/games/sw/src/sprite.cpp | 2 +- 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index b8b5338e7..6b210d21a 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -4878,7 +4878,7 @@ void MoveDude(DBloodActor* actor) if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate) { - short nSector2 = nSector; + int nSector2 = nSector; if (pushmove(&pSprite->pos, &nSector2, wd, tz, bz, CLIPMASK0) == -1) actDamageSprite(actor, actor, kDamageFall, 1000 << 4); if (nSector2 != -1) diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index 0cf90fa8a..18d3766e7 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -1667,7 +1667,7 @@ void debrisMove(int listIndex) } if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate) { - short nSector2 = nSector; + int nSector2 = nSector; if (pushmove(&pSprite->pos, &nSector2, clipDist, ceilDist, floorDist, CLIPMASK0) != -1) nSector = nSector2; } diff --git a/source/games/blood/src/player.cpp b/source/games/blood/src/player.cpp index 4ea9cea99..2b720052f 100644 --- a/source/games/blood/src/player.cpp +++ b/source/games/blood/src/player.cpp @@ -1667,7 +1667,7 @@ void playerProcess(PLAYER *pPlayer) int dw = pSprite->clipdist<<2; if (!gNoClip) { - short nSector = pSprite->sectnum; + int nSector = pSprite->sectnum; if (pushmove(&pSprite->pos, &nSector, dw, dzt, dzb, CLIPMASK0) == -1) actDamageSprite(actor, actor, kDamageFall, 500<<4); if (pSprite->sectnum != nSector) diff --git a/source/games/blood/src/prediction.cpp b/source/games/blood/src/prediction.cpp index 4502ced7d..20bc2ac77 100644 --- a/source/games/blood/src/prediction.cpp +++ b/source/games/blood/src/prediction.cpp @@ -389,7 +389,7 @@ static void fakeMoveDude(spritetype *pSprite) if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate) { - short nSector2 = nSector; + int nSector2 = nSector; pushmove(&predict.pos, &nSector2, wd, tz, bz, CLIPMASK0); if (nSector2 != -1) nSector = nSector2; diff --git a/source/games/blood/src/view.h b/source/games/blood/src/view.h index ac6e9b3c0..afaaa7dba 100644 --- a/source/games/blood/src/view.h +++ b/source/games/blood/src/view.h @@ -61,7 +61,7 @@ struct VIEW { int xvel; //xvel int yvel; //yvel int zvel; //zvel - short sectnum; // sectnum + int sectnum; // sectnum unsigned int floordist; // floordist char at6e; // look center char at6f; diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index 1028896b3..b7d2d7130 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -5319,9 +5319,7 @@ void fall_common(DDukeActor *actor, int playernum, int JIBS6, int DRONE, int BLO { int j = s->sectnum; - int x = s->x, y = s->y, z = s->z; - pushmove(&x, &y, &z, &j, 128, (4 << 8), (4 << 8), CLIPMASK0); - s->x = x; s->y = y; s->z = z; + pushmove(&s->pos, &j, 128, (4 << 8), (4 << 8), CLIPMASK0); if (j != s->sectnum && j >= 0 && j < MAXSECTORS) changeactorsect(actor, j); diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index 67294bc0f..56c750e3e 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -628,7 +628,7 @@ void playerisdead(int snum, int psectlotag, int fz, int cz) updatesector(p->pos.x, p->pos.y, &p->cursectnum); - pushmove(&p->pos.x, &p->pos.y, &p->pos.z, &p->cursectnum, 128L, (4 << 8), (20 << 8), CLIPMASK0); + pushmove(&p->pos, &p->cursectnum, 128L, (4 << 8), (20 << 8), CLIPMASK0); if (fz > cz + (16 << 8) && s->pal != 1) p->angle.rotscrnang = buildang(p->dead_flag + ((fz + p->pos.z) >> 7)); diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index ecd62ed89..43ed5d28d 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -3067,7 +3067,7 @@ HORIZONLY: changeactorsect(pact, p->cursectnum); if (ud.clipping == 0) - j = (pushmove(&p->pos.x, &p->pos.y, &p->pos.z, &p->cursectnum, 164L, (4L << 8), (4L << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512); + j = (pushmove(&p->pos, &p->cursectnum, 164L, (4L << 8), (4L << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512); else j = 0; if (ud.clipping == 0) diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 2f5fa6755..5844f63ef 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -3812,10 +3812,10 @@ HORIZONLY: if (wall[clip.index].lotag < 44) { dofurniture(clip.index, p->cursectnum, snum); - pushmove(&p->pos.x, &p->pos.y, &p->pos.z, &p->cursectnum, 172L, (4L << 8), (4L << 8), CLIPMASK0); + pushmove(&p->pos, &p->cursectnum, 172L, (4L << 8), (4L << 8), CLIPMASK0); } else - pushmove(&p->pos.x, &p->pos.y, &p->pos.z, &p->cursectnum, 172L, (4L << 8), (4L << 8), CLIPMASK0); + pushmove(&p->pos, &p->cursectnum, 172L, (4L << 8), (4L << 8), CLIPMASK0); } } } @@ -3915,9 +3915,9 @@ HORIZONLY: if (ud.clipping == 0) { if (s->clipdist == 64) - j = (pushmove(&p->pos.x, &p->pos.y, &p->pos.z, &p->cursectnum, 128L, (4L << 8), (4L << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512); + j = (pushmove(&p->pos, &p->cursectnum, 128L, (4L << 8), (4L << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512); else - j = (pushmove(&p->pos.x, &p->pos.y, &p->pos.z, &p->cursectnum, 16L, (4L << 8), (4L << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512); + j = (pushmove(&p->pos, &p->cursectnum, 16L, (4L << 8), (4L << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512); } else j = 0; diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp index a53ced294..c8d63fd84 100644 --- a/source/games/duke/src/sectors_d.cpp +++ b/source/games/duke/src/sectors_d.cpp @@ -1410,7 +1410,7 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj) s->ang = (pspr->ang + 1024) & 2047; s->xvel = -(pspr->extra << 2); j = s->sectnum; - pushmove(&s->x, &s->y, &s->z, &j, 128L, (4 << 8), (4 << 8), CLIPMASK0); + pushmove(&s->pos, &j, 128L, (4 << 8), (4 << 8), CLIPMASK0); if (j != s->sectnum && j >= 0 && j < MAXSECTORS) changeactorsect(targ, j); } diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index dcc041d8d..c6ecbdd6d 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -908,7 +908,7 @@ void AIPlayer::Tick(RunListEvent* ev) { nMove = movesprite(pPlayerActor, x, y, z, 5120, -5120, CLIPMASK0); - short var_54 = pPlayerSprite->sectnum; + int var_54 = pPlayerSprite->sectnum; pushmove(&pPlayerSprite->pos, &var_54, pPlayerSprite->clipdist << 2, 5120, -5120, CLIPMASK0); if (var_54 != pPlayerSprite->sectnum) { diff --git a/source/games/exhumed/src/set.cpp b/source/games/exhumed/src/set.cpp index 7709c4e1f..252906f79 100644 --- a/source/games/exhumed/src/set.cpp +++ b/source/games/exhumed/src/set.cpp @@ -283,7 +283,10 @@ void AISet::Tick(RunListEvent* ev) auto nMov = MoveCreature(pActor); - pushmove(&pSprite->pos, &pSprite->sectnum, pSprite->clipdist << 2, 5120, -5120, CLIPMASK0); + static_assert(sizeof(pSprite->sectnum) != 4); + int sectnum = pSprite->sectnum; + pushmove(&pSprite->pos, §num, pSprite->clipdist << 2, 5120, -5120, CLIPMASK0); + pSprite->sectnum = sectnum; if (pSprite->zvel > 4000) { diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index 353c54760..0566b4a4e 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -6961,7 +6961,7 @@ int pushmove_sprite(short SpriteNum) { SPRITEp sp = &sprite[SpriteNum]; USERp u = User[SpriteNum].Data(); - short sectnum, ret; + int sectnum, ret; sp->z -= u->zclip; sectnum = sp->sectnum;