[Scummvm-cvs-logs] SF.net SVN: scummvm: [30924] scummvm/trunk/engines/saga
h00ligan at users.sourceforge.net
h00ligan at users.sourceforge.net
Sat Feb 23 15:42:46 CET 2008
Revision: 30924
http://scummvm.svn.sourceforge.net/scummvm/?rev=30924&view=rev
Author: h00ligan
Date: 2008-02-23 06:42:46 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
fix bug 1900244 "ITE: Strange animation when returning to prison cell"
Modified Paths:
--------------
scummvm/trunk/engines/saga/actor.cpp
scummvm/trunk/engines/saga/actor_walk.cpp
Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp 2008-02-23 14:31:25 UTC (rev 30923)
+++ scummvm/trunk/engines/saga/actor.cpp 2008-02-23 14:42:46 UTC (rev 30924)
@@ -1266,14 +1266,6 @@
for (i = 0; i < _actorsCount; i++) {
ActorData *a = _actors[i];
a->loadState(_vm->getCurrentLoadVersion(), in);
-
- // Fix bug #1258633 "ITE: Second Rif appears in wall of dog castle prison"
- // For some reason in some cases actor position is all wrong, so Rif
- // crawls to his original poition
- if (i == 122 && _vm->getGameType() == GType_ITE) {
- a->_location.x = 130;
- a->_location.y = 55;
- }
}
for (i = 0; i < _objsCount; i++) {
Modified: scummvm/trunk/engines/saga/actor_walk.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor_walk.cpp 2008-02-23 14:31:25 UTC (rev 30923)
+++ scummvm/trunk/engines/saga/actor_walk.cpp 2008-02-23 14:42:46 UTC (rev 30924)
@@ -218,6 +218,9 @@
if (actor->_sceneNumber == _vm->_scene->currentSceneNumber()) {
actor->_inScene = true;
actor->_actionCycle = (_vm->_rnd.getRandomNumber(7) & 0x7) * 4; // 1/8th chance
+ if (actor->_currentAction != kActionFreeze) {
+ actor->_currentAction = kActionWait;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list