[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.331,1.332 base-costume.h,1.37,1.38
Max Horn
fingolfin at users.sourceforge.net
Mon Mar 28 12:35:05 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28303
Modified Files:
actor.cpp base-costume.h
Log Message:
Always check hasManyDirections for AKOS costumes -- this could cause regressions with HE games (or fix something, who knows?)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- actor.cpp 27 Mar 2005 01:07:20 -0000 1.331
+++ actor.cpp 28 Mar 2005 20:34:17 -0000 1.332
@@ -327,9 +327,7 @@
if ((_vm->_version == 6) && _ignoreTurns)
return _facing;
- if (_vm->_version >= 7) {
- dirType = ((AkosCostumeLoader *)_vm->_costumeLoader)->hasManyDirections(_costume);
- }
+ dirType = _vm->_costumeLoader->hasManyDirections(_costume);
from = toSimpleDir(dirType, _facing);
dir = remapDirection(_targetFacing, is_walking);
Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- base-costume.h 27 Mar 2005 00:42:51 -0000 1.37
+++ base-costume.h 28 Mar 2005 20:34:18 -0000 1.38
@@ -57,6 +57,8 @@
virtual void loadCostume(int id) = 0;
virtual byte increaseAnims(Actor *a) = 0;
virtual void costumeDecodeData(Actor *a, int frame, uint usemask) = 0;
+
+ bool hasManyDirections(int id) { return false; }
};
More information about the Scummvm-git-logs
mailing list