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

bluegr bluegr at gmail.com
Mon Oct 1 02:08:06 CEST 2012


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

Summary:
4ad86e0c11 PEGASUS: MarsTimerEvent is a struct
f2fa6a934d SCI: Fix compilation with MSVC (atan2() was ambiguous)


Commit: 4ad86e0c11f1b6b6a7a4b4b1a065017e6f656501
    https://github.com/scummvm/scummvm/commit/4ad86e0c11f1b6b6a7a4b4b1a065017e6f656501
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-30T17:05:50-07:00

Commit Message:
PEGASUS: MarsTimerEvent is a struct

Changed paths:
    engines/pegasus/neighborhood/mars/mars.h



diff --git a/engines/pegasus/neighborhood/mars/mars.h b/engines/pegasus/neighborhood/mars/mars.h
index 9ca53a8..0859522 100644
--- a/engines/pegasus/neighborhood/mars/mars.h
+++ b/engines/pegasus/neighborhood/mars/mars.h
@@ -64,7 +64,7 @@ enum ShuttleWeaponSelection {
 };
 
 class Mars : public Neighborhood {
-friend class MarsTimerEvent;
+friend struct MarsTimerEvent;
 public:
 	Mars(InputHandler *, PegasusEngine *);
 	virtual ~Mars();


Commit: f2fa6a934d838b4edb5386598d1415782e965d26
    https://github.com/scummvm/scummvm/commit/f2fa6a934d838b4edb5386598d1415782e965d26
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-30T17:06:59-07:00

Commit Message:
SCI: Fix compilation with MSVC (atan2() was ambiguous)

Changed paths:
    engines/sci/engine/kpathing.cpp



diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index ee65d59..4061795 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -1912,7 +1912,7 @@ static int intersectDir(const Vertex *v1, const Vertex *v2) {
 // Direction of edge in degrees from pos. x-axis, between -180 and 180
 static int edgeDir(const Vertex *v) {
 	Common::Point p = v->_next->v - v->v;
-	int deg = (int)Common::rad2deg(atan2(p.y, p.x));
+	int deg = (int)Common::rad2deg(atan2((double)p.y, (double)p.x));
 	if (deg < -180) deg += 360;
 	if (deg > 180) deg -= 360;
 	return deg;






More information about the Scummvm-git-logs mailing list