zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-02 06:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: fifth batch of spr.pos wraps.

Browse source
This commit is contained in:
Christoph Oelckers 2022-02-01 20:04:41 +01:00
parent 212b9e8bab
commit 2d91ea29ce
5 changed files with 45 additions and 46 deletions

26
source/games/sw/src/player.cpp
View file

@ -1667,7 +1667,7 @@ void DoPlayerSpriteBob(PLAYER* pp, short player_height, short bob_amt, short bob
pp->bob_amt = MulScale(bob_amt, bsin(pp->bob_ndx), 14); pp->bob_amt = MulScale(bob_amt, bsin(pp->bob_ndx), 14);
pp->actor->spr.pos.Z = (pp->pos.Z + player_height) + pp->bob_amt; pp->actor->set_int_z((pp->pos.Z + player_height) + pp->bob_amt);
} }
void UpdatePlayerUnderSprite(PLAYER* pp) void UpdatePlayerUnderSprite(PLAYER* pp)
@ -1722,7 +1722,7 @@ void UpdatePlayerUnderSprite(PLAYER* pp)
zdiff = ActorZOfBottom(act_over) - water_level_z; zdiff = ActorZOfBottom(act_over) - water_level_z;
// add diff to ceiling // add diff to ceiling
act_under->spr.pos.Z = act_under->sector()->ceilingz + zdiff; act_under->set_int_z(act_under->sector()->ceilingz + zdiff);
act_under->user.State = act_over->user.State; act_under->user.State = act_over->user.State;
act_under->user.Rot = act_over->user.Rot; act_under->user.Rot = act_over->user.Rot;
@ -1751,12 +1751,12 @@ void UpdatePlayerSprite(PLAYER* pp)
if (pp->sop_control) if (pp->sop_control)
{ {
actor->spr.pos.Z = pp->cursector->floorz; actor->set_int_z(pp->cursector->floorz);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
} }
else if (pp->DoPlayerAction == DoPlayerCrawl) else if (pp->DoPlayerAction == DoPlayerCrawl)
{ {
actor->spr.pos.Z = pp->pos.Z + PLAYER_CRAWL_HEIGHT; actor->set_int_z(pp->pos.Z + PLAYER_CRAWL_HEIGHT);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
} }
#if 0 #if 0
@ -1768,7 +1768,7 @@ void UpdatePlayerSprite(PLAYER* pp)
#endif #endif
else if (pp->DoPlayerAction == DoPlayerWade) else if (pp->DoPlayerAction == DoPlayerWade)
{ {
actor->spr.pos.Z = pp->pos.Z + PLAYER_HEIGHT; actor->set_int_z(pp->pos.Z + PLAYER_HEIGHT);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
if (pp->WadeDepth > Z(29)) if (pp->WadeDepth > Z(29))
@ -1779,12 +1779,12 @@ void UpdatePlayerSprite(PLAYER* pp)
else if (pp->DoPlayerAction == DoPlayerDive) else if (pp->DoPlayerAction == DoPlayerDive)
{ {
// bobbing and sprite position taken care of in DoPlayerDive // bobbing and sprite position taken care of in DoPlayerDive
actor->spr.pos.Z = pp->pos.Z + Z(10); actor->set_int_z(pp->pos.Z + Z(10));
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
} }
else if (pp->DoPlayerAction == DoPlayerClimb) else if (pp->DoPlayerAction == DoPlayerClimb)
{ {
actor->spr.pos.Z = pp->pos.Z + Z(17); actor->set_int_z(pp->pos.Z + Z(17));
// move it forward a bit to look like its on the ladder // move it forward a bit to look like its on the ladder
//actor->spr.x += MOVEx(256+64, actor->spr.ang); //actor->spr.x += MOVEx(256+64, actor->spr.ang);
@ -1803,17 +1803,17 @@ void UpdatePlayerSprite(PLAYER* pp)
} }
else if (pp->DoPlayerAction == DoPlayerJump || pp->DoPlayerAction == DoPlayerFall || pp->DoPlayerAction == DoPlayerForceJump) else if (pp->DoPlayerAction == DoPlayerJump || pp->DoPlayerAction == DoPlayerFall || pp->DoPlayerAction == DoPlayerForceJump)
{ {
actor->spr.pos.Z = pp->pos.Z + PLAYER_HEIGHT; actor->set_int_z(pp->pos.Z + PLAYER_HEIGHT);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
} }
else if (pp->DoPlayerAction == DoPlayerTeleportPause) else if (pp->DoPlayerAction == DoPlayerTeleportPause)
{ {
actor->spr.pos.Z = pp->pos.Z + PLAYER_HEIGHT; actor->set_int_z(pp->pos.Z + PLAYER_HEIGHT);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
} }
else else
{ {
actor->spr.pos.Z = pp->loz; actor->set_int_z(pp->loz);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
} }
@ -3298,7 +3298,7 @@ void DoPlayerClimb(PLAYER* pp)
} }
// setsprite to players location // setsprite to players location
plActor->spr.pos.Z = pp->pos.Z + PLAYER_HEIGHT; plActor->set_int_z(pp->pos.Z + PLAYER_HEIGHT);
ChangeActorSect(pp->actor, pp->cursector); ChangeActorSect(pp->actor, pp->cursector);
if (!SyncInput()) if (!SyncInput())
@ -6084,7 +6084,7 @@ void DoPlayerDeathCrumble(PLAYER* pp)
} }
DoPlayerDeathCheckKeys(pp); DoPlayerDeathCheckKeys(pp);
plActor->spr.pos.Z = pp->pos.Z+PLAYER_DEAD_HEAD_FLOORZ_OFFSET; plActor->set_int_z(pp->pos.Z+PLAYER_DEAD_HEAD_FLOORZ_OFFSET);
DoPlayerHeadDebris(pp); DoPlayerHeadDebris(pp);
} }
@ -6137,7 +6137,7 @@ void DoPlayerDeathExplode(PLAYER* pp)
} }
DoPlayerDeathCheckKeys(pp); DoPlayerDeathCheckKeys(pp);
plActor->spr.pos.Z = pp->pos.Z+PLAYER_DEAD_HEAD_FLOORZ_OFFSET; plActor->set_int_z(pp->pos.Z+PLAYER_DEAD_HEAD_FLOORZ_OFFSET);
DoPlayerHeadDebris(pp); DoPlayerHeadDebris(pp);
} }

12
source/games/sw/src/track.cpp
View file

@ -1706,7 +1706,7 @@ PlayerPart:
if ((sop->flags & SOBJ_SPRITE_OBJ)) if ((sop->flags & SOBJ_SPRITE_OBJ))
{ {
// Sprite Objects follow zmid // Sprite Objects follow zmid
actor->spr.pos.Z = sop->pmid.Z - actor->user.pos.Z; actor->set_int_z(sop->pmid.Z - actor->user.pos.Z);
} }
else else
{ {
@ -1714,12 +1714,12 @@ PlayerPart:
if (actor->user.Flags & (SPR_ON_SO_SECTOR)) if (actor->user.Flags & (SPR_ON_SO_SECTOR))
{ {
// move with sector its on // move with sector its on
actor->spr.pos.Z = actor->sector()->floorz - actor->user.pos.Z; actor->set_int_z(actor->sector()->floorz - actor->user.pos.Z);
} }
else else
{ {
// move with the mid sector // move with the mid sector
actor->spr.pos.Z = sop->mid_sector->floorz - actor->user.pos.Z; actor->set_int_z(sop->mid_sector->floorz - actor->user.pos.Z);
} }
} }
@ -1792,7 +1792,7 @@ PlayerPart:
//pp->posz -= PLAYER_HEIGHT + Z(12); //pp->posz -= PLAYER_HEIGHT + Z(12);
DoPlayerZrange(pp); DoPlayerZrange(pp);
pp->pos.Z = pp->loz - PLAYER_CRAWL_HEIGHT; pp->pos.Z = pp->loz - PLAYER_CRAWL_HEIGHT;
pp->actor->spr.pos.Z = pp->loz; pp->actor->set_int_z(pp->loz);
} }
else else
{ {
@ -1803,7 +1803,7 @@ PlayerPart:
if (!(pp->Flags & (PF_JUMPING | PF_FALLING | PF_FLYING))) if (!(pp->Flags & (PF_JUMPING | PF_FALLING | PF_FLYING)))
{ {
pp->pos.Z = pp->loz - PLAYER_HEIGHT; pp->pos.Z = pp->loz - PLAYER_HEIGHT;
pp->actor->spr.pos.Z = pp->loz; pp->actor->set_int_z(pp->loz);
} }
} }
} }
@ -3287,7 +3287,7 @@ bool ActorTrackDecide(TRACK_POINT* tpoint, DSWActor* actor)
if (actor->user.Flags & (SPR_ZDIFF_MODE)) if (actor->user.Flags & (SPR_ZDIFF_MODE))
{ {
actor->user.Flags &= ~(SPR_ZDIFF_MODE); actor->user.Flags &= ~(SPR_ZDIFF_MODE);
actor->spr.pos.Z = actor->sector()->floorz; actor->set_int_z(actor->sector()->floorz);
actor->spr.zvel = 0; actor->spr.zvel = 0;
} }
else else

3
source/games/sw/src/wallmove.cpp
View file

@ -147,8 +147,7 @@ int DoWallMove(DSWActor* actor)
} }
else else
{ {
actor->spr.pos.X += nx; actor->add_int_pos({ nx, ny, 0 });
actor->spr.pos.Y += ny;
} }
} }

46
source/games/sw/src/weapon.cpp
View file

@ -3799,7 +3799,7 @@ int DoVomit(DSWActor* actor)
ChangeState(actor, s_VomitSplash); ChangeState(actor, s_VomitSplash);
DoFindGroundPoint(actor); DoFindGroundPoint(actor);
MissileWaterAdjust(actor); MissileWaterAdjust(actor);
actor->spr.pos.Z = actor->user.loz; actor->set_int_z(actor->user.loz);
actor->user.WaitTics = 60; actor->user.WaitTics = 60;
actor->user.pos.X = actor->spr.xrepeat; actor->user.pos.X = actor->spr.xrepeat;
actor->user.pos.Y = actor->spr.yrepeat; actor->user.pos.Y = actor->spr.yrepeat;
@ -8627,7 +8627,7 @@ int DoMineStuck(DSWActor* actor)
vec3_t pos = { attachActor->spr.pos.X, attachActor->spr.pos.Y, attachActor->spr.pos.Z - actor->user.pos.Z }; vec3_t pos = { attachActor->spr.pos.X, attachActor->spr.pos.Y, attachActor->spr.pos.Z - actor->user.pos.Z };
SetActorZ(actor, &pos); SetActorZ(actor, &pos);
actor->spr.pos.Z = attachActor->spr.pos.Z - (ActorSizeZ(attachActor) >> 1); actor->set_int_z(attachActor->spr.pos.Z - (ActorSizeZ(attachActor) >> 1));
} }
// not activated yet // not activated yet
@ -8812,7 +8812,7 @@ int DoMine(DSWActor* actor)
SetMineStuck(actor); SetMineStuck(actor);
// Set the Z position // Set the Z position
actor->spr.pos.Z = hitActor->spr.pos.Z - (ActorSizeZ(hitActor) >> 1); actor->set_int_z(hitActor->spr.pos.Z - (ActorSizeZ(hitActor) >> 1));
// If it's not alive, don't stick it // If it's not alive, don't stick it
if (hitActor->hasU() && hitActor->user.Health <= 0) return false; // JBF: added null check if (hitActor->hasU() && hitActor->user.Health <= 0) return false; // JBF: added null check
@ -9862,7 +9862,7 @@ void SpawnBreakStaticFlames(DSWActor* actor)
actorNew->user.Radius = 200; actorNew->user.Radius = 200;
actorNew->user.floor_dist = actorNew->user.ceiling_dist = 0; actorNew->user.floor_dist = actorNew->user.ceiling_dist = 0;
actorNew->spr.pos.Z = getflorzofslopeptr(actorNew->sector(), actorNew->spr.pos.X, actorNew->spr.pos.Y); actorNew->set_int_z(getflorzofslopeptr(actorNew->sector(), actorNew->spr.pos.X, actorNew->spr.pos.Y));
PlaySound(DIGI_FIRE1,actorNew,v3df_dontpan|v3df_doppler); PlaySound(DIGI_FIRE1,actorNew,v3df_dontpan|v3df_doppler);
} }
@ -10262,13 +10262,13 @@ void SpawnBigGunFlames(DSWActor* actor, DSWActor* Operator, SECTOR_OBJECT* sop,
if (actor->user.Flags & (SPR_ON_SO_SECTOR)) if (actor->user.Flags & (SPR_ON_SO_SECTOR))
{ {
// move with sector its on // move with sector its on
expActor->spr.pos.Z = actor->sector()->floorz - actor->user.pos.Z; expActor->set_int_z(actor->sector()->floorz - actor->user.pos.Z);
expActor->backupz(); expActor->backupz();
} }
else else
{ {
// move with the mid sector // move with the mid sector
expActor->spr.pos.Z = sop->mid_sector->floorz - actor->user.pos.Z; expActor->set_int_z(sop->mid_sector->floorz - actor->user.pos.Z);
expActor->backupz(); expActor->backupz();
} }
@ -10391,12 +10391,12 @@ void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int l
if (tos_z <= actor->user.hiz + Z(4)) if (tos_z <= actor->user.hiz + Z(4))
{ {
expActor->spr.pos.Z = actor->user.hiz + upper_zsize; expActor->set_int_z(actor->user.hiz + upper_zsize);
expActor->spr.cstat |= (CSTAT_SPRITE_YFLIP); expActor->spr.cstat |= (CSTAT_SPRITE_YFLIP);
} }
else if (bos_z > actor->user.loz) else if (bos_z > actor->user.loz)
{ {
expActor->spr.pos.Z = actor->user.loz - lower_zsize; expActor->set_int_z(actor->user.loz - lower_zsize);
} }
} }
else else
@ -10410,12 +10410,12 @@ void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int l
if (tos_z <= cz + Z(4)) if (tos_z <= cz + Z(4))
{ {
expActor->spr.pos.Z = cz + upper_zsize; expActor->set_int_z(cz + upper_zsize);
expActor->spr.cstat |= (CSTAT_SPRITE_YFLIP); expActor->spr.cstat |= (CSTAT_SPRITE_YFLIP);
} }
else if (bos_z > fz) else if (bos_z > fz)
{ {
expActor->spr.pos.Z = fz - lower_zsize; expActor->set_int_z(fz - lower_zsize);
} }
} }
@ -10814,7 +10814,7 @@ int DoNapalm(DSWActor* actor)
DoFindGroundPoint(expActor); DoFindGroundPoint(expActor);
MissileWaterAdjust(expActor); MissileWaterAdjust(expActor);
expActor->spr.pos.Z = expActor->user.loz; expActor->set_int_z(expActor->user.loz);
expActor->backupz(); expActor->backupz();
if (actor->user.Flags & (SPR_UNDERWATER)) if (actor->user.Flags & (SPR_UNDERWATER))
@ -11207,12 +11207,12 @@ int DoRing(DSWActor* actor)
// bound the sprite by the sectors ceiling and floor // bound the sprite by the sectors ceiling and floor
if (actor->spr.pos.Z > fz) if (actor->spr.pos.Z > fz)
{ {
actor->spr.pos.Z = fz; actor->set_int_z(fz);
} }
if (actor->spr.pos.Z < cz + ActorSizeZ(actor)) if (actor->spr.pos.Z < cz + ActorSizeZ(actor))
{ {
actor->spr.pos.Z = cz + ActorSizeZ(actor); actor->set_int_z(cz + ActorSizeZ(actor));
} }
// Done last - check for damage // Done last - check for damage
@ -11335,12 +11335,12 @@ int DoSerpRing(DSWActor* actor)
// bound the sprite by the sectors ceiling and floor // bound the sprite by the sectors ceiling and floor
if (actor->spr.pos.Z > fz) if (actor->spr.pos.Z > fz)
{ {
actor->spr.pos.Z = fz; actor->set_int_z(fz);
} }
if (actor->spr.pos.Z < cz + ActorSizeZ(actor)) if (actor->spr.pos.Z < cz + ActorSizeZ(actor))
{ {
actor->spr.pos.Z = cz + ActorSizeZ(actor); actor->set_int_z(cz + ActorSizeZ(actor));
} }
if (actor->user.Counter2 > 0) if (actor->user.Counter2 > 0)
@ -11536,7 +11536,7 @@ int InitSerpRing(DSWActor* actor)
actorNew->spr.zvel = Z(3); actorNew->spr.zvel = Z(3);
actorNew->spr.pal = 0; actorNew->spr.pal = 0;
actorNew->spr.pos.Z = ActorZOfTop(actor) - Z(20); actorNew->set_int_z(ActorZOfTop(actor) - Z(20));
actorNew->user.pos.Z = Z(50); actorNew->user.pos.Z = Z(50);
// ang around the serp is now slide_ang // ang around the serp is now slide_ang
@ -14082,7 +14082,7 @@ int InitSerpSpell(DSWActor* actor)
auto actorNew = SpawnActor(STAT_MISSILE, SERP_METEOR, &sg_SerpMeteor[0][0], actor->sector(), auto actorNew = SpawnActor(STAT_MISSILE, SERP_METEOR, &sg_SerpMeteor[0][0], actor->sector(),
actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 1500); actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 1500);
actorNew->spr.pos.Z = ActorZOfTop(actor); actorNew->set_int_z(ActorZOfTop(actor));
actorNew->user.RotNum = 5; actorNew->user.RotNum = 5;
NewStateGroup(actorNew, &sg_SerpMeteor[0]); NewStateGroup(actorNew, &sg_SerpMeteor[0]);
@ -14181,7 +14181,7 @@ int InitSerpMonstSpell(DSWActor* actor)
actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 500); actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 500);
actorNew->user.spal = actorNew->spr.pal = 25; // Bright Red actorNew->user.spal = actorNew->spr.pal = 25; // Bright Red
actorNew->spr.pos.Z = ActorZOfTop(actor); actorNew->set_int_z(ActorZOfTop(actor));
actorNew->user.RotNum = 5; actorNew->user.RotNum = 5;
NewStateGroup(actorNew, &sg_SerpMeteor[0]); NewStateGroup(actorNew, &sg_SerpMeteor[0]);
@ -14643,7 +14643,7 @@ int DoCoolgDrip(DSWActor* actor)
if (actor->spr.pos.Z > actor->user.loz - actor->user.floor_dist) if (actor->spr.pos.Z > actor->user.loz - actor->user.floor_dist)
{ {
actor->spr.pos.Z = actor->user.loz - actor->user.floor_dist; actor->set_int_z(actor->user.loz - actor->user.floor_dist);
actor->spr.yrepeat = actor->spr.xrepeat = 32; actor->spr.yrepeat = actor->spr.xrepeat = 32;
ChangeState(actor, s_GoreFloorSplash); ChangeState(actor, s_GoreFloorSplash);
if (actor->user.spal == PALETTE_BLUE_LIGHTING) if (actor->user.spal == PALETTE_BLUE_LIGHTING)
@ -16955,7 +16955,7 @@ bool SpriteWarpToUnderwater(DSWActor* actor)
ChangeActorSect(actor, over); ChangeActorSect(actor, over);
} }
actor->spr.pos.Z = underActor->sector()->ceilingz + actor->user.ceiling_dist+Z(1); actor->set_int_z(underActor->sector()->ceilingz + actor->user.ceiling_dist+Z(1));
actor->backuppos(); actor->backuppos();
@ -17024,7 +17024,7 @@ bool SpriteWarpToSurface(DSWActor* actor)
ChangeActorSect(actor, over); ChangeActorSect(actor, over);
} }
actor->spr.pos.Z = overActor->sector()->floorz - Z(2); actor->set_int_z(overActor->sector()->floorz - Z(2));
// set z range and wade depth so we know how high to set view // set z range and wade depth so we know how high to set view
DoActorZrange(actor); DoActorZrange(actor);
@ -18054,7 +18054,7 @@ int DoShrapVelocity(DSWActor* actor)
// hit floor // hit floor
if (actor->spr.pos.Z > ((actor->user.hiz + actor->user.loz) >> 1)) if (actor->spr.pos.Z > ((actor->user.hiz + actor->user.loz) >> 1))
{ {
actor->spr.pos.Z = actor->user.loz; actor->set_int_z(actor->user.loz);
if (actor->user.Flags & (SPR_UNDERWATER)) if (actor->user.Flags & (SPR_UNDERWATER))
actor->user.Flags |= (SPR_BOUNCE); // no bouncing underwater actor->user.Flags |= (SPR_BOUNCE); // no bouncing underwater
@ -18327,7 +18327,7 @@ int DoItemFly(DSWActor* actor)
// hit floor // hit floor
if (actor->spr.pos.Z > ((actor->user.hiz + actor->user.loz) >> 1)) if (actor->spr.pos.Z > ((actor->user.hiz + actor->user.loz) >> 1))
{ {
actor->spr.pos.Z = actor->user.loz; actor->set_int_z(actor->user.loz);
actor->user.Counter = 0; actor->user.Counter = 0;
actor->spr.xvel = 0; actor->spr.xvel = 0;
actor->user.change.Z = actor->user.change.X = actor->user.change.Y = 0; actor->user.change.Z = actor->user.change.X = actor->user.change.Y = 0;

4
source/games/sw/src/zilla.cpp
View file

@ -648,7 +648,7 @@ int NullZilla(DSWActor* actor)
actor->user.hi_sectp = actor->sector(); actor->user.hi_sectp = actor->sector();
actor->user.lowActor = nullptr; actor->user.lowActor = nullptr;
actor->user.highActor = nullptr; actor->user.highActor = nullptr;
actor->spr.pos.Z = actor->user.loz; actor->set_int_z(actor->user.loz);
DoActorSectorDamage(actor); DoActorSectorDamage(actor);
@ -717,7 +717,7 @@ int DoZillaDeathMelt(DSWActor* actor)
actor->user.hi_sectp = actor->sector(); actor->user.hi_sectp = actor->sector();
actor->user.lowActor = nullptr; actor->user.lowActor = nullptr;
actor->user.highActor = nullptr; actor->user.highActor = nullptr;
actor->spr.pos.Z = actor->user.loz; actor->set_int_z(actor->user.loz);
BossSpriteNum[2] = nullptr; BossSpriteNum[2] = nullptr;
return 0; return 0;