FULLPIPE: Fix compilation with MSVC and add a FIXME

scummvm · Sep 11, 2013 · e184573 · e184573
1 parent 794811c
commit e184573
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;
 					}