[Scummvm-git-logs] scummvm master -> d3cf9ed9c0a39141fe5cb5364bbfc8dee7b3914b

[sev-]

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:
d3cf9ed9c0 FULLPIPE: More signed reads


Commit: d3cf9ed9c0a39141fe5cb5364bbfc8dee7b3914b
    https://github.com/scummvm/scummvm/commit/d3cf9ed9c0a39141fe5cb5364bbfc8dee7b3914b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-29T22:23:45+02:00

Commit Message:
FULLPIPE: More signed reads

Changed paths:
    engines/fullpipe/gfx.cpp
    engines/fullpipe/messages.cpp
    engines/fullpipe/motion.cpp
    engines/fullpipe/stateloader.cpp



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 164190d..eba5d44 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -494,8 +494,8 @@ bool Picture::load(MfcArchive &file) {
 	debugC(5, kDebugLoading, "Picture::load()");
 	MemoryObject::load(file);
 
-	_x = file.readUint32LE();
-	_y = file.readUint32LE();
+	_x = file.readSint32LE();
+	_y = file.readSint32LE();
 	_field_44 = file.readUint16LE();
 
 	assert(g_fp->_gameProjectVersion >= 2);
@@ -785,8 +785,8 @@ Bitmap::~Bitmap() {
 void Bitmap::load(Common::ReadStream *s) {
 	debugC(5, kDebugLoading, "Bitmap::load()");
 
-	_x = s->readUint32LE();
-	_y = s->readUint32LE();
+	_x = s->readSint32LE();
+	_y = s->readSint32LE();
 	_width = s->readUint32LE();
 	_height = s->readUint32LE();
 	s->readUint32LE(); // pixels
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 9085e92..981797c 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -61,8 +61,8 @@ bool ExCommand::load(MfcArchive &file) {
 
 	_parentId = file.readUint16LE();
 	_messageKind = file.readUint32LE();
-	_x = file.readUint32LE();
-	_y = file.readUint32LE();
+	_x = file.readSint32LE();
+	_y = file.readSint32LE();
 	_field_14 = file.readUint32LE();
 	_sceneClickX = file.readUint32LE();
 	_sceneClickY = file.readUint32LE();
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 74bb679..87ac98d 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2918,9 +2918,9 @@ bool MovGraphNode::load(MfcArchive &file) {
 	debugC(5, kDebugLoading, "MovGraphNode::load()");
 
 	_field_14 = file.readUint32LE();
-	_x = file.readUint32LE();
-	_y = file.readUint32LE();
-	_z = file.readUint32LE();
+	_x = file.readSint32LE();
+	_y = file.readSint32LE();
+	_z = file.readSint32LE();
 
 	return true;
 }
@@ -2937,12 +2937,12 @@ ReactParallel::ReactParallel() {
 bool ReactParallel::load(MfcArchive &file) {
 	debugC(5, kDebugLoading, "ReactParallel::load()");
 
-	_x1 = file.readUint32LE();
-	_y1 = file.readUint32LE();
-	_x2 = file.readUint32LE();
-	_y2 = file.readUint32LE();
-	_dx = file.readUint32LE();
-	_dy = file.readUint32LE();
+	_x1 = file.readSint32LE();
+	_y1 = file.readSint32LE();
+	_x2 = file.readSint32LE();
+	_y2 = file.readSint32LE();
+	_dx = file.readSint32LE();
+	_dy = file.readSint32LE();
 
 	createRegion();
 
@@ -2995,8 +2995,8 @@ ReactPolygonal::~ReactPolygonal() {
 bool ReactPolygonal::load(MfcArchive &file) {
 	debugC(5, kDebugLoading, "ReactPolygonal::load()");
 
-	_centerX = file.readUint32LE();
-	_centerY = file.readUint32LE();
+	_centerX = file.readSint32LE();
+	_centerY = file.readSint32LE();
 	_pointCount = file.readUint32LE();
 
 	if (_pointCount > 0) {
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index c95f6c6..02053aa 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -350,8 +350,8 @@ bool PicAniInfo::load(MfcArchive &file) {
 	field_8 = file.readUint32LE();
 	sceneId = file.readUint16LE();
 	field_E = file.readUint16LE();
-	ox = file.readUint32LE();
-	oy = file.readUint32LE();
+	ox = file.readSint32LE();
+	oy = file.readSint32LE();
 	priority = file.readUint32LE();
 	staticsId = file.readUint16LE();
 	movementId = file.readUint16LE();