[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.227,1.228
Travis Howell
kirben at users.sourceforge.net
Fri Feb 6 06:19:17 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9408/scumm
Modified Files:
actor.cpp
Log Message:
Used wrong check, might have caused regressions.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- actor.cpp 26 Jan 2004 11:39:10 -0000 1.227
+++ actor.cpp 6 Feb 2004 14:16:14 -0000 1.228
@@ -1013,7 +1013,7 @@
// If the actor is partially hidden, redraw it next frame.
// Only done for pre-AKOS, though.
if (bcr->drawCostume(_vm->virtscr[0], cost) & 1) {
- needRedraw = !(_vm->_version >= 7);
+ needRedraw = (_vm->_version <= 6);
}
// Record the vertical extent of the drawn actor
@@ -1165,7 +1165,7 @@
}
a = derefActor(_actorToPrintStrFor, "actorTalk");
- if (!a->isInCurrentRoom() && !(_features & GF_NEW_COSTUMES)) {
+ if (!a->isInCurrentRoom() && (_version <= 6)) {
oldact = 0xFF;
} else {
if (!_keepText)
@@ -1211,10 +1211,10 @@
a->startAnimActor(a->talkStopFrame);
_useTalkAnims = false;
}
- if (!(_features & GF_NEW_COSTUMES))
+ if (!(_features & GF_HUMONGOUS))
talkingActor(0xFF);
}
- if (_features & GF_NEW_COSTUMES)
+ if (_features & GF_HUMONGOUS)
talkingActor(0);
_keepText = false;
_charset->restoreCharsetBg();
More information about the Scummvm-git-logs
mailing list