From 7cd42e740dbba1d1378771d90d15f0256171fded Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 15 Apr 2023 12:15:38 +0200 Subject: [PATCH] - fixed a few bad scaling values. --- source/games/duke/src/spawn_r.cpp | 6 +++--- source/games/exhumed/src/grenade.cpp | 2 +- source/games/exhumed/src/wasp.cpp | 2 +- source/games/sw/src/weapon.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp index 66faac66f3c..7af15f6b020 100644 --- a/source/games/duke/src/spawn_r.cpp +++ b/source/games/duke/src/spawn_r.cpp @@ -275,7 +275,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* } else { - act->spr.scale = DVector2(0.34375, 0.3125); + act->spr.scale = DVector2(0.3125, 0.3125); } act->setClipDistFromTile(); break; @@ -392,7 +392,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* break; case RTILE_CHEER: case RTILE_CHEERSTAYPUT: - act->spr.scale = DVector2(0.34375, 0.3125); + act->spr.scale = DVector2(0.3125, 0.3125); act->setClipDistFromTile(); break; case RTILE_MAKEOUT: @@ -626,7 +626,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* break; case RTILE_RPG2SPRITE: if (!isRRRA()) goto default_case; - act->spr.scale = DVector2(0.34375, 0.3125); + act->spr.scale = DVector2(0.3125, 0.3125); break; case RTILE_RIPSAWSPRITE: act->spr.scale = DVector2(0.34375, 0.203125); diff --git a/source/games/exhumed/src/grenade.cpp b/source/games/exhumed/src/grenade.cpp index 2f3a8efcfe8..07ec9a85654 100644 --- a/source/games/exhumed/src/grenade.cpp +++ b/source/games/exhumed/src/grenade.cpp @@ -127,7 +127,7 @@ void BuildGrenade(int nPlayer) pActor->spr.pos = pPlayerActor->spr.pos.plusZ(-15); pActor->spr.shade = -64; - pActor->spr.scale = DVector2(0.34375, 0.3125); + pActor->spr.scale = DVector2(0.3125, 0.3125); pActor->spr.cstat = CSTAT_SPRITE_INVISIBLE; pActor->spr.picnum = 1; pActor->spr.pal = 0; diff --git a/source/games/exhumed/src/wasp.cpp b/source/games/exhumed/src/wasp.cpp index b4523436927..1b0c929c20e 100644 --- a/source/games/exhumed/src/wasp.cpp +++ b/source/games/exhumed/src/wasp.cpp @@ -61,7 +61,7 @@ DExhumedActor* BuildWasp(DExhumedActor* pActor, const DVector3& pos, sectortype* if (bEggWasp) { - pActor->spr.scale = DVector2(0.34375, 0.3125); + pActor->spr.scale = DVector2(0.3125, 0.3125); } else { diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp index 5a0c4042f05..0217fe5de21 100644 --- a/source/games/sw/src/weapon.cpp +++ b/source/games/sw/src/weapon.cpp @@ -9641,7 +9641,7 @@ int DoMicro(DSWActor* actor) SetOwner(GetOwner(actor), actorNew); actorNew->spr.shade = -40; - actorNew->spr.scale = DVector2(0.34375, 0.3125); + actorNew->spr.scale = DVector2(0.3125, 0.3125); actorNew->opos = actor->opos; actorNew->vel.Z = -actor->vel.Z; actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER); @@ -16218,7 +16218,7 @@ int SpawnSwordSparks(PLAYER* pp, sectortype* hit_sect, walltype* hit_wall, const auto actorNew = SpawnActor(STAT_MISSILE, UZI_SMOKE, s_UziSmoke, hit_sect, hitpos, hit_ang, 0); actorNew->spr.shade = -40; - actorNew->spr.scale = DVector2(0.34375, 0.3125); + actorNew->spr.scale = DVector2(0.3125, 0.3125); SetOwner(pp->actor, actorNew); actorNew->spr.cstat |= (CSTAT_SPRITE_TRANSLUCENT | CSTAT_SPRITE_YCENTER); actorNew->spr.hitag = LUMINOUS; //Always full brightness @@ -16233,7 +16233,7 @@ int SpawnSwordSparks(PLAYER* pp, sectortype* hit_sect, walltype* hit_wall, const actorNew = SpawnActor(STAT_MISSILE, UZI_SPARK, s_UziSpark, hit_sect, hitpos, hit_ang, 0); actorNew->spr.shade = -40; - actorNew->spr.scale = DVector2(0.34375, 0.3125); + actorNew->spr.scale = DVector2(0.3125, 0.3125); SetOwner(pp->actor, actorNew); actorNew->user.spal = actorNew->spr.pal = PALETTE_DEFAULT; actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER); @@ -17001,7 +17001,7 @@ int InitEnemyFireball(DSWActor* actor) DVector3(actor->spr.pos, nz), actor->spr.Angles.Yaw, GORO_FIREBALL_VELOCITY); actorNew->spr.hitag = LUMINOUS; //Always full brightness - actorNew->spr.scale = DVector2(0.34375, 0.3125); + actorNew->spr.scale = DVector2(0.3125, 0.3125); actorNew->spr.shade = -40; SetOwner(actor, actorNew);