diff options
| author | Filippos Karapetis | 2019-05-27 04:24:17 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-05-27 14:53:38 +0300 |
| commit | ea39214f7a252ad60d686a7dac44a50dc2cbad1d (patch) | |
| tree | d247e916ab46b6009e395c2f255ab419793bf90d | |
| parent | 5724a1f3852676903c2aa8474c44db655f84813b (diff) | |
| download | scummvm-rg350-ea39214f7a252ad60d686a7dac44a50dc2cbad1d.tar.gz scummvm-rg350-ea39214f7a252ad60d686a7dac44a50dc2cbad1d.tar.bz2 scummvm-rg350-ea39214f7a252ad60d686a7dac44a50dc2cbad1d.zip | |
ILLUSIONS: Fix MSVC warnings
- Fix warnings about conversion between float and double
- Initialize potentially uninitialized variables
| -rw-r--r-- | engines/illusions/bbdou/bbdou_bubble.cpp | 6 | ||||
| -rw-r--r-- | engines/illusions/bbdou/bbdou_inventory.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/illusions/bbdou/bbdou_bubble.cpp b/engines/illusions/bbdou/bbdou_bubble.cpp index fd2585f653..b2370f0004 100644 --- a/engines/illusions/bbdou/bbdou_bubble.cpp +++ b/engines/illusions/bbdou/bbdou_bubble.cpp @@ -241,16 +241,16 @@ void BbdouBubble::calcBubbleTrail(Common::Point &sourcePt, Common::Point &destPt if (!swapY) { if (destPt.y < sourcePt.y) { - currentAngle = M_PI * 0.5; + currentAngle = (float)M_PI * 0.5F; } else { - currentAngle = M_PI * 1.5; + currentAngle = (float)M_PI * 1.5F; partAngle = -partAngle; } if (destPt.x < sourcePt.x) partAngle = -partAngle; } else { if (destPt.x <= sourcePt.x) { - currentAngle = M_PI; + currentAngle = (float)M_PI; } else { currentAngle = 0.0; partAngle = -partAngle; diff --git a/engines/illusions/bbdou/bbdou_inventory.cpp b/engines/illusions/bbdou/bbdou_inventory.cpp index 88184b9807..b491c7701c 100644 --- a/engines/illusions/bbdou/bbdou_inventory.cpp +++ b/engines/illusions/bbdou/bbdou_inventory.cpp @@ -306,6 +306,7 @@ void BbdouInventory::cause0x1B0001(TriggerFunction *triggerFunction, uint32 call foundSceneId = _activeInventorySceneId; foundVerbId = triggerFunction->_verbId; + foundObjectId = 0; foundObjectId2 = 0; if (triggerFunction->_verbId == 0x1B0008) { |