diff options
| author | Einar Johan Trøan Sømåen | 2012-06-26 14:47:15 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-26 14:47:15 +0200 |
| commit | 79cb18ff38b3c79db10ee09fc21cc678fc75b74a (patch) | |
| tree | a9b01405c192e1fa0e5b1936d83cf07b0eda4bc9 /engines/wintermute | |
| parent | 3f9ff1791a5034bf74d460e38282c9bcfe54b6db (diff) | |
| download | scummvm-rg350-79cb18ff38b3c79db10ee09fc21cc678fc75b74a.tar.gz scummvm-rg350-79cb18ff38b3c79db10ee09fc21cc678fc75b74a.tar.bz2 scummvm-rg350-79cb18ff38b3c79db10ee09fc21cc678fc75b74a.zip | |
WINTERMUTE: Silence another few warnings.
Diffstat (limited to 'engines/wintermute')
| -rw-r--r-- | engines/wintermute/Base/BSubFrame.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/Base/PartParticle.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/dcgf.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp index f86d654980..2e1ddf2a12 100644 --- a/engines/wintermute/Base/BSubFrame.cpp +++ b/engines/wintermute/Base/BSubFrame.cpp @@ -240,10 +240,10 @@ bool CBSubFrame::getBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float float RatioY = ScaleY / 100.0f;
CBPlatform::SetRect(Rect,
- X - _hotspotX * RatioX,
- Y - _hotspotY * RatioY,
- X - _hotspotX * RatioX + (_rect.right - _rect.left)*RatioX,
- Y - _hotspotY * RatioY + (_rect.bottom - _rect.top)*RatioY);
+ (int)(X - _hotspotX * RatioX),
+ (int)(Y - _hotspotY * RatioY),
+ (int)(X - _hotspotX * RatioX + (_rect.right - _rect.left)*RatioX),
+ (int)(Y - _hotspotY * RatioY + (_rect.bottom - _rect.top)*RatioY));
return true;
}
diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp index 85966eb510..b348521808 100644 --- a/engines/wintermute/Base/PartParticle.cpp +++ b/engines/wintermute/Base/PartParticle.cpp @@ -125,16 +125,16 @@ HRESULT CPartParticle::update(CPartEmitter *Emitter, uint32 CurrentTime, uint32 // particle hit the border
if (!_isDead && !CBPlatform::IsRectEmpty(&_border)) {
POINT p;
- p.x = _pos.x;
- p.y = _pos.y;
+ p.x = (int32)_pos.x;
+ p.y = (int32)_pos.y;
if (!CBPlatform::PtInRect(&_border, p)) fadeOut(CurrentTime, Emitter->_fadeOutTime);
}
if (_state != PARTICLE_NORMAL) return S_OK;
// update alpha
if (_lifeTime > 0) {
- int Age = CurrentTime - _creationTime;
- int AlphaDelta = _alpha2 - _alpha1;
+ int Age = (int)(CurrentTime - _creationTime);
+ int AlphaDelta = (int)(_alpha2 - _alpha1);
_currentAlpha = _alpha1 + ((float)AlphaDelta / (float)_lifeTime * (float)Age);
}
diff --git a/engines/wintermute/dcgf.h b/engines/wintermute/dcgf.h index 831a881a69..305ff0b5b7 100644 --- a/engines/wintermute/dcgf.h +++ b/engines/wintermute/dcgf.h @@ -42,8 +42,8 @@ // minimal saved game version we support
#define SAVEGAME_VER_MAJOR 1
-#define SAVEGAME_VER_MINOR 0
-#define SAVEGAME_VER_BUILD 0
+#define SAVEGAME_VER_MINOR 1
+#define SAVEGAME_VER_BUILD 1
//////////////////////////////////////////////////////////////////////////
#define COMPRESSED_FILE_MAGIC 0x504D435A // ZCMP
|