OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed several scale related floating point conversion warnings.

Browse source
This commit is contained in:
Christoph Oelckers 2022-06-15 22:15:36 +02:00
commit 355219d614
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/r_data/sprites.cpp
View file

@ -651,7 +651,7 @@ void R_InitSkins (void)
}
else if (0 == stricmp (key, "scale"))
{
Skins[i].Scale.X = clamp(atof (sc.String), 1./65536, 256.);
Skins[i].Scale.X = clamp((float)atof (sc.String), 1.f/65536, 256.f);
Skins[i].Scale.Y = Skins[i].Scale.X;
}
else if (0 == stricmp (key, "game"))
@ -1000,7 +1000,7 @@ void R_InitSprites ()
auto type = GetDefaultByType(PlayerClasses[0].Type);
Skins[i].range0start = type->IntVar(NAME_ColorRangeStart);
Skins[i].range0end = type->IntVar(NAME_ColorRangeEnd);
Skins[i].Scale = DVector2(type->Scale.X, type->Scale.Y);
Skins[i].Scale = type->Scale;
}
R_InitSpriteDefs ();
@ -1019,7 +1019,7 @@ void R_InitSprites ()
Skins[i].Face = face == NAME_None? "STF" : face.GetChars();
Skins[i].range0start = basetype->IntVar(NAME_ColorRangeStart);
Skins[i].range0end = basetype->IntVar(NAME_ColorRangeEnd);
Skins[i].Scale = DVector2(basetype->Scale.X, basetype->Scale.Y);
Skins[i].Scale = basetype->Scale;
Skins[i].sprite = basetype->SpawnState->sprite;
Skins[i].namespc = ns_global;

2
src/r_data/sprites.h
View file

@ -55,7 +55,7 @@ public:
uint8_t range0start = 0;
uint8_t range0end = 0;
bool othergame = 0; // [GRB]
DVector2 Scale = { 1, 1 };
FVector2 Scale = { 1, 1 };
int sprite = 0;
int crouchsprite = 0;
int namespc = 0; // namespace for this skin