From 53c3a6fc9b84f5936a98ad3aa0ae16d32cb0790b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 7 Oct 2020 16:02:49 +0200 Subject: [PATCH] - silenced some warnings. --- source/common/2d/v_2ddrawer.cpp | 40 ++++++++++++++--------------- source/common/2d/v_draw.cpp | 2 -- source/common/audio/music/music.cpp | 2 +- source/common/engine/sc_man.cpp | 8 +++--- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/source/common/2d/v_2ddrawer.cpp b/source/common/2d/v_2ddrawer.cpp index 5aaf79e63..b79da9e73 100644 --- a/source/common/2d/v_2ddrawer.cpp +++ b/source/common/2d/v_2ddrawer.cpp @@ -461,10 +461,10 @@ void F2DDrawer::AddTexture(FGameTexture* img, DrawParms& parms) if (x < (double)parms.lclip || y < (double)parms.uclip || x + w >(double)parms.rclip || y + h >(double)parms.dclip) { - dg.mScissor[0] = parms.lclip + offset.X; - dg.mScissor[1] = parms.uclip + offset.Y; - dg.mScissor[2] = parms.rclip + offset.X; - dg.mScissor[3] = parms.dclip + offset.Y; + dg.mScissor[0] = parms.lclip + int(offset.X); + dg.mScissor[1] = parms.uclip + int(offset.Y); + dg.mScissor[2] = parms.rclip + int(offset.X); + dg.mScissor[3] = parms.dclip + int(offset.Y); dg.mFlags |= DTF_Scissor; } else @@ -502,10 +502,10 @@ void F2DDrawer::AddTexture(FGameTexture* img, DrawParms& parms) double x4 = parms.x + xscale * (xd2 * cosang + yd2 * sinang); double y4 = parms.y - yscale * (xd2 * sinang - yd2 * cosang); - dg.mScissor[0] = parms.lclip + offset.X; - dg.mScissor[1] = parms.uclip + offset.Y; - dg.mScissor[2] = parms.rclip + offset.X; - dg.mScissor[3] = parms.dclip + offset.Y; + dg.mScissor[0] = parms.lclip + int(offset.X); + dg.mScissor[1] = parms.uclip + int(offset.Y); + dg.mScissor[2] = parms.rclip + int(offset.X); + dg.mScissor[3] = parms.dclip + int(offset.Y); dg.mFlags |= DTF_Scissor; dg.mVertCount = 4; @@ -571,10 +571,10 @@ void F2DDrawer::AddShape(FGameTexture* img, DShape2D* shape, DrawParms& parms) } if (minx < (double)parms.lclip || miny < (double)parms.uclip || maxx >(double)parms.rclip || maxy >(double)parms.dclip) { - dg.mScissor[0] = parms.lclip + offset.X; - dg.mScissor[1] = parms.uclip + offset.Y; - dg.mScissor[2] = parms.rclip + offset.X; - dg.mScissor[3] = parms.dclip + offset.Y; + dg.mScissor[0] = parms.lclip + int(offset.X); + dg.mScissor[1] = parms.uclip + int(offset.Y); + dg.mScissor[2] = parms.rclip + int(offset.X); + dg.mScissor[3] = parms.dclip + int(offset.Y); dg.mFlags |= DTF_Scissor; } else @@ -694,10 +694,10 @@ void F2DDrawer::AddPoly(FGameTexture* img, FVector4* vt, size_t vtcount, unsigne dg.mType = DrawTypeTriangles; if (clipx1 > 0 || clipy1 > 0 || clipx2 < GetWidth() - 1 || clipy2 < GetHeight() - 1) { - dg.mScissor[0] = clipx1 + offset.X; - dg.mScissor[1] = clipy1 + offset.Y; - dg.mScissor[2] = clipx2 + 1 + offset.X; - dg.mScissor[3] = clipy2 + 1 + offset.Y; + dg.mScissor[0] = clipx1 + int(offset.X); + dg.mScissor[1] = clipy1 + int(offset.Y); + dg.mScissor[2] = clipx2 + 1 + int(offset.X); + dg.mScissor[3] = clipy2 + 1 + int(offset.Y); dg.mFlags |= DTF_Scissor; } @@ -911,10 +911,10 @@ void F2DDrawer::AddLine(double x1, double y1, double x2, double y2, int clipx1, if (clipx1 > 0 || clipy1 > 0 || clipx2 < GetWidth()- 1 || clipy2 < GetHeight() - 1) { - dg.mScissor[0] = clipx1 + offset.X; - dg.mScissor[1] = clipy1 + offset.Y; - dg.mScissor[2] = clipx2 + 1 + offset.X; - dg.mScissor[3] = clipy2 + 1 + offset.Y; + dg.mScissor[0] = clipx1 + int(offset.X); + dg.mScissor[1] = clipy1 + int(offset.Y); + dg.mScissor[2] = clipx2 + 1 + int(offset.X); + dg.mScissor[3] = clipy2 + 1 + int(offset.Y); dg.mFlags |= DTF_Scissor; } diff --git a/source/common/2d/v_draw.cpp b/source/common/2d/v_draw.cpp index 86a85c55c..c7dcd83d4 100644 --- a/source/common/2d/v_draw.cpp +++ b/source/common/2d/v_draw.cpp @@ -417,8 +417,6 @@ DEFINE_ACTION_FUNCTION(_Screen, GetFullscreenRect) PARAM_FLOAT(virth); PARAM_INT(fsmode); - if (!twod->HasBegun2D()) ThrowAbortException(X_OTHER, "Attempt to draw to screen outside a draw function"); - DrawParms parms; DoubleRect rect; parms.viewport.width = twod->GetWidth(); diff --git a/source/common/audio/music/music.cpp b/source/common/audio/music/music.cpp index 198b9975f..c10474d90 100644 --- a/source/common/audio/music/music.cpp +++ b/source/common/audio/music/music.cpp @@ -99,7 +99,7 @@ SoundStream *S_CreateCustomStream(size_t size, int samplerate, int numchannels, { int flags = 0; if (numchannels < 2) flags |= SoundStream::Mono; - auto stream = GSnd->CreateStream(cb, size, flags, samplerate, userdata); + auto stream = GSnd->CreateStream(cb, int(size), flags, samplerate, userdata); if (stream) stream->Play(true, 1); return stream; } diff --git a/source/common/engine/sc_man.cpp b/source/common/engine/sc_man.cpp index 6cf0044c3..e3225d396 100644 --- a/source/common/engine/sc_man.cpp +++ b/source/common/engine/sc_man.cpp @@ -1044,8 +1044,8 @@ bool FScanner::ScanValue(bool allowfloat, bool evaluate) auto d = constants.CheckKey(String); if (!d) return false; if (!allowfloat && int64_t(*d) != *d) return false; - BigNumber = *d; - Number = *d; + BigNumber = int64_t(*d); + Number = int(*d); Float = *d; } if (neg) @@ -1231,8 +1231,8 @@ void FScanner::AddSymbol(const char *name, int64_t value) { Symbol sym; sym.tokenType = TK_IntConst; - sym.Number = value; - sym.Float = value; + sym.Number = int(value); + sym.Float = double(value); symbols.Insert(name, sym); }