thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ILLUSIONS: Fix MSVC warnings

Browse source 
- Fix warnings about conversion between float and double
- Initialize potentially uninitialized variables
This commit is contained in:
Filippos Karapetis 2019-05-27 04:24:17 +03:00
parent 5724a1f385
commit ea39214f7a
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/illusions/bbdou/bbdou_bubble.cpp
View file

@ -241,16 +241,16 @@ void BbdouBubble::calcBubbleTrail(Common::Point &sourcePt, Common::Point &destPt
if (!swapY) { if (!swapY) {
if (destPt.y < sourcePt.y) { if (destPt.y < sourcePt.y) {
currentAngle = M_PI * 0.5; currentAngle = (float)M_PI * 0.5F;
} else { } else {
currentAngle = M_PI * 1.5; currentAngle = (float)M_PI * 1.5F;
partAngle = -partAngle; partAngle = -partAngle;
} }
if (destPt.x < sourcePt.x) if (destPt.x < sourcePt.x)
partAngle = -partAngle; partAngle = -partAngle;
} else { } else {
if (destPt.x <= sourcePt.x) { if (destPt.x <= sourcePt.x) {
currentAngle = M_PI; currentAngle = (float)M_PI;
} else { } else {
currentAngle = 0.0; currentAngle = 0.0;
partAngle = -partAngle; partAngle = -partAngle;

1
engines/illusions/bbdou/bbdou_inventory.cpp
View file

@ -306,6 +306,7 @@ void BbdouInventory::cause0x1B0001(TriggerFunction *triggerFunction, uint32 call
foundSceneId = _activeInventorySceneId; foundSceneId = _activeInventorySceneId;
foundVerbId = triggerFunction->_verbId; foundVerbId = triggerFunction->_verbId;
foundObjectId = 0;
foundObjectId2 = 0; foundObjectId2 = 0;
if (triggerFunction->_verbId == 0x1B0008) { if (triggerFunction->_verbId == 0x1B0008) {