[Scummvm-cvs-logs] scummvm master -> e1845735689df7e66d27bd88a746b164fdadf661

bluegr bluegr at gmail.com
Wed Sep 11 16:58:30 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e184573568 FULLPIPE: Fix compilation with MSVC and add a FIXME


Commit: e1845735689df7e66d27bd88a746b164fdadf661
    https://github.com/scummvm/scummvm/commit/e1845735689df7e66d27bd88a746b164fdadf661
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-11T07:57:18-07:00

Commit Message:
FULLPIPE: Fix compilation with MSVC and add a FIXME

Changed paths:
    engines/fullpipe/fullpipe.h
    engines/fullpipe/motion.cpp
    engines/fullpipe/scene.cpp



diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 5d9bdcc..f688151 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 41265dc..514dde5 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 18d6a88..310db18 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;
 					}






More information about the Scummvm-git-logs mailing list