[Scummvm-cvs-logs] SF.net SVN: scummvm: [30875] scummvm/branches/branch-0-11-0/engines/gob/ goblin_v2.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sat Feb 16 03:22:25 CET 2008
Revision: 30875
http://scummvm.svn.sourceforge.net/scummvm/?rev=30875&view=rev
Author: drmccoy
Date: 2008-02-15 18:22:25 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
Backport: Fixed a Gob3 walking issue noticeable when Blount walks down double-wide stairs (see bug report #1888627)
Modified Paths:
--------------
scummvm/branches/branch-0-11-0/engines/gob/goblin_v2.cpp
Modified: scummvm/branches/branch-0-11-0/engines/gob/goblin_v2.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/gob/goblin_v2.cpp 2008-02-16 02:20:30 UTC (rev 30874)
+++ scummvm/branches/branch-0-11-0/engines/gob/goblin_v2.cpp 2008-02-16 02:22:25 UTC (rev 30875)
@@ -266,7 +266,7 @@
if (_vm->_map->_screenWidth == 640) {
if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10)
animData->nextState = 41;
- if (_vm->_map->getPass(obj->goblinX - 1, obj->goblinY) != 10)
+ if (_vm->_map->getPass(obj->goblinX - 1, obj->goblinY + 2) != 10)
animData->nextState = 7;
}
break;
@@ -277,7 +277,7 @@
if (_vm->_map->_screenWidth == 640) {
if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 20)
animData->nextState = 39;
- else if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 19)
+ if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 19)
animData->nextState = 27;
}
break;
@@ -287,7 +287,7 @@
if (_vm->_map->_screenWidth == 640) {
if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10)
animData->nextState = 43;
- if (_vm->_map->getPass(obj->goblinX + 1, obj->goblinY) != 10)
+ if (_vm->_map->getPass(obj->goblinX + 1, obj->goblinY + 2) != 10)
animData->nextState = 5;
}
break;
@@ -351,6 +351,8 @@
case 13:
case 16:
case 23:
+ case 40:
+ case 41:
animData->curLookDir = 0;
break;
@@ -358,6 +360,8 @@
case 15:
case 18:
case 21:
+ case 26:
+ case 38:
animData->curLookDir = 2;
break;
@@ -367,6 +371,8 @@
case 12:
case 19:
case 22:
+ case 42:
+ case 43:
animData->curLookDir = 4;
break;
@@ -374,6 +380,8 @@
case 14:
case 17:
case 20:
+ case 27:
+ case 39:
animData->curLookDir = 6;
break;
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