diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/gfx/animationtemplate.cpp | 2 | ||||
| -rwxr-xr-x | engines/sword25/gfx/image/art.cpp | 4 | ||||
| -rwxr-xr-x | engines/sword25/gfx/image/art_svp_render_aa.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 355a1a14cc..d0901ec4b4 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -78,7 +78,7 @@ bool MoviePlayer::LoadMovie(const Common::String &filename, uint z) { float screenToVideoHeight = (float)pGfx->GetDisplayHeight() / (float)_outputBitmap->getHeight(); float scaleFactor = MIN(screenToVideoWidth, screenToVideoHeight); - if (abs(scaleFactor - 1.0f) < FLT_EPSILON) + if (abs((int)(scaleFactor - 1.0f)) < FLT_EPSILON) scaleFactor = 1.0f; _outputBitmap->setScaleFactor(scaleFactor); diff --git a/engines/sword25/gfx/animationtemplate.cpp b/engines/sword25/gfx/animationtemplate.cpp index 9770dd8cc0..c267f715be 100644 --- a/engines/sword25/gfx/animationtemplate.cpp +++ b/engines/sword25/gfx/animationtemplate.cpp @@ -107,7 +107,7 @@ AnimationTemplate::AnimationTemplate(const Common::String &SourceAnimation) { // ----------------------------------------------------------------------------- -AnimationTemplate::AnimationTemplate(const AnimationTemplate &Other) { +AnimationTemplate::AnimationTemplate(const AnimationTemplate &Other) : AnimationDescription(){ // Objekt registrieren. AnimationTemplateRegistry::GetInstance().RegisterObject(this); diff --git a/engines/sword25/gfx/image/art.cpp b/engines/sword25/gfx/image/art.cpp index 9471153a78..e88d6e55c4 100755 --- a/engines/sword25/gfx/image/art.cpp +++ b/engines/sword25/gfx/image/art.cpp @@ -90,8 +90,8 @@ art_svp_free(ArtSVP *svp) { **/ int art_svp_seg_compare(const void *s1, const void *s2) { - const ArtSVPSeg *seg1 = (ArtSVPSeg *)s1; - const ArtSVPSeg *seg2 = (ArtSVPSeg *)s2; + const ArtSVPSeg *seg1 = (const ArtSVPSeg *)s1; + const ArtSVPSeg *seg2 = (const ArtSVPSeg *)s2; if (seg1->points[0].y - EPSILON > seg2->points[0].y) return 1; else if (seg1->points[0].y + EPSILON < seg2->points[0].y) return -1; diff --git a/engines/sword25/gfx/image/art_svp_render_aa.cpp b/engines/sword25/gfx/image/art_svp_render_aa.cpp index d0342c28d7..616977fb5e 100755 --- a/engines/sword25/gfx/image/art_svp_render_aa.cpp +++ b/engines/sword25/gfx/image/art_svp_render_aa.cpp @@ -259,13 +259,13 @@ art_svp_render_aa_iter_step(ArtSVPRenderAAIter *iter, int *p_start, x_min = x_bot; x_max = x_top; } - ix_min = floor(x_min); - ix_max = floor(x_max); + ix_min = (int)floor(x_min); + ix_max = (int)floor(x_max); if (ix_min >= x1) { /* skip; it starts to the right of the render region */ } else if (ix_max < x0) /* it ends to the left of the render region */ - start += delta; + start += (int)delta; else if (ix_min == ix_max) { /* case 1, antialias a single pixel */ xdelta = (ix_min + 1 - (x_min + x_max) * 0.5) * delta; |