[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.155,1.156 script_v2.cpp,2.185,2.186

Travis Howell kirben at users.sourceforge.net
Mon Aug 25 15:19:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24350/scumm

Modified Files:
	actor.cpp script_v2.cpp 
Log Message:

This fix should be v2 only
Update comment


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- actor.cpp	23 Aug 2003 15:16:07 -0000	1.155
+++ actor.cpp	25 Aug 2003 14:17:34 -0000	1.156
@@ -958,7 +958,7 @@
 	bcr->_actorX = x - _vm->virtscr[0].xstart;
 	bcr->_actorY = y - elevation;
 
-	if (_vm->_version <= 2) {
+	if (_vm->_version == 2) {
 		// FIXME: We have to adjust the x position by one strip (8 pixels) in V2 games
 		// However, it is not quite clear to me why. And to fully match the original,
 		// it seems we have to offset by 2 strips when facing left (270 degree).

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.185
retrieving revision 2.186
diff -u -d -r2.185 -r2.186
--- script_v2.cpp	24 Aug 2003 02:11:14 -0000	2.185
+++ script_v2.cpp	25 Aug 2003 14:17:34 -0000	2.186
@@ -415,7 +415,7 @@
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
 
-	// V1 Mansion Mansion uses static color table for subtitles
+	// V1 Mansion Mansion uses dynamic color table for subtitles
 	if ((_gameId == GID_MANIAC) && (_version == 1)) {
 		// Demo mode doesn't set subtitle color before display first subtitle.
 		if (_demo_mode && _actorToPrintStrFor == 0xFF)





More information about the Scummvm-git-logs mailing list