[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.358,1.359 akos.cpp,1.228,1.229

Eugene Sandulenko sev at users.sourceforge.net
Sun May 15 12:28:37 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17469

Modified Files:
	actor.cpp akos.cpp 
Log Message:
Restore --disable-he functionality. :(


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -d -r1.358 -r1.359
--- actor.cpp	15 May 2005 09:46:33 -0000	1.358
+++ actor.cpp	15 May 2005 19:27:46 -0000	1.359
@@ -630,8 +630,10 @@
 			}
 			adjustActorPos();
 		} else {
+#ifndef DISABLE_HE
 			if (_vm->_heversion >= 71)
 				((ScummEngine_v71he *)_vm)->queueAuxBlock(this);
+#endif
 			hideActor();
 		}
 	} else {
@@ -1430,8 +1432,10 @@
 	if (_vm->_features & GF_NEW_COSTUMES) {
 		memset(_animVariable, 0, sizeof(_animVariable));
 		
+#ifndef DISABLE_HE
 		if (_vm->_heversion >= 71)
 			((ScummEngine_v71he *)_vm)->queueAuxBlock(this);
+#endif
 		
 		_costume = c;
 		_cost.reset();
@@ -2040,7 +2044,6 @@
 	}
 	_auxEntriesNum = 0;
 }
-#endif
 
 void ScummEngine_v71he::queueAuxBlock(Actor *a) {
 	if (!a->_auxBlock.visible)
@@ -2058,6 +2061,7 @@
 	ae->subIndex = subIndex;
 	++_auxEntriesNum;
 }
+#endif
 
 
 const SaveLoadEntry *Actor::getSaveLoadEntries() {

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- akos.cpp	15 May 2005 10:40:27 -0000	1.228
+++ akos.cpp	15 May 2005 19:27:46 -0000	1.229
@@ -1692,8 +1692,10 @@
 			a->_offsY = param_2;
 			break;
 		case 7:
+#ifndef DISABLE_HE
 			assert(_heversion >= 71);
 			((ScummEngine_v71he *)this)->queueAuxEntry(a->_number, param_1);
+#endif
 			break;
 		case 8:
 			_actorToPrintStrFor = a->_number;





More information about the Scummvm-git-logs mailing list