aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-04-11 10:33:19 +0200
committerEugene Sandulenko2016-04-11 10:49:47 +0200
commitf65b31437b81ab41a39142e626808083d0b96017 (patch)
tree56a5a1b59818d52488dbeab00475c50749f813d3
parent7cde2a367015e9c8ea2e835a4c5ad0915595f885 (diff)
downloadscummvm-rg350-f65b31437b81ab41a39142e626808083d0b96017.tar.gz
scummvm-rg350-f65b31437b81ab41a39142e626808083d0b96017.tar.bz2
scummvm-rg350-f65b31437b81ab41a39142e626808083d0b96017.zip
WAGE: Fix sorting of objects during move
-rw-r--r--engines/wage/script.cpp2
-rw-r--r--engines/wage/world.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 294c08ed82..61336dce88 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 ae7a0ea6f5..7e7bc33712 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) {