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

lordhoto lordhoto at gmail.com
Wed Apr 13 18:56:09 CEST 2011


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:
f864fef8e9 TSAGE: Fix compilation on Mac OS X PPC.


Commit: f864fef8e9fb95199424996fbf4a43d1d042560d
    https://github.com/scummvm/scummvm/commit/f864fef8e9fb95199424996fbf4a43d1d042560d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-13T09:54:21-07:00

Commit Message:
TSAGE: Fix compilation on Mac OS X PPC.

Mac OS X PPC's standard C(++) library does not feature any sqrtf function,
since the parameter is double anyway I changed it to use sqrt for now.

We might want to consider adding some global macros for that on such
platforms. Another instance where the same issues caused problems in the past
is the MT-32 emulator. See audio/softsynth/mt32/synth.cpp lines 30 to 43 for
reference.

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 1fa037e..bbeda5b 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -925,7 +925,7 @@ int PlayerMover::findDistance(const Common::Point &pt1, const Common::Point &pt2
 	double yy = diff * 8.0 / 7.0;
 	yy *= yy;
 
-	return (int)sqrtf(xx + yy);
+	return (int)sqrt(xx + yy);
 }
 
 bool PlayerMover::sub_F8E5(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3,






More information about the Scummvm-git-logs mailing list