[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.353,1.354 akos.cpp,1.222,1.223 charset.cpp,2.141,2.142 cursor.cpp,2.38,2.39 gfx.cpp,2.447,2.448 module.mk,1.51,1.52 object.cpp,1.237,1.238 resource.cpp,1.323,1.324 room.cpp,1.12,1.13 saveload.cpp,1.222,1.223 scumm.cpp,1.510,1.511

kirben kirben at users.sourceforge.net
Sat May 14 07:06:58 CEST 2005


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

Modified Files:
	actor.cpp akos.cpp charset.cpp cursor.cpp gfx.cpp module.mk 
	object.cpp resource.cpp room.cpp saveload.cpp scumm.cpp 
Log Message:

Add configure option to disable HE 70+ games.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -d -r1.353 -r1.354
--- actor.cpp	12 May 2005 09:12:30 -0000	1.353
+++ actor.cpp	14 May 2005 14:06:34 -0000	1.354
@@ -1009,6 +1009,7 @@
 		akos_processQueue();
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v71he::processActors() {
 	preProcessAuxQueue();
 
@@ -1020,7 +1021,6 @@
 	postProcessAuxQueue();
 }
 
-
 void ScummEngine_v90he::processActors() {
 	preProcessAuxQueue();
 
@@ -1037,6 +1037,7 @@
 	spritesMarkDirty(true);
 	spritesProcessWiz(false);
 }
+#endif
 
 // Used in Scumm v8, to allow the verb coin to be drawn over the inventory
 // chest. I'm assuming that draw order won't matter here.
@@ -1968,6 +1969,7 @@
 	return (_heCondMask & (1 << (slot - 1))) != 0;
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v71he::preProcessAuxQueue() {
 	if (!_skipProcessActors) {
 		for (int i = 0; i < _auxBlocksNum; ++i) {
@@ -2048,6 +2050,7 @@
 	}
 	_auxEntriesNum = 0;
 }
+#endif
 
 void ScummEngine::queueAuxBlock(Actor *a) {
 	if (!a->_auxBlock.visible)

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- akos.cpp	27 Apr 2005 09:15:18 -0000	1.222
+++ akos.cpp	14 May 2005 14:06:35 -0000	1.223
@@ -1247,6 +1247,7 @@
 }
 
 byte AkosRenderer::codec32(int xmoveCur, int ymoveCur) {
+#ifndef DISABLE_HE
 	Common::Rect src, dst;
 
 	if (!_mirror) {
@@ -1302,6 +1303,7 @@
 
 	byte *dstPtr = (byte *)_out.pixels + dst.left + dst.top * _out.pitch;
 	Wiz::decompressWizImage(dstPtr, _out.pitch, dst, _srcptr, src, palPtr);
+#endif
 	return 0;
 }
 

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.141
retrieving revision 2.142
diff -u -d -r2.141 -r2.142
--- charset.cpp	10 May 2005 22:56:07 -0000	2.141
+++ charset.cpp	14 May 2005 14:06:35 -0000	2.142
@@ -1383,6 +1383,7 @@
 	}
 	
 	if ((_vm->_heversion >= 71 && type >= 8) || (_vm->_heversion >= 90 && type == 0)) {
+#ifndef DISABLE_HE
 		if (_ignoreCharsetMask || !vs->hasTwoBuffers) {
 			dstPtr = vs->getPixels(0, 0);
 		} else {
@@ -1407,6 +1408,7 @@
 			Common::Rect dst(_left, _top, _left + origWidth, _top + origHeight);
 			_vm->gdi.copyVirtScreenBuffers(dst);
 		}
+#endif
 	} else {
 		Graphics::Surface dstSurface;
 		Graphics::Surface backSurface;

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -d -r2.38 -r2.39
--- cursor.cpp	27 Apr 2005 13:55:54 -0000	2.38
+++ cursor.cpp	14 May 2005 14:06:35 -0000	2.39
@@ -156,12 +156,14 @@
 	updateCursor();
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v70he::setCursorFromImg(uint img, uint room, uint imgindex) {
 	if (_platform == Common::kPlatformMacintosh && _heversion == 72) 
 		_macResExtractor->setCursor(img);
 	else
 		_win32ResExtractor->setCursor(img);
 }
+#endif
 
 void ScummEngine_v90he::setDefaultCursor() {
 	const uint16 *src;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.447
retrieving revision 2.448
diff -u -d -r2.447 -r2.448
--- gfx.cpp	11 May 2005 19:26:38 -0000	2.447
+++ gfx.cpp	14 May 2005 14:06:35 -0000	2.448
@@ -799,6 +799,7 @@
 	_bgNeedsRedraw = false;
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v71he::redrawBGAreas() {
 	if (camera._cur.x != camera._last.x && _charset->_hasMask)
 		stopTalk();
@@ -817,6 +818,7 @@
 	ScummEngine_v71he::redrawBGAreas();
 	flushWizBuffer();
 }
+#endif
 
 void ScummEngine::redrawBGStrip(int start, int num) {
 	byte *room;
@@ -1622,6 +1624,7 @@
 }
 
 void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, int w, int h) {
+#ifndef DISABLE_HE
 	const byte *bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
 	assert(bmap_ptr);
 
@@ -1646,6 +1649,7 @@
 		
 		copyVirtScreenBuffers(rect1);
 	}
+#endif
 }
 
 void Gdi::copyVirtScreenBuffers(Common::Rect rect, int dirtybit) {

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/module.mk,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- module.mk	9 May 2005 00:09:00 -0000	1.51
+++ module.mk	14 May 2005 14:06:36 -0000	1.52
@@ -18,13 +18,11 @@
 	scumm/input.o \
 	scumm/instrument.o \
 	scumm/help.o \
-	scumm/logic_he.o \
 	scumm/midiparser_ro.o \
 	scumm/midiparser_eup.o \
 	scumm/nut_renderer.o \
 	scumm/object.o \
 	scumm/palette.o \
-	scumm/palette_he.o \
 	scumm/player_mod.o \
 	scumm/player_v1.o \
 	scumm/player_nes.o \
@@ -35,7 +33,6 @@
 	scumm/resource_v2.o \
 	scumm/resource_v3.o \
 	scumm/resource_v4.o \
-	scumm/resource_v7he.o \
 	scumm/room.o \
 	scumm/saveload.o \
 	scumm/script.o \
@@ -43,21 +40,14 @@
 	scumm/script_v5.o \
 	scumm/script_v6.o \
 	scumm/script_v6he.o \
-	scumm/script_v7he.o \
-	scumm/script_v72he.o \
-	scumm/script_v80he.o \
-	scumm/script_v90he.o \
-	scumm/script_v100he.o \
 	scumm/script_v8.o \
 	scumm/scumm.o \
 	scumm/sound.o \
-	scumm/sprite_he.o \
 	scumm/string.o \
 	scumm/usage_bits.o \
 	scumm/util.o \
 	scumm/vars.o \
 	scumm/verbs.o \
-	scumm/wiz_he.o \
 	scumm/imuse_digi/dimuse.o \
 	scumm/imuse_digi/dimuse_bndmgr.o \
 	scumm/imuse_digi/dimuse_codecs.o \
@@ -82,6 +72,20 @@
 	scumm/smush/smush_font.o \
 	scumm/thumbnail.o
 
+ifndef DISABLE_HE
+MODULE_OBJS += \
+	scumm/logic_he.o \
+	scumm/palette_he.o \
+	scumm/resource_v7he.o \
+	scumm/script_v7he.o \
+	scumm/script_v72he.o \
+	scumm/script_v80he.o \
+	scumm/script_v90he.o \
+	scumm/script_v100he.o \
+	scumm/sprite_he.o \
+	scumm/wiz_he.o
+endif
+
 MODULE_DIRS += \
 	scumm \
 	scumm/imuse_digi \

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- object.cpp	7 May 2005 07:57:57 -0000	1.237
+++ object.cpp	14 May 2005 14:06:36 -0000	1.238
@@ -340,10 +340,12 @@
 			a = _objs[b].parentstate;
 			b = _objs[b].parent;
 			if (b == 0) {
+#ifndef DISABLE_HE
 				if (_heversion >= 70) {
 					if (((ScummEngine_v70he *)this)->_wiz.polygonHit(_objs[i].obj_nr, x, y))
 						return _objs[i].obj_nr;
 				}
+#endif
 				if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
 				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
 					return _objs[i].obj_nr;
@@ -865,6 +867,7 @@
 	_blastObjectQueuePos = 0;
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v70he::clearDrawQueues() {
 	ScummEngine_v6::clearDrawQueues();
 
@@ -877,7 +880,7 @@
 
 	_wiz.clearWizBuffer();
 }
-
+#endif
 
 void ScummEngine::clearOwnerOf(int obj) {
 	int i, j;

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- resource.cpp	13 May 2005 10:23:56 -0000	1.323
+++ resource.cpp	14 May 2005 14:06:36 -0000	1.324
@@ -359,6 +359,7 @@
 	}
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;
 	switch (blocktype) {
@@ -379,6 +380,7 @@
 		ScummEngine::readIndexBlock(blocktype, itemsize);
 	}
 }
+#endif
 
 void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;

Index: room.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/room.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- room.cpp	11 May 2005 13:02:40 -0000	1.12
+++ room.cpp	14 May 2005 14:06:37 -0000	1.13
@@ -519,6 +519,7 @@
 		}
 	}
 
+#ifndef DISABLE_HE
 	// Polygons in HE 80+ games
 	if (_heversion >= 80) {
 		ptr = findResourceData(MKID('POLD'), roomptr);
@@ -526,6 +527,7 @@
 			((ScummEngine_v70he *)this)->_wiz.polygonLoad(ptr);
 		}
 	}
+#endif
 
 	if (_PALS_offs || _CLUT_offs)
 		setPalette(0);

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- saveload.cpp	13 May 2005 08:37:11 -0000	1.222
+++ saveload.cpp	14 May 2005 14:06:37 -0000	1.223
@@ -1004,6 +1004,7 @@
 	_imuseDigital->saveOrLoad(s);
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v70he::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 	ScummEngine::saveOrLoad(s, savegameVersion);
 
@@ -1090,6 +1091,7 @@
 
 	s->saveLoadEntries(this, HE100Entries);
 }
+#endif
 
 void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {
 	byte *ptr;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -d -r1.510 -r1.511
--- scumm.cpp	13 May 2005 08:37:12 -0000	1.510
+++ scumm.cpp	14 May 2005 14:06:37 -0000	1.511
@@ -233,7 +233,7 @@
 	{"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_FBEAR, 6, 61, MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
 
-#ifndef __PALM_OS__
+#ifndef DISABLE_HE
 	{"activity", "Putt-Putt & Fatty Bear's Activity Pack", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
 
@@ -1285,6 +1285,7 @@
 	VAR_TIMEDATE_SECOND = 0xFF;
 }
 
+#ifndef DISABLE_HE
 ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
  : ScummEngine_v60he(detector, syst, gs, md5sum) {
 	 _win32ResExtractor = new Win32ResExtractor(this);
@@ -1339,7 +1340,7 @@
 		delete _logicHE;
 	}
 }
-
+#endif
 
 ScummEngine_v7::ScummEngine_v7(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
  : ScummEngine_v6(detector, syst, gs, md5sum) {
@@ -1764,6 +1765,7 @@
 		setCursorHotspot(16, 16);
 }
 
+#ifndef DISABLE_HE
 void ScummEngine_v72he::scummInit() {
 	ScummEngine_v60he::scummInit();
 
@@ -1816,6 +1818,7 @@
 	memcpy(ah->data, _gameName.c_str(), len);
 
 }
+#endif
 
 void ScummEngine::setupMusic(int midi) {
 	_midiDriver = MidiDriver::detectMusicDriver(midi);
@@ -1918,10 +1921,12 @@
 		args[0] = _bootParam;	
 
 		_saveLoadFlag = 0;
+#ifndef DISABLE_HE
 		if (_heversion >= 98) {
 			((ScummEngine_v90he *)this)->_logicHE->initOnce();
 			((ScummEngine_v90he *)this)->_logicHE->beforeBootScript();
 		}
+#endif
 		if (_gameId == GID_MANIAC && _demoMode)
 			runScript(9, 0, 0, args);
 		else
@@ -1982,10 +1987,11 @@
 	// that it will be in a different state each time you run the program.
 	_rnd.getRandomNumber(2);
 
+#ifndef DISABLE_HE
 	if (_heversion >= 98) {
 		((ScummEngine_v90he *)this)->_logicHE->startOfFrame();
 	}
-
+#endif
 	if (_version > 2) {
 		VAR(VAR_TMR_1) += delta;
 		VAR(VAR_TMR_2) += delta;
@@ -2199,10 +2205,12 @@
 		if (_version >= 7)
 			redrawVerbs();
 
+#ifndef DISABLE_HE
 		if (_heversion >= 90) {
 			((ScummEngine_v90he *)this)->spritesBlitToScreen();
 			((ScummEngine_v90he *)this)->spritesSortActiveSprites();
 		}
+#endif
 	
 		setActorRedrawFlags();
 		resetActorBgs();
@@ -2256,12 +2264,14 @@
 	/* show or hide mouse */
 	_system->showMouse(_cursor.state > 0);
 
+#ifndef DISABLE_HE
 	if (_heversion >= 90) {
 		((ScummEngine_v90he *)this)->spritesUpdateImages();
 	}
 	if (_heversion >= 98) {
 		((ScummEngine_v90he *)this)->_logicHE->endOfFrame();
 	}
+#endif
 
 	if (VAR_TIMER != 0xFF)
 		VAR(VAR_TIMER) = 0;
@@ -2856,7 +2866,7 @@
 		break;
 	case 6:
 		switch (game.heversion) {
-#ifndef __PALM_OS__
+#ifndef DISABLE_HE
 		case 100:
 			engine = new ScummEngine_v100he(detector, syst, game, md5sum);
 			break;





More information about the Scummvm-git-logs mailing list