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

[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:
f65b31437b WAGE: Fix sorting of objects during move


Commit: f65b31437b81ab41a39142e626808083d0b96017
    https://github.com/scummvm/scummvm/commit/f65b31437b81ab41a39142e626808083d0b96017
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-11T10:49:47+02:00

Commit Message:
WAGE: Fix sorting of objects during move

Changed paths:
    engines/wage/script.cpp
    engines/wage/world.cpp



diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 294c08e..61336dc 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -1099,7 +1099,7 @@ struct Mapping {
 	{ "\?\?\?(0xf5)", OPCODE },
 	{ "\?\?\?(0xf6)", OPCODE },
 	{ "\?\?\?(0xf7)", OPCODE },
-	{ "\?\?\?(0xf8)", OPCODE }, // 0xa8
+	{ "\?\?\?(0xf8)", OPCODE }, // 0xf8
 	{ "\?\?\?(0xf9)", OPCODE },
 	{ "\?\?\?(0xfa)", OPCODE },
 	{ "\?\?\?(0xfb)", OPCODE },
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index ae7a0ea..7e7bc33 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -433,7 +433,7 @@ static bool objComparator(const Obj *o1, const Obj *o2) {
 	if (o1Immobile == o2Immobile) {
 		return o1->_index - o2->_index;
 	}
-	return o1Immobile;
+	return o1Immobile ? -1 : 1;
 }
 
 void World::move(Obj *obj, Scene *scene, bool skipSort) {