aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2013-09-11 17:57:18 +0300
committerFilippos Karapetis2013-09-11 17:57:18 +0300
commite1845735689df7e66d27bd88a746b164fdadf661 (patch)
tree201cfbf3e71e7a5d3af0f9654a1fedccb9331bee
parent794811c28093e229379e94f6c745dcfe8c5449d4 (diff)
downloadscummvm-rg350-e1845735689df7e66d27bd88a746b164fdadf661.tar.gz
scummvm-rg350-e1845735689df7e66d27bd88a746b164fdadf661.tar.bz2
scummvm-rg350-e1845735689df7e66d27bd88a746b164fdadf661.zip
FULLPIPE: Fix compilation with MSVC and add a FIXME
-rw-r--r--engines/fullpipe/fullpipe.h4
-rw-r--r--engines/fullpipe/motion.cpp2
-rw-r--r--engines/fullpipe/scene.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 5d9bdcc045..f688151267 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -50,12 +50,12 @@ class CGameVar;
class CInputController;
class CInventory2;
struct CursorInfo;
-class EntranceInfo;
+struct EntranceInfo;
class ExCommand;
class GameProject;
class GameObject;
class GlobalMessageQueueList;
-class MessageHandler;
+struct MessageHandler;
struct MovTable;
class NGIArchive;
class Scene;
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 41265dcd8a..514dde5185 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -204,7 +204,7 @@ void CReactParallel::createRegion() {
for (int i = 0; i < 4; i++)
_points[i] = new Common::Point;
- double at = atan2(_x1 - _x2, _y1 - _y2) + 1.570796;
+ double at = atan2((double)(_x1 - _x2), (double)(_y1 - _y2)) + 1.570796;
double sn = sin(at);
double cs = cos(at);
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 18d6a888b7..310db18f25 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -596,7 +596,7 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) {
v25++;
if (v25 >= _bigPictureArray2Count) {
- if (!((PictureObject *)_picObjList[0])->_flags & 0x20)
+ if (!((PictureObject *)_picObjList[0])->_flags & 0x20) // FIXME: looks like a typo
break;
v25 = 0;
}