From 8e48911723b2ff6cf6898fb0147c90a126fdca57 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 9 Sep 2022 18:37:55 +0200 Subject: [PATCH] - very simple replacements --- source/games/blood/src/callback.cpp | 4 ++-- source/games/duke/src/actors.cpp | 2 +- source/games/duke/src/player_d.cpp | 6 +++--- source/games/duke/src/player_w.cpp | 4 ++-- source/games/duke/src/sectors.cpp | 2 +- source/games/exhumed/src/anims.cpp | 2 +- source/games/exhumed/src/sound.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/games/blood/src/callback.cpp b/source/games/blood/src/callback.cpp index 0763cd96d..bde88e15a 100644 --- a/source/games/blood/src/callback.cpp +++ b/source/games/blood/src/callback.cpp @@ -198,7 +198,7 @@ void fxBloodSpurt(DBloodActor* actor, sectortype*) // 6 auto pFX = gFX.fxSpawnActor(FX_27, actor->sector(), actor->spr.pos, 0); if (pFX) { - pFX->set_int_ang(0); + pFX->spr.angle = nullAngle; pFX->vel = actor->vel * (1./256); } evPostActor(actor, 6, kCallbackFXBloodSpurt); @@ -623,7 +623,7 @@ void fxPodBloodSpray(DBloodActor* actor, sectortype*) // 18 pFX = gFX.fxSpawnActor(FX_54, actor->sector(), actor->spr.pos, 0); if (pFX) { - pFX->set_int_ang(0); + pFX->spr.angle = nullAngle; pFX->vel = actor->vel * (1./256); } evPostActor(actor, 6, kCallbackFXPodBloodSpray); diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index e7ad66d30..d8e618e12 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -2971,7 +2971,7 @@ void handle_se30(DDukeActor *actor, int JIBS6) actor->vel.X = 0; operateactivators(actor->spr.hitag + (short)actor->temp_data[3], -1); actor->SetOwner(nullptr); - actor->add_int_ang(1024); + actor->spr.angle += DAngle180; actor->temp_data[4] = 0; fi.operateforcefields(actor, actor->spr.hitag); } diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index d0e53d095..303fa1b25 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -2358,9 +2358,9 @@ static void operateweapon(int snum, ESyncBits actions) auto j = spawn(pact, SHOTGUNSHELL); if (j) { - j->add_int_ang(1024); + j->spr.angle += DAngle180; ssp(j, CLIPMASK0); - j->add_int_ang(1024); + j->spr.angle -= DAngle180; } p->kickback_pic++; break; @@ -2386,7 +2386,7 @@ static void operateweapon(int snum, ESyncBits actions) auto j = spawn(pact, SHELL); if (j) { - j->set_int_ang((j->int_ang() + 1024) & 2047); + j->spr.angle += DAngle180; j->add_int_xvel( 32); j->spr.pos.Z += 3; ssp(j, CLIPMASK0); diff --git a/source/games/duke/src/player_w.cpp b/source/games/duke/src/player_w.cpp index 09cd26e47..1074d3938 100644 --- a/source/games/duke/src/player_w.cpp +++ b/source/games/duke/src/player_w.cpp @@ -117,9 +117,9 @@ void DoSpawn(player_struct *p, int snum) if((aplWeaponFlags(p->curr_weapon, snum) & WEAPON_FLAG_SPAWNTYPE2 ) ) { // like shotgun shells - j->add_int_ang(1024); + j->spr.angle += DAngle180; ssp(j,CLIPMASK0); - j->add_int_ang(1024); + j->spr.angle += DAngle180; // p->kickback_pic++; } else if((aplWeaponFlags(p->curr_weapon, snum) & WEAPON_FLAG_SPAWNTYPE3 ) ) diff --git a/source/games/duke/src/sectors.cpp b/source/games/duke/src/sectors.cpp index c23f1f4e9..d3891205e 100644 --- a/source/games/duke/src/sectors.cpp +++ b/source/games/duke/src/sectors.cpp @@ -927,7 +927,7 @@ static void handle_st25(sectortype* sptr, DDukeActor* actor) if (act3->spr.lotag == 15) { act3->sector()->lotag ^= 0x8000; // Toggle the open or close - act3->add_int_ang(1024); + act3->spr.angle += DAngle180; if (act3->temp_data[4]) callsound(act3->sector(), act3); callsound(act3->sector(), act3); if (act3->sector()->lotag & 0x8000) act3->temp_data[4] = 1; diff --git a/source/games/exhumed/src/anims.cpp b/source/games/exhumed/src/anims.cpp index 83fc298b6..0b917f736 100644 --- a/source/games/exhumed/src/anims.cpp +++ b/source/games/exhumed/src/anims.cpp @@ -83,7 +83,7 @@ DExhumedActor* BuildAnim(DExhumedActor* pActor, int val, int val2, const DVector pActor->spr.xrepeat = nRepeat; pActor->spr.yrepeat = nRepeat; pActor->spr.picnum = 1; - pActor->set_int_ang(0); + pActor->spr.angle = nullAngle; pActor->spr.xoffset = 0; pActor->spr.yoffset = 0; pActor->vel.X = 0; diff --git a/source/games/exhumed/src/sound.cpp b/source/games/exhumed/src/sound.cpp index 4a064d0e2..eebde5516 100644 --- a/source/games/exhumed/src/sound.cpp +++ b/source/games/exhumed/src/sound.cpp @@ -678,7 +678,7 @@ void CheckAmbience(sectortype* sect) { if (sect == pSector2) { - amb = GetSoundPos(PlayerList[0].pActor->int_pos()); + amb = GetSoundPos(PlayerList[0].pActor->spr.pos); } else {