diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index 621f21366..0db0cb0ef 100644 --- a/src/intermission/intermission.cpp +++ b/src/intermission/intermission.cpp @@ -670,7 +670,7 @@ void DIntermissionScreenCast::Drawer () // draw the current frame in the middle of the screen if (caststate != NULL) { - FVector2 castscale = mDefaults->Scale; + DVector2 castscale = mDefaults->Scale; int castsprite = caststate->sprite; diff --git a/src/playsim/actor.h b/src/playsim/actor.h index ced98b3a7..276b83736 100644 --- a/src/playsim/actor.h +++ b/src/playsim/actor.h @@ -1029,7 +1029,7 @@ public: DRotator Angles; DRotator ViewAngles; // Angle offsets for cameras TObjPtr ViewPos; // Position offsets for cameras - FVector2 Scale; // Scaling values; 1 is normal size + DVector2 Scale; // Scaling values; 1 is normal size double Alpha; // Since P_CheckSight makes an alpha check this can't be a float. It has to be a double. int sprite; // used to find patch_t and flip value diff --git a/src/playsim/p_user.cpp b/src/playsim/p_user.cpp index e6d0719f3..b2c8a975a 100644 --- a/src/playsim/p_user.cpp +++ b/src/playsim/p_user.cpp @@ -970,7 +970,7 @@ void P_CheckPlayerSprite(AActor *actor, int &spritenum, DVector2 &scale) if (player->userinfo.GetSkin() != 0 && !(actor->flags4 & MF4_NOSKIN)) { // Convert from default scale to skin scale. - FVector2 defscale = actor->GetDefault()->Scale; + DVector2 defscale = actor->GetDefault()->Scale; scale.X *= Skins[player->userinfo.GetSkin()].Scale.X / double(defscale.X); scale.Y *= Skins[player->userinfo.GetSkin()].Scale.Y / double(defscale.Y); } diff --git a/src/r_data/sprites.h b/src/r_data/sprites.h index cb394e943..37c608986 100644 --- a/src/r_data/sprites.h +++ b/src/r_data/sprites.h @@ -55,7 +55,7 @@ public: uint8_t range0start = 0; uint8_t range0end = 0; bool othergame = 0; // [GRB] - FVector2 Scale = { 1, 1 }; + DVector2 Scale = { 1, 1 }; int sprite = 0; int crouchsprite = 0; int namespc = 0; // namespace for this skin diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs index d4772960e..e72bef838 100644 --- a/wadsrc/static/zscript/actors/player/player.zs +++ b/wadsrc/static/zscript/actors/player/player.zs @@ -2901,7 +2901,7 @@ struct PlayerSkin native native readonly uint8 range0start; native readonly uint8 range0end; native readonly bool othergame; - native readonly FVector2 Scale; + native readonly Vector2 Scale; native readonly int sprite; native readonly int crouchsprite; native readonly int namespc;