Skip to content

Commit

Permalink
- fixed a few bad scaling values.
Browse files Browse the repository at this point in the history
  • Loading branch information
coelckers committed Apr 15, 2023
1 parent d92d6a0 commit 7cd42e7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions source/games/duke/src/spawn_r.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
}
else
{
act->spr.scale = DVector2(0.34375, 0.3125);
act->spr.scale = DVector2(0.3125, 0.3125);
}
act->setClipDistFromTile();
break;
Expand Down Expand Up @@ -392,7 +392,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
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:
Expand Down Expand Up @@ -626,7 +626,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
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);
Expand Down
2 changes: 1 addition & 1 deletion source/games/exhumed/src/grenade.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion source/games/exhumed/src/wasp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions source/games/sw/src/weapon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7cd42e7

Please sign in to comment.