[Scummvm-cvs-logs] scummvm master -> 055b766f7026128f614c482b6099611b0b8444e2

[sylvaintv]

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

Summary:
1fd034f326 TOON: Fix Flux staying outside of the dressing room
055b766f70 Merge branch 'master' of github.com:scummvm/scummvm


Commit: 1fd034f3263fcb7043846e3f962921739cd75d6e
    https://github.com/scummvm/scummvm/commit/1fd034f3263fcb7043846e3f962921739cd75d6e
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2011-04-17T06:46:55-07:00

Commit Message:
TOON: Fix Flux staying outside of the dressing room

Changed paths:
    engines/toon/character.cpp



diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 69051d4..e63bc91 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);
 	}


Commit: 055b766f7026128f614c482b6099611b0b8444e2
    https://github.com/scummvm/scummvm/commit/055b766f7026128f614c482b6099611b0b8444e2
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2011-04-17T06:47:53-07:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
    AUTHORS
    backends/platform/sdl/sdl.cpp
    common/macresman.cpp
    configure
    devtools/credits.pl
    engines/tsage/core.cpp
    engines/tsage/ringworld_scenes3.cpp
    gui/credits.h