zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 01:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed the remaining warnings.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-12 17:57:36 +02:00
parent cf22a70d82
commit cb2bc7967a
13 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/core/console/c_notifybuffer.cpp
View file

@ -192,8 +192,8 @@ void FNotifyBuffer::Draw()
double nfscale = (generic_ui? 0.7 : NotifyFontScale);
double scale = 1 / ( * con_notifyscale);
int line = Top + font->GetDisplacement() / nfscale;
int lineadv = font->GetHeight () / nfscale;
double line = Top + font->GetDisplacement() / nfscale;
double lineadv = font->GetHeight () / nfscale;
for (unsigned i = 0; i < Text.Size(); ++ i)
{

2
source/core/rendering/scene/hw_portal.cpp
View file

@ -481,7 +481,7 @@ int HWLinePortal::ClipSeg(walltype *seg, const DVector3 &viewpos)
int HWLinePortal::ClipSector(sectortype *sub)
{
// this seg is completely behind the mirror
for (unsigned int i = 0; i<sub->wallnum; i++)
for (int i = 0; i<sub->wallnum; i++)
{
if (PointOnLineSide(WallStart(&wall[sub->wallptr]), line) == 0) return PClip_Inside;
}

4
source/core/textures/buildtiles.cpp
View file

@ -274,7 +274,7 @@ void BuildTiles::MakeCanvas(int tilenum, int width, int height)
{
auto canvas = ValidateCustomTile(tilenum, ReplacementType::Canvas);
canvas->SetSize(width*4, height*4);
canvas->SetDisplaySize(width, height);
canvas->SetDisplaySize((float)width, (float)height);
canvas->GetTexture()->SetSize(width * 4, height * 4);
static_cast<FCanvasTexture*>(canvas->GetTexture())->aspectRatio = (float)width / height;
}
@ -291,7 +291,7 @@ void BuildTiles::MakeCanvas(int tilenum, int width, int height)
int BuildTiles::LoadArtFile(const char *fn, const char *mapname, int firsttile)
{
auto old = FindFile(fn);
unsigned old = FindFile(fn);
if (old >= ArtFiles.Size()) // Do not process if already loaded.
{
FileReader fr = fileSystem.OpenFileReader(fn);

2
source/core/textures/hightile.cpp
View file

@ -440,7 +440,7 @@ bool PreBindTexture(FRenderState* state, FGameTexture*& tex, EUpscaleFlags& flag
flags |= (((pick.tintFlags & TINTF_BLENDMASK) >> 6) + 1) & TextureManipulation::BlendMask;
}
}
addcol.W = flags;
addcol.W = (float)flags;
if ((pick.translation & 0x80000000) && hw_shadeinterpolate) addcol.W += 16384; // hijack a free bit in here.
state->SetTextureColors(&modcol.X, &addcol.X, &blendcol.X);
}