[Scummvm-git-logs] scummvm master -> 416ab05eaa0bec3939629d5716803ab207eed8b1

[sev-]

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

Summary:
baa7e0f5f3 FULLPIPE: Do not void global engine pointer too early
6cad53e546 FULLPIPE: Added more debug output
416ab05eaa FULLPIPE: Use more portable double loading


Commit: baa7e0f5f3ea862ad1217d204f98c2fee1b69343
    https://github.com/scummvm/scummvm/commit/baa7e0f5f3ea862ad1217d204f98c2fee1b69343
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-10T19:50:48+01:00

Commit Message:
FULLPIPE: Do not void global engine pointer too early

Changed paths:
    engines/fullpipe/fullpipe.cpp


diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index b6bcbfc..409f886 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -185,7 +185,6 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 }
 
 FullpipeEngine::~FullpipeEngine() {
-	g_fp = nullptr;
 	delete g_vars;
 	g_vars = nullptr;
 }


Commit: 6cad53e5460066cff49fda1c7abd8a431607d478
    https://github.com/scummvm/scummvm/commit/6cad53e5460066cff49fda1c7abd8a431607d478
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-10T19:50:53+01:00

Commit Message:
FULLPIPE: Added more debug output

Changed paths:
    engines/fullpipe/gfx.cpp


diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 8407009..d06baaa 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -444,6 +444,8 @@ bool Picture::load(MfcArchive &file) {
 	_width = file.readUint32LE();
 	_height = file.readUint32LE();
 
+	debug(7, "Picture::load: x: %d y: %d, w: %d, h: %d", _x, _y, _width, _height);
+
 	_mflags |= 1;
 
 	_memoryObject2.reset(new MemoryObject2);


Commit: 416ab05eaa0bec3939629d5716803ab207eed8b1
    https://github.com/scummvm/scummvm/commit/416ab05eaa0bec3939629d5716803ab207eed8b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-10T19:50:53+01:00

Commit Message:
FULLPIPE: Use more portable double loading

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


diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index c667ac2..67acaed 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2871,8 +2871,8 @@ bool MovGraphLink::load(MfcArchive &file) {
 	debugC(8, kDebugLoading, "GraphNode2");
 	_graphDst = file.readClass<MovGraphNode>();
 
-	_length = file.readDouble();
-	_angle = file.readDouble();
+	_length = file.readDoubleLE();
+	_angle = file.readDoubleLE();
 
 	debugC(8, kDebugLoading, "length: %g, angle: %g", _length, _angle);
 
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 3b60e96..aba629d 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -246,22 +246,6 @@ int MfcArchive::readCount() {
 	return count;
 }
 
-double MfcArchive::readDouble() {
-	// FIXME: This is utterly cruel and unportable
-	// Some articles on the matter:
-	// http://randomascii.wordpress.com/2013/02/07/float-precision-revisited-nine-digit-float-portability/
-	// http://randomascii.wordpress.com/2012/01/11/tricks-with-the-floating-point-format/
-
-	union {
-		byte b[8];
-		double d;
-	} tmp;
-
-	read(&tmp.b, 8);
-
-	return tmp.d;
-}
-
 enum {
 	kNullObject,
 	kInteraction,
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 6ffafc5..a4fae83 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -56,7 +56,6 @@ public:
 	Common::String readPascalString(bool twoByte = false);
 	void writePascalString(const Common::String &str, bool twoByte = false);
 	int readCount();
-	double readDouble();
 	CObject *parseClass(bool *isCopyReturned);
 
 	/** ownership of returned object is passed to caller */