From c066f1754ca235717f630ae628539f79aa7f974c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 13 Sep 2022 19:52:59 +0200 Subject: [PATCH] - use randomAngle --- source/games/duke/src/sectors_d.cpp | 18 +++++++++--------- source/games/duke/src/sectors_r.cpp | 2 +- source/games/duke/src/spawn_d.cpp | 6 +++--- source/games/duke/src/spawn_r.cpp | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp index 15db6b891..5dc86a9ad 100644 --- a/source/games/duke/src/sectors_d.cpp +++ b/source/games/duke/src/sectors_d.cpp @@ -1168,7 +1168,7 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj) lotsofglass(targ, nullptr, 40); S_PlayActorSound(GLASS_BREAKING, targ); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); lotsofglass(targ, nullptr, 8); deletesprite(targ); break; @@ -1294,21 +1294,21 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj) { targ->spr.extra -= proj->spr.extra; if (targ->spr.extra > 0) break; - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT1); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT2); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT3); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT4); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT1); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT2); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT3); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); fi.shoot(targ, BLOODSPLAT4); fi.guts(targ, JIBS1, 1, myconnectindex); fi.guts(targ, JIBS2, 2, myconnectindex); diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp index 0aece580f..ea9fe949e 100644 --- a/source/games/duke/src/sectors_r.cpp +++ b/source/games/duke/src/sectors_r.cpp @@ -2204,7 +2204,7 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj) lotsofglass(targ, nullptr, 40); S_PlayActorSound(GLASS_BREAKING, targ); - targ->set_int_ang(krand() & 2047); + targ->spr.angle = randomAngle(); lotsofglass(targ, nullptr, 8); deletesprite(targ); break; diff --git a/source/games/duke/src/spawn_d.cpp b/source/games/duke/src/spawn_d.cpp index 6e6484ca3..825668f5a 100644 --- a/source/games/duke/src/spawn_d.cpp +++ b/source/games/duke/src/spawn_d.cpp @@ -559,7 +559,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray* act->temp_data[0] = krand() & 2047; act->spr.cstat = randomFlip(); act->spr.xrepeat = act->spr.yrepeat = 8; - act->set_int_ang(krand() & 2047); + act->spr.angle = randomAngle(); } ChangeActorStat(act, STAT_MISC); break; @@ -700,7 +700,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray* case TRASH: if (act->spr.picnum != WATERDRIP) - act->set_int_ang(krand() & 2047); + act->spr.angle = randomAngle(); [[fallthrough]]; case WATERDRIPSPLASH: @@ -875,7 +875,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray* if (act->spr.picnum == RAT) { - act->set_int_ang(krand() & 2047); + act->spr.angle = randomAngle(); act->spr.xrepeat = act->spr.yrepeat = 48; act->spr.cstat = 0; } diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp index 1aa2e609c..c82c35701 100644 --- a/source/games/duke/src/spawn_r.cpp +++ b/source/games/duke/src/spawn_r.cpp @@ -583,7 +583,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* act->temp_data[0] = krand() & 2047; act->spr.cstat = randomFlip(); act->spr.xrepeat = act->spr.yrepeat = 8; - act->set_int_ang(krand() & 2047); + act->spr.angle = randomAngle(); } ChangeActorStat(act, STAT_MISC); break; @@ -703,7 +703,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* break; case TRASH: - if (act->spr.picnum != WATERDRIP) act->set_int_ang(krand() & 2047); + if (act->spr.picnum != WATERDRIP) act->spr.angle = randomAngle(); act->spr.xrepeat = 24; act->spr.yrepeat = 24; @@ -1034,7 +1034,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* if (act->spr.picnum == RAT) { - act->set_int_ang(krand() & 2047); + act->spr.angle = randomAngle(); act->spr.xrepeat = act->spr.yrepeat = 48; act->spr.cstat = 0; }