aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsylvaintv2011-04-17 15:46:55 +0200
committersylvaintv2011-04-17 15:46:55 +0200
commit1fd034f3263fcb7043846e3f962921739cd75d6e (patch)
tree945bb9e9760c842e4116a47510d89fe6894b72ae
parentf809e94dd23f57e42b4c6e83fe39bdaccf635e85 (diff)
downloadscummvm-rg350-1fd034f3263fcb7043846e3f962921739cd75d6e.tar.gz
scummvm-rg350-1fd034f3263fcb7043846e3f962921739cd75d6e.tar.bz2
scummvm-rg350-1fd034f3263fcb7043846e3f962921739cd75d6e.zip
TOON: Fix Flux staying outside of the dressing room
-rw-r--r--engines/toon/character.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 69051d45fd..e63bc912c4 100644
--- a/engines/toon/character.cpp
+++ b/engines/toon/character.cpp
@@ -166,8 +166,9 @@ bool Character::walkTo(int32 newPosX, int32 newPosY) {
_vm->getPathFinding()->resetBlockingRects();
- if (_id == 1) {
- int32 sizeX = MAX<int32>(5, 40 * _vm->getDrew()->getScale() / 1024);
+ // don't allow flux to go at the same position as drew
+ if (_id == 1 ) {
+ int32 sizeX = MAX<int32>(5, 30 * _vm->getDrew()->getScale() / 1024);
int32 sizeY = MAX<int32>(2, 20 * _vm->getDrew()->getScale() / 1024);
_vm->getPathFinding()->addBlockingEllipse(_vm->getDrew()->getFinalX(), _vm->getDrew()->getFinalY(), sizeX, sizeY);
}