diff options
| author | Paul Gilbert | 2016-08-02 20:04:06 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-02 20:04:06 -0400 |
| commit | 3a466a29ea91f829c542f9537b3f578e72af31f3 (patch) | |
| tree | 0ae8ac2db0c1f4a6c190afde7e04a574044f1a65 /engines/titanic | |
| parent | 99b353b9fef51eccbf88b1bfa8a69381369dfd50 (diff) | |
| download | scummvm-rg350-3a466a29ea91f829c542f9537b3f578e72af31f3.tar.gz scummvm-rg350-3a466a29ea91f829c542f9537b3f578e72af31f3.tar.bz2 scummvm-rg350-3a466a29ea91f829c542f9537b3f578e72af31f3.zip | |
TITANIC: Fix compiler warnings
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/npcs/true_talk_npc.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_slider.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_sound.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/movie.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index faadc2d565..290922f660 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -222,13 +222,13 @@ void CTrueTalkNPC::startTalker(CViewItem *view) { gameManager->getTalkManager()->start4(this, view); } -void CTrueTalkNPC::performAction(bool startTalking, CViewItem *view_) { +void CTrueTalkNPC::performAction(bool startTalkingFlag, CViewItem *destView) { CPetControl *pet = getPetControl(); if (pet) pet->resetActiveNPC(); - if (startTalking) - startTalker(view_); + if (startTalkingFlag) + startTalker(destView); if (pet) pet->convResetNPC(); diff --git a/engines/titanic/pet_control/pet_slider.cpp b/engines/titanic/pet_control/pet_slider.cpp index 166ba30c74..eb07012f43 100644 --- a/engines/titanic/pet_control/pet_slider.cpp +++ b/engines/titanic/pet_control/pet_slider.cpp @@ -94,10 +94,10 @@ double CPetSlider::getOffsetPixels() const { void CPetSlider::setSliderOffset(double offset) { if (_orientation & ORIENTATION_HORIZONTAL) - _sliderOffset = offset * (_slidingRect.right - _slidingRect.left); + _sliderOffset = (int)(offset * (_slidingRect.right - _slidingRect.left)); if (_orientation & ORIENTATION_VERTICAL) - _sliderOffset = offset * (_slidingRect.bottom - _slidingRect.top); + _sliderOffset = (int)(offset * (_slidingRect.bottom - _slidingRect.top)); } void CPetSlider::setOffsetPixels(int offset) { diff --git a/engines/titanic/pet_control/pet_sound.cpp b/engines/titanic/pet_control/pet_sound.cpp index 4d2bf37831..7bfeb25722 100644 --- a/engines/titanic/pet_control/pet_sound.cpp +++ b/engines/titanic/pet_control/pet_sound.cpp @@ -146,7 +146,7 @@ bool CPetSound::MouseButtonDownMsg(const Point &pt) { CPetSlider *slider = sliders[idx]; bool isLeft = rectLeft.contains(pt); bool isRight = rectRight.contains(pt); - int offset; + double offset; if (isLeft) { slider->stepPosition(-1); diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index 2784bda4b0..8810cf0a6c 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -133,7 +133,7 @@ void OSMovie::playClip(const Point &drawPos, uint startFrame, uint endFrame) { drawPos.y + (heightLess ? CLIP_HEIGHT_REDUCED : CLIP_HEIGHT) ); - uint timePerFrame = 1000 / _aviSurface._frameRate; + uint timePerFrame = (uint)(1000.0 / _aviSurface._frameRate); for (; endFrame >= startFrame; ++startFrame) { // Set the frame |