From de09845319f43f6bad3582af5d570de43c7f9632 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 3 Jul 2008 08:44:29 +0000
Subject: Fix for bug #2008054: Parallaction engine doesn't compile under MSVC9

svn-id: r32879
---
 engines/parallaction/parser_br.cpp | 2 +-
 engines/parallaction/parser_ns.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index 51da7eb396..defc917a72 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -390,7 +390,7 @@ DECLARE_LOCATION_PARSER(flags)  {
 
 	if ((_vm->getLocationFlags() & kFlagsVisited) == 0) {
 		// only for 1st visit
-		_vm->clearLocationFlags(kFlagsAll);
+		_vm->clearLocationFlags((uint32)kFlagsAll);
 		int _si = 1;
 
 		do {
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index c654e3008e..2f4d2df776 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -1059,7 +1059,7 @@ DECLARE_LOCATION_PARSER(flags)  {
 
 	if ((_vm->getLocationFlags() & kFlagsVisited) == 0) {
 		// only for 1st visit
-		_vm->clearLocationFlags(kFlagsAll);
+		_vm->clearLocationFlags((uint32)kFlagsAll);
 		int _si = 1;
 
 		do {
-- 
cgit v1.2.3


From 59e672ef40e4c227c27022ec764f8b811b375220 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Thu, 3 Jul 2008 10:31:25 +0000
Subject: Changed balloons to use GfxObj as well. Next step is to integrate
 balloons for BRA.

svn-id: r32883
---
 engines/parallaction/disk.h       | 10 ++---
 engines/parallaction/disk_br.cpp  |  8 ++--
 engines/parallaction/disk_ns.cpp  |  8 ++--
 engines/parallaction/gfxbase.cpp  | 12 ++++--
 engines/parallaction/graphics.cpp | 85 +++++++++++++++++++++++++--------------
 engines/parallaction/graphics.h   | 13 +++---
 6 files changed, 82 insertions(+), 54 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 176f10aa10..694d4efa6d 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -61,7 +61,7 @@ public:
 	virtual GfxObj* loadHead(const char* name) = 0;
 	virtual Font* loadFont(const char* name) = 0;
 	virtual GfxObj* loadStatic(const char* name) = 0;
-	virtual GfxObj* loadFrames(const char* name) = 0;
+	virtual Frames* loadFrames(const char* name) = 0;
 	virtual void loadSlide(BackgroundInfo& info, const char *filename) = 0;
 	virtual void loadScenery(BackgroundInfo& info, const char* background, const char* mask, const char* path) = 0;
 	virtual Table* loadTable(const char* name) = 0;
@@ -153,7 +153,7 @@ public:
 	GfxObj* loadHead(const char* name);
 	Font* loadFont(const char* name);
 	GfxObj* loadStatic(const char* name);
-	GfxObj* loadFrames(const char* name);
+	Frames* loadFrames(const char* name);
 	void loadSlide(BackgroundInfo& info, const char *filename);
 	void loadScenery(BackgroundInfo& info, const char* background, const char* mask, const char* path);
 	Table* loadTable(const char* name);
@@ -187,7 +187,7 @@ public:
 	GfxObj* loadHead(const char* name);
 	Font* loadFont(const char* name);
 	GfxObj* loadStatic(const char* name);
-	GfxObj* loadFrames(const char* name);
+	Frames* loadFrames(const char* name);
 	void loadSlide(BackgroundInfo& info, const char *filename);
 	void loadScenery(BackgroundInfo& info, const char* background, const char* mask, const char* path);
 	Table* loadTable(const char* name);
@@ -226,7 +226,7 @@ public:
 	GfxObj* loadHead(const char* name);
 	Font* loadFont(const char* name);
 	GfxObj* loadStatic(const char* name);
-	GfxObj* loadFrames(const char* name);
+	Frames* loadFrames(const char* name);
 	void loadSlide(BackgroundInfo& info, const char *filename);
 	void loadScenery(BackgroundInfo& info, const char* name, const char* mask, const char* path);
 	Table* loadTable(const char* name);
@@ -251,7 +251,7 @@ public:
 	GfxObj* loadTalk(const char *name);
 	Font* loadFont(const char* name);
 	GfxObj* loadStatic(const char* name);
-	GfxObj* loadFrames(const char* name);
+	Frames* loadFrames(const char* name);
 	void loadSlide(BackgroundInfo& info, const char *filename);
 	void loadScenery(BackgroundInfo& info, const char* name, const char* mask, const char* path);
 };
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 0159d9d406..543ed14146 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -280,7 +280,7 @@ Sprites* DosDisk_br::createSprites(Common::ReadStream &stream) {
 	return sprites;
 }
 
-GfxObj* DosDisk_br::loadFrames(const char* name) {
+Frames* DosDisk_br::loadFrames(const char* name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadFrames");
 
 	char path[PATH_LEN];
@@ -291,7 +291,7 @@ GfxObj* DosDisk_br::loadFrames(const char* name) {
 		errorFileNotFound(path);
 
 
-	return new GfxObj(0, createSprites(stream), name);
+	return createSprites(stream);
 }
 
 // Slides in Nippon Safes are basically screen-sized pictures with valid
@@ -600,13 +600,13 @@ Sprites* AmigaDisk_br::createSprites(const char *path) {
 	return sprites;
 }
 
-GfxObj* AmigaDisk_br::loadFrames(const char* name) {
+Frames* AmigaDisk_br::loadFrames(const char* name) {
 	debugC(1, kDebugDisk, "AmigaDisk_br::loadFrames '%s'", name);
 
 	char path[PATH_LEN];
 	sprintf(path, "%s/anims/%s", _partPath, name);
 
-	return new GfxObj(0, createSprites(path));
+	return createSprites(path);
 }
 
 GfxObj* AmigaDisk_br::loadTalk(const char *name) {
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index f45cf83f56..55e6fc5e77 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -490,8 +490,8 @@ GfxObj* DosDisk_ns::loadStatic(const char* name) {
 	return new GfxObj(0, new SurfaceToFrames(cnv), name);
 }
 
-GfxObj* DosDisk_ns::loadFrames(const char* name) {
-	return new GfxObj(0, loadCnv(name), name);
+Frames* DosDisk_ns::loadFrames(const char* name) {
+	return loadCnv(name);
 }
 
 //
@@ -1258,7 +1258,7 @@ void AmigaDisk_ns::loadSlide(BackgroundInfo& info, const char *name) {
 	return;
 }
 
-GfxObj* AmigaDisk_ns::loadFrames(const char* name) {
+Frames* AmigaDisk_ns::loadFrames(const char* name) {
 	debugC(1, kDebugDisk, "AmigaDisk_ns::loadFrames '%s'", name);
 
 	Common::SeekableReadStream *s;
@@ -1273,7 +1273,7 @@ GfxObj* AmigaDisk_ns::loadFrames(const char* name) {
 	Cnv *cnv = makeCnv(*s);
 	delete s;
 
-	return new GfxObj(0, cnv, name);
+	return cnv;
 }
 
 GfxObj* AmigaDisk_ns::loadHead(const char* name) {
diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index 383f5d549c..8d7041305d 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -86,12 +86,14 @@ void GfxObj::clearFlags(uint32 flags) {
 }
 
 GfxObj* Gfx::loadAnim(const char *name) {
-	GfxObj *obj = _disk->loadFrames(name);
+	Frames* frames = _disk->loadFrames(name);
+	assert(frames);
+
+	GfxObj *obj = new GfxObj(kGfxObjTypeAnim, frames, name);
 	assert(obj);
 
 	// animation Z is not set here, but controlled by game scripts and user interaction.
 	// it is always >=0 and <screen height
-	obj->type = kGfxObjTypeAnim;
 	obj->transparentKey = 0;
 	_gfxobjList.push_back(obj);
 	return obj;
@@ -110,11 +112,13 @@ GfxObj* Gfx::loadGet(const char *name) {
 }
 
 GfxObj* Gfx::loadDoor(const char *name) {
-	GfxObj *obj = _disk->loadFrames(name);
+	Frames *frames = _disk->loadFrames(name);
+	assert(frames);
+
+	GfxObj *obj = new GfxObj(kGfxObjTypeDoor, frames, name);
 	assert(obj);
 
 	obj->z = kGfxObjDoorZ;	// this preset Z value ensures that doors are drawn first
-	obj->type = kGfxObjTypeDoor;
 	obj->transparentKey = 0;
 	_gfxobjList.push_back(obj);
 	return obj;
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 838827b19f..24c78d1703 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -362,15 +362,13 @@ void Gfx::drawItems() {
 }
 
 void Gfx::drawBalloons() {
-	if (_numBalloons == 0) {
+	if (_balloons.size() == 0) {
 		return;
 	}
 
 	Graphics::Surface *surf = g_system->lockScreen();
-	for (uint i = 0; i < _numBalloons; i++) {
-		Common::Rect r(_balloons[i].surface.w, _balloons[i].surface.h);
-		r.moveTo(_balloons[i].x, _balloons[i].y);
-		blt(r, (byte*)_balloons[i].surface.getBasePtr(0, 0), surf, LAYER_FOREGROUND, BALLOON_TRANSPARENT_COLOR);
+	for (uint i = 0; i < _balloons.size(); i++) {
+		drawGfxObject(_balloons[i], *surf, false);
 	}
 	g_system->unlockScreen();
 }
@@ -832,7 +830,7 @@ void Gfx::setItemFrame(uint item, uint16 f) {
 
 Gfx::Balloon* Gfx::getBalloon(uint id) {
 	assert(id < _numBalloons);
-	return &_balloons[id];
+	return &_intBalloons[id];
 }
 
 int Gfx::createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness) {
@@ -840,18 +838,19 @@ int Gfx::createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness)
 
 	int id = _numBalloons;
 
-	Gfx::Balloon *balloon = &_balloons[id];
+	Gfx::Balloon *balloon = &_intBalloons[id];
 
 	int16 real_h = (winding == -1) ? h : h + 9;
-	balloon->surface.create(w, real_h, 1);
-	balloon->surface.fillRect(Common::Rect(w, real_h), BALLOON_TRANSPARENT_COLOR);
+	balloon->surface = new Graphics::Surface;
+	balloon->surface->create(w, real_h, 1);
+	balloon->surface->fillRect(Common::Rect(w, real_h), BALLOON_TRANSPARENT_COLOR);
 
 	Common::Rect r(w, h);
-	balloon->surface.fillRect(r, 0);
+	balloon->surface->fillRect(r, 0);
 	balloon->outerBox = r;
 
 	r.grow(-borderThickness);
-	balloon->surface.fillRect(r, 1);
+	balloon->surface->fillRect(r, 1);
 	balloon->innerBox = r;
 
 	if (winding != -1) {
@@ -860,7 +859,7 @@ int Gfx::createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness)
 		winding = (winding == 0 ? 1 : 0);
 		Common::Rect s(BALLOON_TAIL_WIDTH, BALLOON_TAIL_HEIGHT);
 		s.moveTo(r.width()/2 - 5, r.bottom - 1);
-		blt(s, _resBalloonTail[winding], &balloon->surface, LAYER_FOREGROUND, BALLOON_TRANSPARENT_COLOR);
+		blt(s, _resBalloonTail[winding], balloon->surface, LAYER_FOREGROUND, BALLOON_TRANSPARENT_COLOR);
 	}
 
 	_numBalloons++;
@@ -868,6 +867,20 @@ int Gfx::createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness)
 	return id;
 }
 
+GfxObj* Gfx::registerBalloon(Frames *frames, const char *text) {
+
+	GfxObj *obj = new GfxObj(kGfxObjTypeBalloon, frames, text);
+
+	obj->layer = LAYER_FOREGROUND;
+	obj->frame = 0;
+	obj->transparentKey = BALLOON_TRANSPARENT_COLOR;
+	obj->setFlags(kGfxObjVisible);
+
+	_balloons.push_back(obj);
+
+	return obj;
+}
+
 int Gfx::setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor) {
 
 	int16 w, h;
@@ -875,12 +888,14 @@ int Gfx::setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte t
 	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
 
 	int id = createBalloon(w+5, h, winding, 1);
-	Gfx::Balloon *balloon = &_balloons[id];
+	Gfx::Balloon *balloon = &_intBalloons[id];
 
-	drawWrappedText(_vm->_dialogueFont, &balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
 
-	balloon->x = x;
-	balloon->y = y;
+	// TODO: extract some text to make a name for obj
+	balloon->obj = registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = x;
+	balloon->obj->y = y;
 
 	return id;
 }
@@ -892,15 +907,17 @@ int Gfx::setDialogueBalloon(char *text, uint16 winding, byte textColor) {
 	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
 
 	int id = createBalloon(w+5, h, winding, 1);
-	Gfx::Balloon *balloon = &_balloons[id];
+	Gfx::Balloon *balloon = &_intBalloons[id];
 
-	drawWrappedText(_vm->_dialogueFont, &balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
 
-	balloon->x = _dialogueBalloonX[id];
-	balloon->y = 10;
+	// TODO: extract some text to make a name for obj
+	balloon->obj = registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = _dialogueBalloonX[id];
+	balloon->obj->y = 10;
 
 	if (id > 0) {
-		balloon->y += _balloons[id - 1].y + _balloons[id - 1].outerBox.height();
+		balloon->obj->y += _intBalloons[id - 1].obj->y + _intBalloons[id - 1].outerBox.height();
 	}
 
 
@@ -909,8 +926,8 @@ int Gfx::setDialogueBalloon(char *text, uint16 winding, byte textColor) {
 
 void Gfx::setBalloonText(uint id, char *text, byte textColor) {
 	Gfx::Balloon *balloon = getBalloon(id);
-	balloon->surface.fillRect(balloon->innerBox, 1);
-	drawWrappedText(_vm->_dialogueFont, &balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+	balloon->surface->fillRect(balloon->innerBox, 1);
+	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
 }
 
 
@@ -921,11 +938,13 @@ int Gfx::setLocationBalloon(char *text, bool endGame) {
 	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
 
 	int id = createBalloon(w+(endGame ? 5 : 10), h+5, -1, BALLOON_TRANSPARENT_COLOR);
-	Gfx::Balloon *balloon = &_balloons[id];
-	drawWrappedText(_vm->_dialogueFont, &balloon->surface, text, 0, MAX_BALLOON_WIDTH);
+	Gfx::Balloon *balloon = &_intBalloons[id];
+	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, 0, MAX_BALLOON_WIDTH);
 
-	balloon->x = 5;
-	balloon->y = 5;
+	// TODO: extract some text to make a name for obj
+	balloon->obj = registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = 5;
+	balloon->obj->y = 5;
 
 	return id;
 }
@@ -935,10 +954,10 @@ int Gfx::hitTestDialogueBalloon(int x, int y) {
 	Common::Point p;
 
 	for (uint i = 0; i < _numBalloons; i++) {
-		p.x = x - _balloons[i].x;
-		p.y = y - _balloons[i].y;
+		p.x = x - _intBalloons[i].obj->x;
+		p.y = y - _intBalloons[i].obj->y;
 
-		if (_balloons[i].innerBox.contains(p))
+		if (_intBalloons[i].innerBox.contains(p))
 			return i;
 	}
 
@@ -947,8 +966,12 @@ int Gfx::hitTestDialogueBalloon(int x, int y) {
 
 
 void Gfx::freeBalloons() {
+	_balloons.clear();
+
 	for (uint i = 0; i < _numBalloons; i++) {
-		_balloons[i].surface.free();
+		delete _intBalloons[i].obj;
+		_intBalloons[i].obj = 0;
+		_intBalloons[i].surface = 0;	// no need to delete surface, since it is done by obj (GfxObj)
 	}
 	_numBalloons = 0;
 }
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index df4cab4caf..b15da432d9 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -344,7 +344,8 @@ enum {
 	kGfxObjTypeDoor = 0,
 	kGfxObjTypeGet = 1,
 	kGfxObjTypeAnim = 2,
-	kGfxObjTypeLabel = 3
+	kGfxObjTypeLabel = 3,
+	kGfxObjTypeBalloon = 4
 };
 
 enum {
@@ -484,6 +485,7 @@ public:
 	void setBalloonText(uint id, char *text, byte textColor);
 	int hitTestDialogueBalloon(int x, int y);
 	void getStringExtent(Font *font, char *text, uint16 maxwidth, int16* width, int16* height);
+	GfxObj* registerBalloon(Frames *frames, const char *text);
 
 	// other items
 	int setItem(GfxObj* obj, uint16 x, uint16 y, byte transparentColor = 0);
@@ -552,13 +554,11 @@ public:
 	static int16 _dialogueBalloonX[5];
 
 	struct Balloon {
-		uint16 x;
-		uint16 y;
 		Common::Rect outerBox;
 		Common::Rect innerBox;
-		uint16 winding;
-		Graphics::Surface surface;
-	} _balloons[5];
+		Graphics::Surface *surface;
+		GfxObj	*obj;
+	} _intBalloons[5];
 
 	uint	_numBalloons;
 
@@ -573,6 +573,7 @@ public:
 
 	typedef Common::Array<GfxObj*> GfxObjArray;
 	GfxObjArray	_labels;
+	GfxObjArray _balloons;
 
 	uint _floatingLabel;
 
-- 
cgit v1.2.3


From 56c6840ff72ab38a508aa0f46662ef7c636e410f Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 3 Jul 2008 16:25:59 +0000
Subject: Fixing a crash when loading a save made within the cult/bargon
 building (bug #2005965)

svn-id: r32895
---
 engines/gob/goblin_v2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp
index 9144e35070..d763aeb01c 100644
--- a/engines/gob/goblin_v2.cpp
+++ b/engines/gob/goblin_v2.cpp
@@ -88,7 +88,7 @@ void Goblin_v2::placeObject(Gob_Object *objDesc, char animated,
 				(_vm->_scenery->_animBottom - _vm->_scenery->_animTop) - (y + 1) / 2;
 		*obj->pPosX = x * _vm->_map->_tilesWidth;
 	} else {
-		if (obj->goblinStates[state] != 0) {
+		if ((obj->goblinStates != 0) && (obj->goblinStates[state] != 0)) {
 			layer = obj->goblinStates[state][0].layer;
 			animation = obj->goblinStates[state][0].animation;
 			objAnim->state = state;
-- 
cgit v1.2.3


From d92085b5071b0bb62642d62857e5853006be3b2c Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Thu, 3 Jul 2008 21:09:07 +0000
Subject: minor fix for Towns/PC98 music

svn-id: r32899
---
 engines/kyra/sequences_lok.cpp |  2 +-
 engines/kyra/sound_lok.cpp     | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index b30568c7e2..3a497a258f 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -1083,7 +1083,7 @@ void KyraEngine_LoK::seq_playCredits() {
 	_screen->_charWidth = -1;
 
 	// we only need this for the fm-towns version
-	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
+	if (_flags.platform == Common::kPlatformFMTowns && _configMusic == 1)
 		snd_playWanderScoreViaMap(53, 1);
 
 	uint8 *buffer = 0;
diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp
index 7d6e1dd378..b43d72ebce 100644
--- a/engines/kyra/sound_lok.cpp
+++ b/engines/kyra/sound_lok.cpp
@@ -49,20 +49,23 @@ void KyraEngine_LoK::snd_playWanderScoreViaMap(int command, int restart) {
 		} else if (command >= 35 && command <= 38) {
 			snd_playSoundEffect(command-20);
 		} else if (command >= 2) {
-			if (_lastMusicCommand != command) {
+			if (_lastMusicCommand != command)
 				// the original does -2 here we handle this inside _sound->playTrack()
 				_sound->playTrack(command);
-			}
 		} else {
 			_sound->haltTrack();
 		}
+		_lastMusicCommand = command;
 	} else if (_flags.platform == Common::kPlatformPC98) {
-		if (command == 1)
+		if (command == 1) {
 			_sound->beginFadeOut();
-		else if (command >= 2)
-			_sound->playTrack(command);	
-		else
+		} else if (command >= 2) {
+			if (_lastMusicCommand != command)
+				_sound->playTrack(command);
+		} else {
 			_sound->haltTrack();
+		}
+		_lastMusicCommand = command;
 	} else {
 		KyraEngine_v1::snd_playWanderScoreViaMap(command, restart);
 	}
-- 
cgit v1.2.3


From d387d1af0ec869700da199578f07e5a0c00968f3 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Fri, 4 Jul 2008 00:29:21 +0000
Subject: - Moved dialogue balloon management code from Gfx to its own class -
 Added a class to draw balloons in BRA (still without text and with wrong
 placement)

svn-id: r32902
---
 engines/parallaction/balloons.cpp        | 456 +++++++++++++++++++++++++++++++
 engines/parallaction/callables_ns.cpp    |   2 +-
 engines/parallaction/dialogue.cpp        |  24 +-
 engines/parallaction/exec_br.cpp         |   9 +-
 engines/parallaction/exec_ns.cpp         |   4 +-
 engines/parallaction/graphics.cpp        | 174 +-----------
 engines/parallaction/graphics.h          |  33 +--
 engines/parallaction/gui_br.cpp          |   2 +-
 engines/parallaction/input.cpp           |   2 +-
 engines/parallaction/module.mk           |   1 +
 engines/parallaction/parallaction.cpp    |   6 +-
 engines/parallaction/parallaction.h      |   9 +
 engines/parallaction/parallaction_br.cpp |   3 +
 13 files changed, 515 insertions(+), 210 deletions(-)
 create mode 100644 engines/parallaction/balloons.cpp

(limited to 'engines')

diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp
new file mode 100644
index 0000000000..fab92dada9
--- /dev/null
+++ b/engines/parallaction/balloons.cpp
@@ -0,0 +1,456 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "parallaction/graphics.h"
+#include "parallaction/parallaction.h"
+
+namespace Parallaction {
+
+
+#define	BALLOON_TRANSPARENT_COLOR_NS 2
+#define BALLOON_TRANSPARENT_COLOR_BR 0
+
+#define BALLOON_TAIL_WIDTH	12
+#define BALLOON_TAIL_HEIGHT	10
+
+
+byte _resBalloonTail[2][BALLOON_TAIL_WIDTH*BALLOON_TAIL_HEIGHT] = {
+	{
+	  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
+	  0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x00, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+	},
+	{
+	  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
+	  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02,
+	  0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x02, 0x02,
+	  0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x02, 0x02
+	}
+};
+
+class BalloonManager_ns : public BalloonManager {
+
+	static int16 _dialogueBalloonX[5];
+
+	struct Balloon {
+		Common::Rect outerBox;
+		Common::Rect innerBox;
+		Graphics::Surface *surface;
+		GfxObj	*obj;
+	} _intBalloons[5];
+
+	uint	_numBalloons;
+
+	void drawWrappedText(Font *font, Graphics::Surface* surf, char *text, byte color, int16 wrapwidth);
+	int createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness);
+	Balloon *getBalloon(uint id);
+
+	Gfx *_gfx;
+
+public:
+	BalloonManager_ns(Gfx *gfx);
+	~BalloonManager_ns();
+
+	void freeBalloons();
+	int setLocationBalloon(char *text, bool endGame);
+	int setDialogueBalloon(char *text, uint16 winding, byte textColor);
+	int setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor);
+	void setBalloonText(uint id, char *text, byte textColor);
+	int hitTestDialogueBalloon(int x, int y);
+};
+
+int16 BalloonManager_ns::_dialogueBalloonX[5] = { 80, 120, 150, 150, 150 };
+
+BalloonManager_ns::BalloonManager_ns(Gfx *gfx) : _numBalloons(0), _gfx(gfx) {
+
+}
+
+BalloonManager_ns::~BalloonManager_ns() {
+
+}
+
+
+BalloonManager_ns::Balloon* BalloonManager_ns::getBalloon(uint id) {
+	assert(id < _numBalloons);
+	return &_intBalloons[id];
+}
+
+int BalloonManager_ns::createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness) {
+	assert(_numBalloons < 5);
+
+	int id = _numBalloons;
+
+	Balloon *balloon = &_intBalloons[id];
+
+	int16 real_h = (winding == -1) ? h : h + 9;
+	balloon->surface = new Graphics::Surface;
+	balloon->surface->create(w, real_h, 1);
+	balloon->surface->fillRect(Common::Rect(w, real_h), BALLOON_TRANSPARENT_COLOR_NS);
+
+	Common::Rect r(w, h);
+	balloon->surface->fillRect(r, 0);
+	balloon->outerBox = r;
+
+	r.grow(-borderThickness);
+	balloon->surface->fillRect(r, 1);
+	balloon->innerBox = r;
+
+	if (winding != -1) {
+		// draws tail
+		// TODO: this bitmap tail should only be used for Dos games. Amiga should use a polygon fill.
+		winding = (winding == 0 ? 1 : 0);
+		Common::Rect s(BALLOON_TAIL_WIDTH, BALLOON_TAIL_HEIGHT);
+		s.moveTo(r.width()/2 - 5, r.bottom - 1);
+		_gfx->blt(s, _resBalloonTail[winding], balloon->surface, LAYER_FOREGROUND, BALLOON_TRANSPARENT_COLOR_NS);
+	}
+
+	_numBalloons++;
+
+	return id;
+}
+
+
+int BalloonManager_ns::setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor) {
+
+	int16 w, h;
+
+	_gfx->getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
+
+	int id = createBalloon(w+5, h, winding, 1);
+	Balloon *balloon = &_intBalloons[id];
+
+	_gfx->drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+
+	// TODO: extract some text to make a name for obj
+	balloon->obj = _gfx->registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = x;
+	balloon->obj->y = y;
+	balloon->obj->transparentKey = BALLOON_TRANSPARENT_COLOR_NS;
+
+	return id;
+}
+
+int BalloonManager_ns::setDialogueBalloon(char *text, uint16 winding, byte textColor) {
+
+	int16 w, h;
+
+	_gfx->getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
+
+	int id = createBalloon(w+5, h, winding, 1);
+	Balloon *balloon = &_intBalloons[id];
+
+	_gfx->drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+
+	// TODO: extract some text to make a name for obj
+	balloon->obj = _gfx->registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = _dialogueBalloonX[id];
+	balloon->obj->y = 10;
+	balloon->obj->transparentKey = BALLOON_TRANSPARENT_COLOR_NS;
+
+	if (id > 0) {
+		balloon->obj->y += _intBalloons[id - 1].obj->y + _intBalloons[id - 1].outerBox.height();
+	}
+
+
+	return id;
+}
+
+void BalloonManager_ns::setBalloonText(uint id, char *text, byte textColor) {
+	Balloon *balloon = getBalloon(id);
+	balloon->surface->fillRect(balloon->innerBox, 1);
+	_gfx->drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+}
+
+
+int BalloonManager_ns::setLocationBalloon(char *text, bool endGame) {
+
+	int16 w, h;
+
+	_gfx->getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
+
+	int id = createBalloon(w+(endGame ? 5 : 10), h+5, -1, BALLOON_TRANSPARENT_COLOR_NS);
+	Balloon *balloon = &_intBalloons[id];
+	_gfx->drawWrappedText(_vm->_dialogueFont, balloon->surface, text, 0, MAX_BALLOON_WIDTH);
+
+	// TODO: extract some text to make a name for obj
+	balloon->obj = _gfx->registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = 5;
+	balloon->obj->y = 5;
+	balloon->obj->transparentKey = BALLOON_TRANSPARENT_COLOR_NS;
+
+	return id;
+}
+
+int BalloonManager_ns::hitTestDialogueBalloon(int x, int y) {
+
+	Common::Point p;
+
+	for (uint i = 0; i < _numBalloons; i++) {
+		p.x = x - _intBalloons[i].obj->x;
+		p.y = y - _intBalloons[i].obj->y;
+
+		if (_intBalloons[i].innerBox.contains(p))
+			return i;
+	}
+
+	return -1;
+}
+
+void BalloonManager_ns::freeBalloons() {
+	_gfx->destroyBalloons();
+
+	for (uint i = 0; i < _numBalloons; i++) {
+		_intBalloons[i].obj = 0;
+		_intBalloons[i].surface = 0;	// no need to delete surface, since it is done by destroyBalloons
+	}
+
+	_numBalloons = 0;
+}
+
+
+
+
+
+
+
+
+class BalloonManager_br : public BalloonManager {
+
+	struct Balloon {
+		Common::Rect box;
+		Graphics::Surface *surface;
+		GfxObj	*obj;
+	} _intBalloons[3];
+
+	uint	_numBalloons;
+
+	Frames *_leftBalloon;
+	Frames *_rightBalloon;
+	Disk *_disk;
+	Gfx *_gfx;
+
+	void cacheAnims();
+	void drawWrappedText(Font *font, Graphics::Surface* surf, char *text, byte color, int16 wrapwidth);
+	int createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness);
+	Balloon *getBalloon(uint id);
+	Graphics::Surface *expandBalloon(Frames *data, int frameNum);
+
+
+public:
+	BalloonManager_br(Disk *disk, Gfx *gfx);
+	~BalloonManager_br();
+
+	void freeBalloons();
+	int setLocationBalloon(char *text, bool endGame);
+	int setDialogueBalloon(char *text, uint16 winding, byte textColor);
+	int setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor);
+	void setBalloonText(uint id, char *text, byte textColor);
+	int hitTestDialogueBalloon(int x, int y);
+};
+
+
+
+BalloonManager_br::Balloon* BalloonManager_br::getBalloon(uint id) {
+	assert(id < _numBalloons);
+	return &_intBalloons[id];
+}
+
+Graphics::Surface *BalloonManager_br::expandBalloon(Frames *data, int frameNum) {
+
+	Common::Rect rect;
+	data->getRect(frameNum, rect);
+
+	rect.translate(-rect.left, -rect.top);
+
+	Graphics::Surface *surf = new Graphics::Surface;
+	surf->create(rect.width(), rect.height(), 1);
+
+	_gfx->unpackBlt(rect, data->getData(frameNum), data->getRawSize(frameNum), surf, 0, BALLOON_TRANSPARENT_COLOR_BR);
+
+	return surf;
+}
+
+int BalloonManager_br::setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor) {
+	cacheAnims();
+
+	int id = _numBalloons;
+	Frames *src = 0;
+	int srcFrame = 0;
+
+	Balloon *balloon = &_intBalloons[id];
+
+	if (winding == 0) {
+		src = _leftBalloon;
+		srcFrame = 0;
+	} else
+	if (winding == 1) {
+		src = _rightBalloon;
+		srcFrame = 0;
+	}
+
+	assert(src);
+
+	balloon->surface = expandBalloon(src, srcFrame);
+	src->getRect(srcFrame, balloon->box);
+
+//	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+
+	// TODO: extract some text to make a name for obj
+	balloon->obj = _gfx->registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = x;
+	balloon->obj->y = y;
+	balloon->obj->transparentKey = BALLOON_TRANSPARENT_COLOR_BR;
+
+	_numBalloons++;
+
+	return id;
+}
+
+int BalloonManager_br::setDialogueBalloon(char *text, uint16 winding, byte textColor) {
+	cacheAnims();
+
+	int id = _numBalloons;
+	Frames *src = 0;
+	int srcFrame = 0;
+
+	Balloon *balloon = &_intBalloons[id];
+
+	if (winding == 0) {
+		src = _leftBalloon;
+		srcFrame = id;
+	} else
+	if (winding == 1) {
+		src = _rightBalloon;
+		srcFrame = 0;
+	}
+
+	assert(src);
+
+	balloon->surface = expandBalloon(src, srcFrame);
+	src->getRect(srcFrame, balloon->box);
+
+//	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
+
+	// TODO: extract some text to make a name for obj
+	balloon->obj = _gfx->registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = 0;
+	balloon->obj->y = 10;
+	balloon->obj->transparentKey = BALLOON_TRANSPARENT_COLOR_BR;
+
+	if (id > 0) {
+		balloon->obj->y += _intBalloons[id - 1].obj->y + _intBalloons[id - 1].box.height();
+	}
+
+	_numBalloons++;
+
+	return id;
+}
+
+void BalloonManager_br::setBalloonText(uint id, char *text, byte textColor) { }
+
+int BalloonManager_br::setLocationBalloon(char *text, bool endGame) {
+/*
+	int16 w, h;
+
+	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
+
+	int id = createBalloon(w+(endGame ? 5 : 10), h+5, -1, BALLOON_TRANSPARENT_COLOR);
+	Balloon *balloon = &_intBalloons[id];
+	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, 0, MAX_BALLOON_WIDTH);
+
+	// TODO: extract some text to make a name for obj
+	balloon->obj = _gfx->registerBalloon(new SurfaceToFrames(balloon->surface), 0);
+	balloon->obj->x = 5;
+	balloon->obj->y = 5;
+*/
+	return 0;
+}
+
+int BalloonManager_br::hitTestDialogueBalloon(int x, int y) {
+
+	Common::Point p;
+
+	for (uint i = 0; i < _numBalloons; i++) {
+		p.x = x - _intBalloons[i].obj->x;
+		p.y = y - _intBalloons[i].obj->y;
+
+		if (_intBalloons[i].box.contains(p))
+			return i;
+	}
+
+	return -1;
+}
+
+void BalloonManager_br::freeBalloons() {
+	_gfx->destroyBalloons();
+
+	for (uint i = 0; i < _numBalloons; i++) {
+		_intBalloons[i].obj = 0;
+		_intBalloons[i].surface = 0;	// no need to delete surface, since it is done by destroyBalloons
+	}
+
+	_numBalloons = 0;
+}
+
+void BalloonManager_br::cacheAnims() {
+	if (!_leftBalloon) {
+		_leftBalloon = _disk->loadFrames("fumetto.ani");
+		_rightBalloon = _disk->loadFrames("fumdx.ani");
+	}
+}
+
+BalloonManager_br::BalloonManager_br(Disk *disk, Gfx *gfx) : _numBalloons(0), _disk(disk), _gfx(gfx), _leftBalloon(0), _rightBalloon(0) {
+}
+
+BalloonManager_br::~BalloonManager_br() {
+	delete _leftBalloon;
+	delete _rightBalloon;
+}
+
+void Parallaction::setupBalloonManager() {
+	if (_vm->getGameType() == GType_Nippon) {
+		_balloonMan = new BalloonManager_ns(_vm->_gfx);
+	} else
+	if (_vm->getGameType() == GType_BRA) {
+		_balloonMan = new BalloonManager_br(_vm->_disk, _vm->_gfx);
+	} else {
+		error("Unknown game type");
+	}
+}
+
+} // namespace Parallaction
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp
index 3ecc7a9534..7c053715f6 100644
--- a/engines/parallaction/callables_ns.cpp
+++ b/engines/parallaction/callables_ns.cpp
@@ -341,7 +341,7 @@ void Parallaction_ns::_c_endComment(void *param) {
 	}
 
 	_input->waitUntilLeftClick();
-	_gfx->freeBalloons();
+	_balloonMan->freeBalloons();
 
 	return;
 }
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 3b6c35d3bb..1dc4fd5ab3 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -93,7 +93,7 @@ uint16 DialogueManager::askPassword() {
 	uint16 passwordLen = 0;
 	_password[0] = '\0';
 
-	_vm->_gfx->setDialogueBalloon(_q->_answers[0]->_text, 1, 3);
+	_vm->_balloonMan->setDialogueBalloon(_q->_answers[0]->_text, 1, 3);
 	int id = _vm->_gfx->setItem(_answerer, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y);
 	_vm->_gfx->setItemFrame(id, 0);
 
@@ -118,7 +118,7 @@ uint16 DialogueManager::askPassword() {
 		}
 
 		if (changed) {
-			_vm->_gfx->setBalloonText(0, _q->_answers[0]->_text, 3);
+			_vm->_balloonMan->setBalloonText(0, _q->_answers[0]->_text, 3);
 			_vm->_gfx->updateScreen();
 			changed = false;
 		}
@@ -143,7 +143,7 @@ uint16 DialogueManager::askPassword() {
 
 	}
 
-	_vm->_gfx->hideDialogueStuff();
+	_vm->hideDialogueStuff();
 
 	return 0;
 
@@ -162,7 +162,7 @@ bool DialogueManager::displayAnswer(uint16 i) {
 	// display suitable answers
 	if (((a->_yesFlags & flags) == a->_yesFlags) && ((a->_noFlags & ~flags) == a->_noFlags)) {
 
-		int id = _vm->_gfx->setDialogueBalloon(a->_text, 1, 3);
+		int id = _vm->_balloonMan->setDialogueBalloon(a->_text, 1, 3);
 		assert(id >= 0);
 		_visAnswers[id] = i;
 
@@ -190,13 +190,13 @@ void DialogueManager::displayQuestion() {
 
 	if (!scumm_stricmp(_q->_text, "NULL")) return;
 
-	_vm->_gfx->setSingleBalloon(_q->_text, QUESTION_BALLOON_X, QUESTION_BALLOON_Y, _q->_mood & 0x10, 0);
+	_vm->_balloonMan->setSingleBalloon(_q->_text, QUESTION_BALLOON_X, QUESTION_BALLOON_Y, _q->_mood & 0x10, 0);
 	int id = _vm->_gfx->setItem(_questioner, QUESTION_CHARACTER_X, QUESTION_CHARACTER_Y);
 	_vm->_gfx->setItemFrame(id, _q->_mood & 0xF);
 
 	_vm->_gfx->updateScreen();
 	_vm->_input->waitUntilLeftClick();
-	_vm->_gfx->hideDialogueStuff();
+	_vm->hideDialogueStuff();
 
 	return;
 }
@@ -261,9 +261,9 @@ int16 DialogueManager::selectAnswer() {
 	_vm->_gfx->setItemFrame(id, _q->_answers[0]->_mood & 0xF);
 
 	if (numAvailableAnswers == 1) {
-		_vm->_gfx->setBalloonText(0, _q->_answers[0]->_text, 0);
+		_vm->_balloonMan->setBalloonText(0, _q->_answers[0]->_text, 0);
 		_vm->_input->waitUntilLeftClick();
-		_vm->_gfx->hideDialogueStuff();
+		_vm->hideDialogueStuff();
 		return 0;
 	}
 
@@ -277,15 +277,15 @@ int16 DialogueManager::selectAnswer() {
 		_vm->_input->readInput();
 		_vm->_input->getCursorPos(p);
 		event = _vm->_input->getLastButtonEvent();
-		selection = _vm->_gfx->hitTestDialogueBalloon(p.x, p.y);
+		selection = _vm->_balloonMan->hitTestDialogueBalloon(p.x, p.y);
 
 		if (selection != oldSelection) {
 			if (oldSelection != -1) {
-				_vm->_gfx->setBalloonText(oldSelection, _q->_answers[_visAnswers[oldSelection]]->_text, 3);
+				_vm->_balloonMan->setBalloonText(oldSelection, _q->_answers[_visAnswers[oldSelection]]->_text, 3);
 			}
 
 			if (selection != -1) {
-				_vm->_gfx->setBalloonText(selection, _q->_answers[_visAnswers[selection]]->_text, 0);
+				_vm->_balloonMan->setBalloonText(selection, _q->_answers[_visAnswers[selection]]->_text, 0);
 				_vm->_gfx->setItemFrame(0, _q->_answers[_visAnswers[selection]]->_mood & 0xF);
 			}
 		}
@@ -300,7 +300,7 @@ int16 DialogueManager::selectAnswer() {
 		oldSelection = selection;
 	}
 
-	_vm->_gfx->hideDialogueStuff();
+	_vm->hideDialogueStuff();
 
 	return _visAnswers[selection];
 }
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
index 348af2b731..734360167b 100644
--- a/engines/parallaction/exec_br.cpp
+++ b/engines/parallaction/exec_br.cpp
@@ -100,8 +100,13 @@ void Parallaction_br::setupSubtitles(char *s, char *s2, int y) {
 }
 
 void Parallaction_br::clearSubtitles() {
-	_gfx->hideLabel(_subtitle[0]);
-	_gfx->hideLabel(_subtitle[1]);
+	if (_subtitle[0] != -1) {
+		_gfx->hideLabel(_subtitle[0]);
+	}
+
+	if (_subtitle[1] != -1) {
+		_gfx->hideLabel(_subtitle[1]);
+	}
 }
 
 
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index bd2d54c0a0..abad9f273b 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -469,7 +469,7 @@ void Parallaction::displayComment(ExamineData *data) {
 		}
 
 		_gfx->setHalfbriteMode(true);
-		_gfx->setSingleBalloon(data->_description, 0, 90, 0, 0);
+		_balloonMan->setSingleBalloon(data->_description, 0, 90, 0, 0);
 		Common::Rect r;
 		data->_cnv->getRect(0, r);
 		id = _gfx->setItem(data->_cnv, 140, (_screenHeight - r.height())/2);
@@ -477,7 +477,7 @@ void Parallaction::displayComment(ExamineData *data) {
 		id = _gfx->setItem(_char._head, 100, 152);
 		_gfx->setItemFrame(id, 0);
 	} else {
-		_gfx->setSingleBalloon(data->_description, 140, 10, 0, 0);
+		_balloonMan->setSingleBalloon(data->_description, 140, 10, 0, 0);
 		id = _gfx->setItem(_char._talk, 190, 80);
 		_gfx->setItemFrame(id, 0);
 	}
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 24c78d1703..f839f88778 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -64,10 +64,6 @@ int32 Gfx::getVar(const Common::String &name) {
 
 
 #define	LABEL_TRANSPARENT_COLOR 0xFF
-#define	BALLOON_TRANSPARENT_COLOR 2
-
-
-int16 Gfx::_dialogueBalloonX[5] = { 80, 120, 150, 150, 150 };
 
 void halfbritePixel(int x, int y, int color, void *data) {
 	byte *buffer = (byte*)data;
@@ -238,37 +234,6 @@ void Palette::rotate(uint first, uint last, bool forward) {
 }
 
 
-#define BALLOON_TAIL_WIDTH	12
-#define BALLOON_TAIL_HEIGHT	10
-
-
-byte _resBalloonTail[2][BALLOON_TAIL_WIDTH*BALLOON_TAIL_HEIGHT] = {
-	{
-	  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
-	  0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x00, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-	},
-	{
-	  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
-	  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02,
-	  0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x02, 0x02,
-	  0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x02, 0x02
-	}
-};
-
 
 void Gfx::setPalette(Palette pal) {
 	byte sysPal[256*4];
@@ -777,7 +742,6 @@ Gfx::Gfx(Parallaction* vm) :
 
 	setPalette(_palette);
 
-	_numBalloons = 0;
 	_numItems = 0;
 	_floatingLabel = NO_FLOATING_LABEL;
 
@@ -828,44 +792,6 @@ void Gfx::setItemFrame(uint item, uint16 f) {
 	_items[item].data->setFlags(kGfxObjVisible);
 }
 
-Gfx::Balloon* Gfx::getBalloon(uint id) {
-	assert(id < _numBalloons);
-	return &_intBalloons[id];
-}
-
-int Gfx::createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness) {
-	assert(_numBalloons < 5);
-
-	int id = _numBalloons;
-
-	Gfx::Balloon *balloon = &_intBalloons[id];
-
-	int16 real_h = (winding == -1) ? h : h + 9;
-	balloon->surface = new Graphics::Surface;
-	balloon->surface->create(w, real_h, 1);
-	balloon->surface->fillRect(Common::Rect(w, real_h), BALLOON_TRANSPARENT_COLOR);
-
-	Common::Rect r(w, h);
-	balloon->surface->fillRect(r, 0);
-	balloon->outerBox = r;
-
-	r.grow(-borderThickness);
-	balloon->surface->fillRect(r, 1);
-	balloon->innerBox = r;
-
-	if (winding != -1) {
-		// draws tail
-		// TODO: this bitmap tail should only be used for Dos games. Amiga should use a polygon fill.
-		winding = (winding == 0 ? 1 : 0);
-		Common::Rect s(BALLOON_TAIL_WIDTH, BALLOON_TAIL_HEIGHT);
-		s.moveTo(r.width()/2 - 5, r.bottom - 1);
-		blt(s, _resBalloonTail[winding], balloon->surface, LAYER_FOREGROUND, BALLOON_TRANSPARENT_COLOR);
-	}
-
-	_numBalloons++;
-
-	return id;
-}
 
 GfxObj* Gfx::registerBalloon(Frames *frames, const char *text) {
 
@@ -873,7 +799,6 @@ GfxObj* Gfx::registerBalloon(Frames *frames, const char *text) {
 
 	obj->layer = LAYER_FOREGROUND;
 	obj->frame = 0;
-	obj->transparentKey = BALLOON_TRANSPARENT_COLOR;
 	obj->setFlags(kGfxObjVisible);
 
 	_balloons.push_back(obj);
@@ -881,110 +806,17 @@ GfxObj* Gfx::registerBalloon(Frames *frames, const char *text) {
 	return obj;
 }
 
-int Gfx::setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor) {
-
-	int16 w, h;
-
-	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
-
-	int id = createBalloon(w+5, h, winding, 1);
-	Gfx::Balloon *balloon = &_intBalloons[id];
-
-	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
-
-	// TODO: extract some text to make a name for obj
-	balloon->obj = registerBalloon(new SurfaceToFrames(balloon->surface), 0);
-	balloon->obj->x = x;
-	balloon->obj->y = y;
-
-	return id;
-}
-
-int Gfx::setDialogueBalloon(char *text, uint16 winding, byte textColor) {
-
-	int16 w, h;
-
-	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
-
-	int id = createBalloon(w+5, h, winding, 1);
-	Gfx::Balloon *balloon = &_intBalloons[id];
-
-	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
-
-	// TODO: extract some text to make a name for obj
-	balloon->obj = registerBalloon(new SurfaceToFrames(balloon->surface), 0);
-	balloon->obj->x = _dialogueBalloonX[id];
-	balloon->obj->y = 10;
-
-	if (id > 0) {
-		balloon->obj->y += _intBalloons[id - 1].obj->y + _intBalloons[id - 1].outerBox.height();
-	}
-
-
-	return id;
-}
-
-void Gfx::setBalloonText(uint id, char *text, byte textColor) {
-	Gfx::Balloon *balloon = getBalloon(id);
-	balloon->surface->fillRect(balloon->innerBox, 1);
-	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, textColor, MAX_BALLOON_WIDTH);
-}
-
-
-int Gfx::setLocationBalloon(char *text, bool endGame) {
-
-	int16 w, h;
-
-	getStringExtent(_vm->_dialogueFont, text, MAX_BALLOON_WIDTH, &w, &h);
-
-	int id = createBalloon(w+(endGame ? 5 : 10), h+5, -1, BALLOON_TRANSPARENT_COLOR);
-	Gfx::Balloon *balloon = &_intBalloons[id];
-	drawWrappedText(_vm->_dialogueFont, balloon->surface, text, 0, MAX_BALLOON_WIDTH);
-
-	// TODO: extract some text to make a name for obj
-	balloon->obj = registerBalloon(new SurfaceToFrames(balloon->surface), 0);
-	balloon->obj->x = 5;
-	balloon->obj->y = 5;
-
-	return id;
-}
-
-int Gfx::hitTestDialogueBalloon(int x, int y) {
-
-	Common::Point p;
-
-	for (uint i = 0; i < _numBalloons; i++) {
-		p.x = x - _intBalloons[i].obj->x;
-		p.y = y - _intBalloons[i].obj->y;
-
-		if (_intBalloons[i].innerBox.contains(p))
-			return i;
+void Gfx::destroyBalloons() {
+	for (uint i = 0; i < _balloons.size(); i++) {
+		delete _balloons[i];
 	}
-
-	return -1;
-}
-
-
-void Gfx::freeBalloons() {
 	_balloons.clear();
-
-	for (uint i = 0; i < _numBalloons; i++) {
-		delete _intBalloons[i].obj;
-		_intBalloons[i].obj = 0;
-		_intBalloons[i].surface = 0;	// no need to delete surface, since it is done by obj (GfxObj)
-	}
-	_numBalloons = 0;
 }
 
 void Gfx::freeItems() {
 	_numItems = 0;
 }
 
-void Gfx::hideDialogueStuff() {
-	freeItems();
-	freeBalloons();
-}
-
 void Gfx::freeBackground() {
 	_backgroundInfo.free();
 }
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index b15da432d9..00718d8c26 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -450,6 +450,20 @@ enum {
 	kBackgroundSlide = 2
 };
 
+
+class BalloonManager {
+public:
+	virtual ~BalloonManager() { }
+
+	virtual void freeBalloons() = 0;
+	virtual int setLocationBalloon(char *text, bool endGame) = 0;
+	virtual int setDialogueBalloon(char *text, uint16 winding, byte textColor) = 0;
+	virtual int setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor) = 0;
+	virtual void setBalloonText(uint id, char *text, byte textColor) = 0;
+	virtual int hitTestDialogueBalloon(int x, int y) = 0;
+};
+
+
 typedef Common::HashMap<Common::String, int32, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> VarMap;
 
 class Gfx {
@@ -479,13 +493,9 @@ public:
 	void freeLabels();
 
 	// dialogue balloons
-	int setLocationBalloon(char *text, bool endGame);
-	int setDialogueBalloon(char *text, uint16 winding, byte textColor);
-	int setSingleBalloon(char *text, uint16 x, uint16 y, uint16 winding, byte textColor);
-	void setBalloonText(uint id, char *text, byte textColor);
-	int hitTestDialogueBalloon(int x, int y);
 	void getStringExtent(Font *font, char *text, uint16 maxwidth, int16* width, int16* height);
 	GfxObj* registerBalloon(Frames *frames, const char *text);
+	void destroyBalloons();
 
 	// other items
 	int setItem(GfxObj* obj, uint16 x, uint16 y, byte transparentColor = 0);
@@ -551,16 +561,6 @@ protected:
 	int32 				getRenderMode(const char *type);
 
 public:
-	static int16 _dialogueBalloonX[5];
-
-	struct Balloon {
-		Common::Rect outerBox;
-		Common::Rect innerBox;
-		Graphics::Surface *surface;
-		GfxObj	*obj;
-	} _intBalloons[5];
-
-	uint	_numBalloons;
 
 	struct Item {
 		GfxObj *data;
@@ -585,9 +585,6 @@ public:
 
 	void copyRect(const Common::Rect &r, Graphics::Surface &src, Graphics::Surface &dst);
 
-	int createBalloon(int16 w, int16 h, int16 winding, uint16 borderThickness);
-	Balloon *getBalloon(uint id);
-
 	// low level text and patches
 	void drawText(Font *font, Graphics::Surface* surf, uint16 x, uint16 y, const char *text, byte color);
 	void drawWrappedText(Font *font, Graphics::Surface* surf, char *text, byte color, int16 wrapwidth);
diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp
index 5551108693..0be070e345 100644
--- a/engines/parallaction/gui_br.cpp
+++ b/engines/parallaction/gui_br.cpp
@@ -195,7 +195,7 @@ int Parallaction_br::guiShowMenu() {
 	}
 
 	_system->showMouse(false);
-	_gfx->hideDialogueStuff();
+	hideDialogueStuff();
 
 	for (i = 0; i < availItems; i++) {
 		delete _lines[i];
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index e758bbd41c..65acbcfe58 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -174,7 +174,7 @@ void Input::updateGameInput() {
 void Input::updateCommentInput() {
 	waitUntilLeftClick();
 
-	_vm->_gfx->hideDialogueStuff();
+	_vm->hideDialogueStuff();
 	_vm->_gfx->setHalfbriteMode(false);
 
 	_inputMode = kInputModeGame;
diff --git a/engines/parallaction/module.mk b/engines/parallaction/module.mk
index 2478b4b2e1..92c6ec5227 100644
--- a/engines/parallaction/module.mk
+++ b/engines/parallaction/module.mk
@@ -1,6 +1,7 @@
 MODULE := engines/parallaction
 
 MODULE_OBJS := \
+	balloons_o \
 	callables_br.o \
 	callables_ns.o \
 	debug.o \
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 5f5cfdb820..3a52b28e06 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -134,6 +134,8 @@ int Parallaction::init() {
 
 	_debugger = new Debugger(this);
 
+	setupBalloonManager();
+
 	return 0;
 }
 
@@ -281,7 +283,7 @@ void Parallaction::setBackground(const char* name, const char* mask, const char*
 }
 
 void Parallaction::showLocationComment(const char *text, bool end) {
-	_gfx->setLocationBalloon(const_cast<char*>(text), end);
+	_balloonMan->setLocationBalloon(const_cast<char*>(text), end);
 }
 
 
@@ -422,7 +424,7 @@ void Parallaction::doLocationEnterTransition() {
 
 	showLocationComment(_location._comment, false);
 	_input->waitUntilLeftClick();
-	_gfx->freeBalloons();
+	_balloonMan->freeBalloons();
 
 	// fades maximum intensity palette towards approximation of main palette
 	for (uint16 _si = 0; _si<6; _si++) {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index b1a5995e28..c095cab667 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -429,6 +429,15 @@ public:
 	Inventory *_inventory;
 	InventoryRenderer *_inventoryRenderer;
 
+	BalloonManager *_balloonMan;
+
+	void setupBalloonManager();
+
+	void hideDialogueStuff() {
+		_gfx->freeItems();
+		_balloonMan->freeBalloons();
+	}
+
 };
 
 
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index b22e1b0f2d..e7f08d0339 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -80,6 +80,9 @@ int Parallaction_br::init() {
 
 	_part = -1;
 
+	_subtitle[0] = -1;
+	_subtitle[1] = -1;
+
 	Parallaction::init();
 
 	return 0;
-- 
cgit v1.2.3


From 60db8cb8cf9b39b591fd5c9d0c754cbc3577b765 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 4 Jul 2008 00:35:39 +0000
Subject: Correct typo.

svn-id: r32903
---
 engines/parallaction/module.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/parallaction/module.mk b/engines/parallaction/module.mk
index 92c6ec5227..fb867f5285 100644
--- a/engines/parallaction/module.mk
+++ b/engines/parallaction/module.mk
@@ -1,7 +1,7 @@
 MODULE := engines/parallaction
 
 MODULE_OBJS := \
-	balloons_o \
+	balloons.o \
 	callables_br.o \
 	callables_ns.o \
 	debug.o \
-- 
cgit v1.2.3


From 357f0c4e3abc23e1a4c711191c1aeca0bfe47000 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 5 Jul 2008 07:47:27 +0000
Subject: Added spanish menu strings for spanish fan translation of Kyrandia 3.

svn-id: r32911
---
 engines/kyra/kyra_mr.cpp   | 5 +++++
 engines/kyra/kyra_mr.h     | 4 +++-
 engines/kyra/staticres.cpp | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index b425c0929f..3d1b09561d 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -343,6 +343,11 @@ void KyraEngine_MR::initMainMenu() {
 		0x80, 0xFF
 	};
 
+	if (_flags.lang == Common::ES_ESP) {
+		for (int i = 0; i < 4; ++i)
+			data.strings[i] = _mainMenuSpanishFan[i];
+	}
+
 	MainMenu::Animation anim;
 	anim.anim = _menuAnim;
 	anim.startFrame = 29;
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 5af138373c..aa103b167b 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -184,9 +184,11 @@ private:
 
 private:
 	// main menu
-	const char *const *_mainMenuStrings;
+	const char * const *_mainMenuStrings;
 	int _mainMenuStringsSize;
 
+	static const char * const _mainMenuSpanishFan[];
+
 	// animator
 	uint8 *_gamePlayBuffer;
 	void restorePage3();
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 5d094fa13f..a25fe4b295 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1980,6 +1980,13 @@ const char *KyraEngine_MR::_languageExtension[] = {
 	"TRS"*/
 };
 
+const char * const KyraEngine_MR::_mainMenuSpanishFan[] = {
+	"Nouvelle Partie",
+	"Ver Intro",
+	"Restaurar",
+	"Finalizar"
+};
+
 const int KyraEngine_MR::_languageExtensionSize = ARRAYSIZE(KyraEngine_MR::_languageExtension);
 
 const KyraEngine_MR::ShapeDesc KyraEngine_MR::_shapeDescs[] = {
-- 
cgit v1.2.3


From 056288f87a2e5ad5251c81901320b2b14ca22443 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 5 Jul 2008 08:20:10 +0000
Subject: Added support for Italian fan translation of Kyrandia 3. (see
 fr#2003504 "KYRA: add support for Italian version of Kyrandia 2&3")

svn-id: r32912
---
 engines/kyra/detection.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 engines/kyra/kyra_mr.cpp   |  3 +++
 engines/kyra/kyra_mr.h     |  1 +
 engines/kyra/kyra_v1.cpp   | 10 ++++++++--
 engines/kyra/staticres.cpp |  7 +++++++
 5 files changed, 65 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index f55cd1ac5e..0c8acb59b7 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -654,6 +654,52 @@ const KYRAGameDescription adGameDescs[] = {
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
 
+	// Itlian fan translation, see fr#2003504 "KYRA: add support for Italian version of Kyrandia 2&3"
+	{
+		{
+			"kyra3",
+			0,
+			{
+				{ "ONETIME.PAK", 0, "ee2d4d056a5de5333a3c6bda055b3cb4", -1 },
+				{ "AUD.PAK", 0, 0, -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
+	},
+	{
+		{
+			"kyra3",
+			0,
+			{
+				{ "ONETIME.PAK", 0, "ee2d4d056a5de5333a3c6bda055b3cb4", -1 },
+				{ "AUD.PAK", 0, 0, -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::DE_DEU,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
+	},
+	{
+		{
+			"kyra3",
+			0,
+			{
+				{ "ONETIME.PAK", 0, "ee2d4d056a5de5333a3c6bda055b3cb4", -1 },
+				{ "AUD.PAK", 0, 0, -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::IT_ITA,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
+	},
 	{ AD_TABLE_END_MARKER, FLAGS(0, 0, 0, 0, 0, 0, 0) }
 };
 
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 3d1b09561d..a4e5b58364 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -346,6 +346,9 @@ void KyraEngine_MR::initMainMenu() {
 	if (_flags.lang == Common::ES_ESP) {
 		for (int i = 0; i < 4; ++i)
 			data.strings[i] = _mainMenuSpanishFan[i];
+	} else if (_flags.lang == Common::IT_ITA) {
+		for (int i = 0; i < 4; ++i)
+			data.strings[i] = _mainMenuItalianFan[i];
 	}
 
 	MainMenu::Animation anim;
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index aa103b167b..5f9f6f91a3 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -188,6 +188,7 @@ private:
 	int _mainMenuStringsSize;
 
 	static const char * const _mainMenuSpanishFan[];
+	static const char * const _mainMenuItalianFan[];
 
 	// animator
 	uint8 *_gamePlayBuffer;
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index d2e0f37a60..117194aea2 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -247,8 +247,14 @@ void KyraEngine_v1::delayWithTicks(int ticks) {
 void KyraEngine_v1::registerDefaultSettings() {
 	if (_flags.gameID != GI_KYRA3)
 		ConfMan.registerDefault("cdaudio", (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98));
-	if (_flags.fanLang != Common::UNK_LANG)
-		ConfMan.registerDefault("subtitles", true);
+	if (_flags.fanLang != Common::UNK_LANG) {
+		// HACK/WORKAROUND: Since we can't use registerDefault here to overwrite
+		// the global subtitles settings, we're using this hack to enable subtitles
+		// for fan translations
+		const Common::ConfigManager::Domain *cur = ConfMan.getActiveDomain();
+		if (!cur || (cur && cur->get("subtitles").empty()))
+			ConfMan.setBool("subtitles", true);
+	}
 }
 
 void KyraEngine_v1::readSettings() {
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index a25fe4b295..1997039c4a 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1987,6 +1987,13 @@ const char * const KyraEngine_MR::_mainMenuSpanishFan[] = {
 	"Finalizar"
 };
 
+const char * const KyraEngine_MR::_mainMenuItalianFan[] = {
+	"Nuova Partita",
+	"Introduzione",
+	"Carica una partita",
+	"Esci dal gioco"
+};
+
 const int KyraEngine_MR::_languageExtensionSize = ARRAYSIZE(KyraEngine_MR::_languageExtension);
 
 const KyraEngine_MR::ShapeDesc KyraEngine_MR::_shapeDescs[] = {
-- 
cgit v1.2.3


From 1cc9af6b1023d438193587171890bf2ca7d5adbf Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 6 Jul 2008 18:37:52 +0000
Subject: Implemented Good Enough(TM) XMIDI looping. This is used by Kyrandia 2
 (the loop hack is no longer needed, and has been removed), and will be used
 by Discworld.

svn-id: r32930
---
 engines/kyra/sound.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index f56c43aabd..c768255272 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -249,21 +249,6 @@ void SoundMidiPC::close() {
 }
 
 void SoundMidiPC::send(uint32 b) {
-	// HACK: For Kyrandia, we make the simplifying assumption that a song
-	// either loops in its entirety, or not at all. So if we see a FOR_LOOP
-	// controller event, we turn on looping even if there isn't any
-	// corresponding NEXT_BREAK event.
-	//
-	// This is a gross over-simplification of how XMIDI handles loops. If
-	// anyone feels like doing a proper implementation, please refer to
-	// the Exult project, and do it in midiparser_xmidi.cpp
-
-	if ((b & 0xFFF0) == 0x74B0 && _eventFromMusic) {
-		debugC(9, kDebugLevelMain | kDebugLevelSound, "SoundMidiPC: Looping song");
-		_musicParser->property(MidiParser::mpAutoLoop, true);
-		return;
-	}
-
 	if (_passThrough) {
 		if ((b & 0xFFF0) == 0x007BB0)
 			return;
-- 
cgit v1.2.3


From 0f8f3d51bba952632eb5ee5926cad8814cd19c74 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 7 Jul 2008 14:51:27 +0000
Subject: Fixed regression after label code refactoring.

svn-id: r32940
---
 engines/parallaction/graphics.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index f839f88778..93ebdd3a65 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -649,6 +649,7 @@ void Gfx::freeLabels() {
 		delete _labels[i];
 	}
 	_labels.clear();
+	_floatingLabel = NO_FLOATING_LABEL;
 }
 
 void Gfx::drawLabels() {
-- 
cgit v1.2.3


From 741214b6568abc10992701cc284569c318181e93 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 7 Jul 2008 19:40:43 +0000
Subject: Some fixes for warnings under GCC 2.95

svn-id: r32948
---
 engines/m4/globals.cpp | 10 ++++++----
 engines/m4/globals.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/m4/globals.cpp b/engines/m4/globals.cpp
index 12d9a24d37..58c68979d1 100644
--- a/engines/m4/globals.cpp
+++ b/engines/m4/globals.cpp
@@ -75,7 +75,7 @@ bool Kernel::sendTrigger(int32 triggerNum) {
 
 bool Kernel::handleTrigger(int32 triggerNum) {
 
-	printf("betweenRooms = %d; triggerNum = %08X\n", betweenRooms, triggerNum);
+	printf("betweenRooms = %d; triggerNum = %08X\n", betweenRooms, (uint)triggerNum);
 
 	if (betweenRooms)
 		return true;
@@ -271,11 +271,13 @@ Globals::Globals(M4Engine *vm): _vm(vm) {
 }
 
 Globals::~Globals() {
-	for(uint32 i = 0; i < _madsVocab.size(); i++)
+	uint32 i;
+
+	for(i = 0; i < _madsVocab.size(); i++)
 		free(_madsVocab[i]);
 	_madsVocab.clear();
 
-	for(uint32 i = 0; i < _madsQuotes.size(); i++)
+	for(i = 0; i < _madsQuotes.size(); i++)
 		free(_madsQuotes[i]);
 	_madsQuotes.clear();
 
@@ -351,7 +353,7 @@ void Globals::loadMadsMessagesInfo() {
 	_vm->res()->toss("messages.dat");
 }
 
-char* Globals::loadMessage(uint32 index) {
+char* Globals::loadMessage(uint index) {
 	if (index > _madsMessages.size() - 1) {
 		warning("Invalid message index: %i", index);
 		return NULL;
diff --git a/engines/m4/globals.h b/engines/m4/globals.h
index a0133db2d6..a80e8bf710 100644
--- a/engines/m4/globals.h
+++ b/engines/m4/globals.h
@@ -177,7 +177,7 @@ public:
 
 	void loadMadsMessagesInfo();
 	uint32 getMessagesSize() { return _madsMessages.size(); }
-	char* loadMessage(uint32 index);
+	char* loadMessage(uint index);
 };
 
 #define PLAYER_FIELD_LENGTH 40
-- 
cgit v1.2.3


From aee23f36a2b0ed26588c40d96ef0eee53c482d75 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 7 Jul 2008 20:40:35 +0000
Subject: Fix for bug #2012293 "KYRA: Bad Spanish String in menu".

svn-id: r32949
---
 engines/kyra/staticres.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 1997039c4a..4f577c1d1e 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1976,12 +1976,14 @@ const char *KyraEngine_MR::_languageExtension[] = {
 	"TRE",
 	"TRF",
 	"TRG"/*,
-	"TRI",		Italian and Spanish were never included
-	"TRS"*/
+	"TRI",		Italian and Spanish were never included, the supported fan translations are using
+	"TRS"		English/French extensions thus overwriting these languages */		
 };
 
+const int KyraEngine_MR::_languageExtensionSize = ARRAYSIZE(KyraEngine_MR::_languageExtension);
+
 const char * const KyraEngine_MR::_mainMenuSpanishFan[] = {
-	"Nouvelle Partie",
+	"Nueva Partida",
 	"Ver Intro",
 	"Restaurar",
 	"Finalizar"
@@ -1994,8 +1996,6 @@ const char * const KyraEngine_MR::_mainMenuItalianFan[] = {
 	"Esci dal gioco"
 };
 
-const int KyraEngine_MR::_languageExtensionSize = ARRAYSIZE(KyraEngine_MR::_languageExtension);
-
 const KyraEngine_MR::ShapeDesc KyraEngine_MR::_shapeDescs[] = {
 	{ 57, 91, -31, -82 },
 	{ 57, 91, -31, -82 },
-- 
cgit v1.2.3


From e74d01a59a17894a85723db3b9af4dacac659336 Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Mon, 7 Jul 2008 22:02:01 +0000
Subject: Fix for bathroom door opening crash in Operation Stealth's start.

svn-id: r32951
---
 engines/cine/gfx.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines')

diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 47446f2410..2b7f3b8890 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -969,6 +969,7 @@ void OSRenderer::drawBackground() {
 
 /*! \brief Draw one overlay
  * \param it Overlay info
+ * \todo Add handling of type 22 overlays
  */
 void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 	int len;
@@ -979,6 +980,9 @@ void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 	switch (it->type) {
 	// color sprite
 	case 0:
+		if (objectTable[it->objIdx].frame < 0) {
+			break;
+		}
 		sprite = animDataTable + objectTable[it->objIdx].frame;
 		len = sprite->_realWidth * sprite->_height;
 		mask = new byte[len];
@@ -988,6 +992,13 @@ void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 		delete[] mask;
 		break;
 
+	// bitmap
+	case 4:
+		if (objectTable[it->objIdx].frame >= 0) {
+			FWRenderer::renderOverlay(it);
+		}
+		break;
+
 	// masked background
 	case 20:
 		assert(it->objIdx < NUM_MAX_OBJECT);
-- 
cgit v1.2.3


From dadb771cdcdba41c795053b5115f04109b8fd545 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 8 Jul 2008 10:29:35 +0000
Subject: Remove reference to kPlainSoundType

svn-id: r32960
---
 engines/scumm/imuse_digi/dimuse_track.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/imuse_digi/dimuse_track.h b/engines/scumm/imuse_digi/dimuse_track.h
index 33147128cb..2d4c673cf6 100644
--- a/engines/scumm/imuse_digi/dimuse_track.h
+++ b/engines/scumm/imuse_digi/dimuse_track.h
@@ -85,13 +85,15 @@ struct Track {
 	int getPan() const { return (pan != 64) ? 2 * pan - 127 : 0; }
 	int getVol() const { return vol / 1000; }
 	Audio::Mixer::SoundType getType() const {
-		Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
+		Audio::Mixer::SoundType type;
 		if (volGroupId == 1)
 			type = Audio::Mixer::kSpeechSoundType;
 		else if (volGroupId == 2)
 			type = Audio::Mixer::kSFXSoundType;
 		else if (volGroupId == 3)
 			type = Audio::Mixer::kMusicSoundType;
+		else
+			error("Track::getType(): invalid sound type");
 		return type;
 	}
 };
-- 
cgit v1.2.3


From 03b36a3a544b7ae36e4528bc63039f7f3de475bb Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 8 Jul 2008 11:18:44 +0000
Subject: Shut couple of MSVC warnings

svn-id: r32961
---
 engines/m4/converse.cpp | 2 +-
 engines/m4/resource.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp
index a85fdea02f..5b8bdab9d6 100644
--- a/engines/m4/converse.cpp
+++ b/engines/m4/converse.cpp
@@ -380,7 +380,7 @@ void Converse::loadConversation(const char *convName) {
 	uint32 size;
 	uint32 chunk;
 	uint32 data = 0;
-	uint32 i;
+	uint32 i = 0;
 	ConvEntry* curEntry = NULL;
 	ConvEntry* replyEntry = NULL;
 	int32 currentWeightedEntry = -1;
diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp
index 57816b6600..074cab1095 100644
--- a/engines/m4/resource.cpp
+++ b/engines/m4/resource.cpp
@@ -310,7 +310,7 @@ const char *MADSResourceManager::getResourceFilename(const char *resourceName) {
 
 Common::SeekableReadStream *MADSResourceManager::loadResource(const char *resourceName, bool loadFlag) {
 	Common::File hagFile;
-	uint32 offset, size;
+	uint32 offset, size = 0;
 
 	// If the first character is a '@' then look for an external file
 	
-- 
cgit v1.2.3


From 4a1cc7801661425c0e2eee527e886cd0f6b57263 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Tue, 8 Jul 2008 11:35:09 +0000
Subject: Modified the EGA story image delay to work for the Mac versions as
 well

svn-id: r32962
---
 engines/gob/inter.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp
index 9c39653a1d..df9c1353a0 100644
--- a/engines/gob/inter.cpp
+++ b/engines/gob/inter.cpp
@@ -212,25 +212,35 @@ void Inter::funcBlock(int16 retFlag) {
 			break;
 
 		// WORKAROUND:
-		// The EGA version of gob1 doesn't add a delay after showing
+		// The EGA and Mac versions of gob1 doesn't add a delay after showing
 		// images between levels. We manually add it here.
-		if ((_vm->getGameType() == kGameTypeGob1) && _vm->isEGA()) {
+		if ((_vm->getGameType() == kGameTypeGob1) &&
+		   (_vm->isEGA() || (_vm->getPlatform() == Common::kPlatformMacintosh))) {
+
 			int addr = _vm->_global->_inter_execPtr-_vm->_game->_totFileData;
-			if ((startaddr == 0x18B4 && addr == 0x1A7F && // Zombie
+
+			if ((startaddr == 0x18B4 && addr == 0x1A7F && // Zombie, EGA
+				 !strncmp(_vm->_game->_curTotFile, "avt005.tot", 10)) ||
+			  (startaddr == 0x188D && addr == 0x1A58 && // Zombie, Mac
 				 !strncmp(_vm->_game->_curTotFile, "avt005.tot", 10)) ||
 				(startaddr == 0x1299 && addr == 0x139A && // Dungeon
 				 !strncmp(_vm->_game->_curTotFile, "avt006.tot", 10)) ||
-				(startaddr == 0x11C0 && addr == 0x12C9 && // Cauldron
+				(startaddr == 0x11C0 && addr == 0x12C9 && // Cauldron, EGA
+				 !strncmp(_vm->_game->_curTotFile, "avt012.tot", 10)) ||
+				(startaddr == 0x11C8 && addr == 0x1341 && // Cauldron, Mac
 				 !strncmp(_vm->_game->_curTotFile, "avt012.tot", 10)) ||
 				(startaddr == 0x09F2 && addr == 0x0AF3 && // Statue
 				 !strncmp(_vm->_game->_curTotFile, "avt016.tot", 10)) ||
 				(startaddr == 0x0B92 && addr == 0x0C93 && // Castle
 				 !strncmp(_vm->_game->_curTotFile, "avt019.tot", 10)) ||
-				(startaddr == 0x17D9 && addr == 0x18DA && // Finale
+				(startaddr == 0x17D9 && addr == 0x18DA && // Finale, EGA
+				 !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10)) ||
+				(startaddr == 0x17E9 && addr == 0x19A8 && // Finale, Mac
 				 !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10))) {
 
 				_vm->_util->longDelay(5000);
 			}
+
 		} // End of workaround
 
 		cmd = *_vm->_global->_inter_execPtr;
-- 
cgit v1.2.3


From da0495cd786b7e8a874024a657e062a49a665fba Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Tue, 8 Jul 2008 11:36:52 +0000
Subject: Added a Gob1 version supplied by raina in the forums. It does look
 like the Mac version with a DOS executable and stripped music to me, so let's
 hope the Mac level image workaround works there as well.

svn-id: r32963
---
 engines/gob/detection.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'engines')

diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 8351f2ecfb..63a0f8f45b 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -277,6 +277,19 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesNone,
 		"intro"
 	},
+	{ // Supplied by raina in the forums
+		{
+			"gob1",
+			"",
+			AD_ENTRY1s("intro.stk", "6d837c6380d8f4d984c9f6cc0026df4f", 192712),
+			EN_ANY,
+			kPlatformMacintosh,
+			Common::ADGF_NO_FLAGS
+		},
+		kGameTypeGob1,
+		kFeaturesNone,
+		"intro"
+	},
 	{ // Supplied by paul66 in bug report #1652352
 		{
 			"gob1",
-- 
cgit v1.2.3


From 8093dbaf49ae54aac783cdf996911c459aac5468 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 8 Jul 2008 11:48:16 +0000
Subject: One more MSVC warning

svn-id: r32964
---
 engines/m4/resource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp
index 074cab1095..5070a2b79c 100644
--- a/engines/m4/resource.cpp
+++ b/engines/m4/resource.cpp
@@ -310,7 +310,7 @@ const char *MADSResourceManager::getResourceFilename(const char *resourceName) {
 
 Common::SeekableReadStream *MADSResourceManager::loadResource(const char *resourceName, bool loadFlag) {
 	Common::File hagFile;
-	uint32 offset, size = 0;
+	uint32 offset = 0, size = 0;
 
 	// If the first character is a '@' then look for an external file
 	
-- 
cgit v1.2.3


From a294d222136a72534871d2030f828891762146ed Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Wed, 9 Jul 2008 02:49:20 +0000
Subject: Added a couple of NULLity checks.

svn-id: r32972
---
 engines/parallaction/gfxbase.cpp | 4 +++-
 engines/parallaction/sound.cpp   | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index 8d7041305d..3e9bd79e5d 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -133,7 +133,9 @@ void Gfx::showGfxObj(GfxObj* obj, bool visible) {
 //		return;
 //	}
 
-	assert(obj);
+	if (!obj) {
+		return;
+	}
 
 	if (visible) {
 		obj->setFlags(kGfxObjVisible);
diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp
index dd74e8f7aa..d9e78f3a9e 100644
--- a/engines/parallaction/sound.cpp
+++ b/engines/parallaction/sound.cpp
@@ -249,6 +249,9 @@ void DosSoundMan::stopMusic() {
 }
 
 void DosSoundMan::playCharacterMusic(const char *character) {
+	if (character == NULL) {
+		return;
+	}
 
 	if (!scumm_stricmp(_vm->_location._name, "night") ||
 		!scumm_stricmp(_vm->_location._name, "intsushi")) {
-- 
cgit v1.2.3


From 18b48c74a9de417254badf23744d5c5f73c2966c Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Wed, 9 Jul 2008 10:52:46 +0000
Subject: Fixed regression introduced with GfxObj: the character sprite was
 sometimes removed from the rendering list.

svn-id: r32974
---
 engines/parallaction/gfxbase.cpp         | 25 ++++++++++++++-----------
 engines/parallaction/graphics.h          |  9 ++++++---
 engines/parallaction/parallaction.cpp    | 12 +++++++++---
 engines/parallaction/parallaction_br.cpp |  2 +-
 engines/parallaction/parallaction_ns.cpp |  3 +++
 5 files changed, 33 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index 3e9bd79e5d..9e7eb12ed8 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -32,7 +32,7 @@
 
 namespace Parallaction {
 
-GfxObj::GfxObj(uint objType, Frames *frames, const char* name) : type(objType), _frames(frames), x(0), y(0), z(0), frame(0), layer(3), _flags(0), _keep(true) {
+GfxObj::GfxObj(uint objType, Frames *frames, const char* name) : type(objType), _frames(frames), x(0), y(0), z(0), frame(0), layer(3), _flags(kGfxObjNormal), _keep(true) {
 	if (name) {
 		_name = strdup(name);
 	} else {
@@ -124,15 +124,22 @@ GfxObj* Gfx::loadDoor(const char *name) {
 	return obj;
 }
 
-void Gfx::clearGfxObjects() {
-	_gfxobjList.clear();
+void Gfx::clearGfxObjects(uint filter) {
+
+	GfxObjList::iterator b = _gfxobjList.begin();
+	GfxObjList::iterator e = _gfxobjList.end();
+
+	for ( ; b != e; ) {
+		if (((*b)->_flags & filter) != 0) {
+			b = _gfxobjList.erase(b);
+		} else {
+			b++;
+		}
+	}
+
 }
 
 void Gfx::showGfxObj(GfxObj* obj, bool visible) {
-//	if (!obj || obj->isVisible() == visible) {
-//		return;
-//	}
-
 	if (!obj) {
 		return;
 	}
@@ -141,9 +148,7 @@ void Gfx::showGfxObj(GfxObj* obj, bool visible) {
 		obj->setFlags(kGfxObjVisible);
 	} else {
 		obj->clearFlags(kGfxObjVisible);
-//		_gfxobjList.remove(obj);
 	}
-
 }
 
 
@@ -187,8 +192,6 @@ void Gfx::drawGfxObjects(Graphics::Surface &surf) {
 
 	sortAnimations();
 	// TODO: some zones don't appear because of wrong masking (3 or 0?)
-	// TODO: Dr.Ki is not visible inside the club
-
 
 	GfxObjList::iterator b = _gfxobjList.begin();
 	GfxObjList::iterator e = _gfxobjList.end();
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 00718d8c26..09f4b2f244 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -340,12 +340,15 @@ class Disk;
 enum {
 	kGfxObjVisible = 1,
 
+	kGfxObjNormal = 2,
+	kGfxObjCharacter = 4,
 
 	kGfxObjTypeDoor = 0,
 	kGfxObjTypeGet = 1,
 	kGfxObjTypeAnim = 2,
 	kGfxObjTypeLabel = 3,
-	kGfxObjTypeBalloon = 4
+	kGfxObjTypeBalloon = 4,
+	kGfxObjTypeCharacter = 8
 };
 
 enum {
@@ -356,7 +359,6 @@ enum {
 class GfxObj {
 	char *_name;
 	Frames *_frames;
-	uint32 _flags;
 
 	bool _keep;
 
@@ -365,6 +367,7 @@ public:
 
 	int32 z;
 
+	uint32 _flags;
 
 	uint type;
 	uint frame;
@@ -478,7 +481,7 @@ public:
 	GfxObj* loadDoor(const char *name);
 	void drawGfxObjects(Graphics::Surface &surf);
 	void showGfxObj(GfxObj* obj, bool visible);
-	void clearGfxObjects();
+	void clearGfxObjects(uint filter);
 	void sortAnimations();
 
 
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 3a52b28e06..ca99d2a789 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -91,6 +91,8 @@ Parallaction::~Parallaction() {
 	delete _globalTable;
 	delete _callableNames;
 
+	_gfx->clearGfxObjects(kGfxObjCharacter | kGfxObjNormal);
+	hideDialogueStuff();
 	freeLocation();
 
 	freeCharacter();
@@ -166,6 +168,8 @@ void Parallaction::freeCharacter() {
 	delete _objectsNames;
 	_objectsNames = 0;
 
+	_gfx->clearGfxObjects(kGfxObjCharacter);
+
 	_char.free();
 
 	return;
@@ -248,7 +252,7 @@ void Parallaction::freeLocation() {
 
 	_location._walkNodes.clear();
 
-	_gfx->clearGfxObjects();
+	_gfx->clearGfxObjects(kGfxObjNormal);
 	freeBackground();
 
 	_location._programs.clear();
@@ -569,10 +573,14 @@ void Character::setName(const char *name) {
 	const char *end = begin + strlen(name);
 
 	_prefix = _empty;
+	_suffix = _empty;
 
 	_dummy = IS_DUMMY_CHARACTER(name);
 
 	if (!_dummy) {
+		if (!strstr(name, "donna")) {
+			_engineFlags &= ~kEngineTransformedDonna;
+		} else
 		if (_engineFlags & kEngineTransformedDonna) {
 			_suffix = _suffixTras;
 		} else {
@@ -581,8 +589,6 @@ void Character::setName(const char *name) {
 				_engineFlags |= kEngineTransformedDonna;
 				_suffix = _suffixTras;
 				end = s;
-			} else {
-				_suffix = _empty;
 			}
 		}
 		if (IS_MINI_CHARACTER(name)) {
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index e7f08d0339..c382f6a7f6 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -224,7 +224,7 @@ void Parallaction_br::changeLocation(char *location) {
 	// free open location stuff
 	clearSubtitles();
 	freeBackground();
-	_gfx->clearGfxObjects();
+	_gfx->clearGfxObjects(kGfxObjNormal | kGfxObjCharacter);
 	_location._programs.clear();
 	freeZones();
 	freeAnimations();
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index af848aa6af..a2217e4a73 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -306,6 +306,7 @@ void Parallaction_ns::changeLocation(char *location) {
 		setArrowCursor();
 	}
 
+	_gfx->showGfxObj(_char._ani->gfxobj, false);
 	_location._animations.remove(_char._ani);
 
 	freeLocation();
@@ -327,6 +328,7 @@ void Parallaction_ns::changeLocation(char *location) {
 	}
 
 	_location._animations.push_front(_char._ani);
+	_gfx->showGfxObj(_char._ani->gfxobj, true);
 
 	strcpy(_saveData1, locname.location());
 	parseLocation(_saveData1);
@@ -411,6 +413,7 @@ void Parallaction_ns::changeCharacter(const char *name) {
 
 	Common::String oldArchive = _disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1");
 	_char._ani->gfxobj = _gfx->loadAnim(_char.getFullName());
+	_char._ani->gfxobj->setFlags(kGfxObjCharacter);
 
 	if (!_char.dummy()) {
 		if (getPlatform() == Common::kPlatformAmiga) {
-- 
cgit v1.2.3


From 12cefc4132ddb06ce56efd813c88f50d5e8b19ed Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Wed, 9 Jul 2008 13:27:09 +0000
Subject: Fixed leaks in NS and BRA.

svn-id: r32976
---
 engines/parallaction/graphics.cpp     | 1 +
 engines/parallaction/objects.cpp      | 3 +++
 engines/parallaction/parallaction.cpp | 1 +
 3 files changed, 5 insertions(+)

(limited to 'engines')

diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 93ebdd3a65..32d0e303eb 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -767,6 +767,7 @@ Gfx::Gfx(Parallaction* vm) :
 Gfx::~Gfx() {
 
 	freeBackground();
+	freeLabels();
 
 	return;
 }
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index 54afabc318..66025cf0f7 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -54,6 +54,7 @@ Animation::Animation() {
 
 Animation::~Animation() {
 	free(_scriptName);
+	gfxobj->release();
 }
 
 uint16 Animation::width() const {
@@ -182,6 +183,8 @@ Zone::~Zone() {
 		break;
 	}
 
+
+	free(_linkedName);
 }
 
 void Zone::getRect(Common::Rect& r) const {
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index ca99d2a789..b2146bd292 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -93,6 +93,7 @@ Parallaction::~Parallaction() {
 
 	_gfx->clearGfxObjects(kGfxObjCharacter | kGfxObjNormal);
 	hideDialogueStuff();
+	delete _balloonMan;
 	freeLocation();
 
 	freeCharacter();
-- 
cgit v1.2.3


From 03cd937b13d5629f84f52b05c6374e5a3373be15 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Thu, 10 Jul 2008 02:00:54 +0000
Subject: Fixed destruction of sprites in BRA.

svn-id: r32983
---
 engines/parallaction/disk_br.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 543ed14146..4068cbc202 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -58,7 +58,7 @@ struct Sprites : public Frames {
 	}
 
 	~Sprites() {
-		delete _sprites;
+		delete[] _sprites;
 	}
 
 	uint16 getNum() {
-- 
cgit v1.2.3


From 092d9f38c5080da66b4edc2ec52a204448ab9a4f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Jul 2008 11:25:43 +0000
Subject: Workaround for gcc 2.95 compiler bug.

svn-id: r32986
---
 engines/kyra/script_tim.cpp | 10 ++++++----
 engines/kyra/script_tim.h   |  8 ++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 6b82ba06de..8725f6def9 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -34,6 +34,7 @@ namespace Kyra {
 TIMInterpreter::TIMInterpreter(KyraEngine_v1 *vm, OSystem *system) : _vm(vm), _system(system), _currentTim(0) {
 #define COMMAND(x) { &TIMInterpreter::x, #x }
 #define COMMAND_UNIMPL() { 0, 0 }
+#define cmd_return(n) cmd_return_##n
 	static const CommandEntry commandProcs[] = {
 		// 0x00
 		COMMAND(cmd_initFunc0),
@@ -66,15 +67,16 @@ TIMInterpreter::TIMInterpreter(KyraEngine_v1 *vm, OSystem *system) : _vm(vm), _s
 		COMMAND_UNIMPL(),
 		COMMAND(cmd_resetAllRuntimes),
 		// 0x18
-		COMMAND(cmd_return<1>),
+		COMMAND(cmd_return(1)),
 		COMMAND(cmd_execOpcode),
 		COMMAND(cmd_initFuncNow),
 		COMMAND(cmd_stopFuncNow),
 		// 0x1C
-		COMMAND(cmd_return<1>),
-		COMMAND(cmd_return<1>),
-		COMMAND(cmd_return<-1>)
+		COMMAND(cmd_return(1)),
+		COMMAND(cmd_return(1)),
+		COMMAND(cmd_return(n1))
 	};
+#undef cmd_return
 
 	_commands = commandProcs;
 	_commandsSize = ARRAYSIZE(commandProcs);
diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h
index cd715ff4ef..f171823444 100644
--- a/engines/kyra/script_tim.h
+++ b/engines/kyra/script_tim.h
@@ -102,8 +102,12 @@ private:
 	int cmd_execOpcode(const uint16 *param);
 	int cmd_initFuncNow(const uint16 *param);
 	int cmd_stopFuncNow(const uint16 *param);
-	template<int T>
-	int cmd_return(const uint16 *) { return T; }
+#define cmd_return(n, v) \
+	int cmd_return_##n(const uint16 *) { return v; }
+
+	cmd_return( 1,  1);
+	cmd_return(n1, -1);
+#undef cmd_return
 };
 
 } // end of namespace Kyra
-- 
cgit v1.2.3


From 9a34ef702de478611718bc94b4d1bcfc6a922613 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Jul 2008 11:28:51 +0000
Subject: Fixed mem leak in MIDI related code.

svn-id: r32987
---
 engines/kyra/sound.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index c768255272..5068268d99 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -243,8 +243,10 @@ int SoundMidiPC::open() {
 }
 
 void SoundMidiPC::close() {
-	if (_driver)
+	if (_driver) {
 		_driver->close();
+		delete _driver;
+	}
 	_driver = 0;
 }
 
-- 
cgit v1.2.3


From e1e95f0c0edf58553af5f31d33f46f5eb864d168 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Jul 2008 12:05:38 +0000
Subject: Added filename to unknown opcode/command warnings of EMC scripts.

svn-id: r32988
---
 engines/kyra/script.cpp | 6 ++++--
 engines/kyra/script.h   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index a29cdc8ca3..b10a4b32bf 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -132,6 +132,8 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo
 
 	scriptData->opcodes = opcodes;
 
+	strncpy(scriptData->filename, filename, 13);
+
 	return true;
 }
 
@@ -205,7 +207,7 @@ bool EMCInterpreter::run(EMCState *script) {
 	}
 
 	if (opcode > 18) {
-		error("Script unknown command: %d", opcode);
+		error("Script unknown command: %d in file '%s' at offset 0x%.08X", opcode, script->dataPtr->filename, instOffset);
 	} else {
 		debugC(5, kDebugLevelScript, "[0x%.08X] EMCInterpreter::%s([%d/%u])", instOffset, _commands[opcode].desc, _parameter, (uint)_parameter);
 		(this->*(_commands[opcode].proc))(script);
@@ -388,7 +390,7 @@ void EMCInterpreter::cmd_execOpcode(EMCState* script) {
 		script->retValue = (*(*script->dataPtr->opcodes)[opcode])(script);
 	} else {
 		script->retValue = 0;
-		warning("calling unimplemented opcode(0x%.02X/%d)", opcode, opcode);
+		warning("Calling unimplemented opcode(0x%.02X/%d) from file '%s'", opcode, opcode, script->dataPtr->filename);
 	}
 }
 
diff --git a/engines/kyra/script.h b/engines/kyra/script.h
index de52093f66..2b97a83289 100644
--- a/engines/kyra/script.h
+++ b/engines/kyra/script.h
@@ -36,6 +36,8 @@ struct EMCState;
 typedef Common::Functor1<EMCState*, int> Opcode;
 
 struct EMCData {
+	char filename[13];
+
 	byte *text;
 	uint16 *data;
 	uint16 *ordr;
-- 
cgit v1.2.3


From a117024d23c3d43ee0ced9046fdbf8e866ddc135 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Jul 2008 12:12:42 +0000
Subject: Added filename to unkown command/opcode warnings for TIM scripts.

svn-id: r32989
---
 engines/kyra/script_tim.cpp | 8 +++++---
 engines/kyra/script_tim.h   | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 8725f6def9..8ea316f159 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -124,6 +124,8 @@ TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpc
 	for (int i = 0; i < num; ++i)
 		tim->func[i].avtl = tim->avtl + tim->avtl[i];	
 
+	strncpy(tim->filename, filename, 13);
+
 	return tim;
 }
 
@@ -201,12 +203,12 @@ void TIMInterpreter::refreshTimersAfterPause(uint32 elapsedTime) {
 
 int TIMInterpreter::execCommand(int cmd, const uint16 *param) {
 	if (cmd < 0 || cmd >= _commandsSize) {
-		warning("Calling unimplemented TIM command %d", cmd);
+		warning("Calling unimplemented TIM command %d from file '%s'", cmd, _currentTim->filename);
 		return 0;
 	}
 
 	if (_commands[cmd].proc == 0) {
-		warning("Calling unimplemented TIM command %d", cmd);
+		warning("Calling unimplemented TIM command %d from file '%s'", cmd, _currentTim->filename);
 		return 0;
 	}
 
@@ -261,7 +263,7 @@ int TIMInterpreter::cmd_execOpcode(const uint16 *param) {
 
 	uint16 opcode = *param++;
 	if (opcode > _currentTim->opcodes->size()) {
-		warning("Calling unimplemented TIM opcode(0x%.02X/%d)", opcode, opcode);
+		warning("Calling unimplemented TIM opcode(0x%.02X/%d) form file '%s'", opcode, opcode, _currentTim->filename);
 		return 0;
 	}
 
diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h
index f171823444..39a1d90a44 100644
--- a/engines/kyra/script_tim.h
+++ b/engines/kyra/script_tim.h
@@ -37,6 +37,8 @@ struct TIM;
 typedef Common::Functor2<const TIM*, const uint16*, int> TIMOpcode;
 
 struct TIM {
+	char filename[13];
+
 	int16 procFunc;
 	uint16 procParam;
 
-- 
cgit v1.2.3


From 985a032871e3296daa2c9cedb4cfabfa9036137d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Jul 2008 12:14:00 +0000
Subject: Typo.

svn-id: r32990
---
 engines/kyra/script_tim.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 8ea316f159..4b82232049 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -263,7 +263,7 @@ int TIMInterpreter::cmd_execOpcode(const uint16 *param) {
 
 	uint16 opcode = *param++;
 	if (opcode > _currentTim->opcodes->size()) {
-		warning("Calling unimplemented TIM opcode(0x%.02X/%d) form file '%s'", opcode, opcode, _currentTim->filename);
+		warning("Calling unimplemented TIM opcode(0x%.02X/%d) from file '%s'", opcode, opcode, _currentTim->filename);
 		return 0;
 	}
 
-- 
cgit v1.2.3


From c8488c060cea860d02fdf59221408f7974a80eab Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 10 Jul 2008 16:19:17 +0000
Subject: Fixed Kyra 3 detection regression.

svn-id: r32992
---
 engines/kyra/detection.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 0c8acb59b7..fce1e93bc2 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -527,7 +527,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::kPlatformPC,
 			Common::ADGF_DROPLANGUAGE
 		},
-		KYRA3_CD_INS_FLAGS
+		KYRA3_CD_FLAGS
 	},
 	{
 		{
@@ -542,7 +542,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::kPlatformPC,
 			Common::ADGF_DROPLANGUAGE
 		},
-		KYRA3_CD_INS_FLAGS
+		KYRA3_CD_FLAGS
 	},
 	{
 		{
@@ -557,7 +557,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::kPlatformPC,
 			Common::ADGF_DROPLANGUAGE
 		},
-		KYRA3_CD_INS_FLAGS
+		KYRA3_CD_FLAGS
 	},
 
 	// installed version
@@ -574,7 +574,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::kPlatformPC,
 			Common::ADGF_DROPLANGUAGE
 		},
-		KYRA3_CD_FLAGS
+		KYRA3_CD_INS_FLAGS
 	},
 	{
 		{
@@ -589,7 +589,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::kPlatformPC,
 			Common::ADGF_DROPLANGUAGE
 		},
-		KYRA3_CD_FLAGS
+		KYRA3_CD_INS_FLAGS
 	},
 	{
 		{
@@ -604,7 +604,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::kPlatformPC,
 			Common::ADGF_DROPLANGUAGE
 		},
-		KYRA3_CD_FLAGS
+		KYRA3_CD_INS_FLAGS
 	},
 
 	// Spanish fan translation, see fr#1994040 "KYRA3: Add support for Spanish fan translation"
-- 
cgit v1.2.3


From f41ab55021c98e2ae1aee77fa0c1dd45e0475023 Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Thu, 10 Jul 2008 18:01:54 +0000
Subject: Fixed a few warnings

svn-id: r32994
---
 engines/scumm/detection.cpp      | 2 +-
 engines/scumm/he/resource_he.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 9359c6610c..753ad45212 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -492,7 +492,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com
 			// Note that GF_OLD_BUNDLE is true if and only if GF_OLD256 is false.
 			// Candidates: maniac enhanced, zak enhanced, indy3ega, loom
 
-			if (g->version != 2 && g->version != 3  || (g->features & GF_OLD256))
+			if ((g->version != 2 && g->version != 3)  || (g->features & GF_OLD256))
 				return false;
 
 			/* We distinguish the games by the presence/absence of
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 33e6748860..f8fb1efca2 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -522,12 +522,13 @@ int Win32ResExtractor::do_resources_recurs(WinLibrary *fi, WinResource *base,
 
 	/* get a list of all resources at this level */
 	wr = list_resources(fi, base, &rescnt);
-	if (wr == NULL)
+	if (wr == NULL) {
 		if (size != 0)
 			return size;
 		else
 			return 0;
-
+	}
+	
 	/* process each resource listed */
 	for (c = 0 ; c < rescnt ; c++) {
 		/* (over)write the corresponding WinResource holder with the current */
-- 
cgit v1.2.3


From fe655836575214c33c82120e9dd714b95a96e475 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Fri, 11 Jul 2008 12:55:08 +0000
Subject: Fixed leak in sound code by explicitly deleting the midi driver.

svn-id: r33002
---
 engines/parallaction/sound.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp
index d9e78f3a9e..df6867a90c 100644
--- a/engines/parallaction/sound.cpp
+++ b/engines/parallaction/sound.cpp
@@ -175,6 +175,7 @@ void MidiPlayer::close() {
 	_mutex.lock();
 	_driver->setTimerCallback(NULL, NULL);
 	_driver->close();
+	delete _driver;
 	_driver = 0;
 	_parser->setMidiDriver(NULL);
 	delete _parser;
-- 
cgit v1.2.3


From 8ed023142a9ce0ee825eb3d6c33759281d68357b Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Fri, 11 Jul 2008 13:06:28 +0000
Subject: Moved program and command execution code out of the engine, into
 their own brand new classes.

svn-id: r33003
---
 engines/parallaction/dialogue.cpp        |   2 +-
 engines/parallaction/disk_br.cpp         |   9 +-
 engines/parallaction/exec.h              | 237 +++++++++++++++++++++++++++++++
 engines/parallaction/exec_br.cpp         | 100 +++++++------
 engines/parallaction/exec_ns.cpp         | 125 +++++++++-------
 engines/parallaction/input.cpp           |   2 +-
 engines/parallaction/parallaction.cpp    |  13 +-
 engines/parallaction/parallaction.h      | 137 ++----------------
 engines/parallaction/parallaction_br.cpp |  20 ++-
 engines/parallaction/parallaction_ns.cpp |  10 +-
 engines/parallaction/walk.cpp            |   6 +-
 11 files changed, 419 insertions(+), 242 deletions(-)
 create mode 100644 engines/parallaction/exec.h

(limited to 'engines')

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 1dc4fd5ab3..6e91dd8a88 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -249,7 +249,7 @@ void DialogueManager::run() {
 	}
 
 	if (cmdlist)
-		_vm->runCommands(*cmdlist);
+		_vm->_cmdExec->run(*cmdlist);
 
 }
 
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 4068cbc202..ee1e111139 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -287,9 +287,12 @@ Frames* DosDisk_br::loadFrames(const char* name) {
 	sprintf(path, "%s/ani/%s", _partPath, name);
 
 	Common::File stream;
-	if (!stream.open(path))
-		errorFileNotFound(path);
-
+	if (!stream.open(path)) {
+		sprintf(path, "%s/ani/%s.ani", _partPath, name);
+		if (!stream.open(path)) {
+			errorFileNotFound(path);
+		}
+	}
 
 	return createSprites(stream);
 }
diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h
new file mode 100644
index 0000000000..ca359c2a8e
--- /dev/null
+++ b/engines/parallaction/exec.h
@@ -0,0 +1,237 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+
+#ifndef PARALLACTION_EXEC_H
+#define PARALLACTION_EXEC_H
+
+#include "common/util.h"
+#include "parallaction/objects.h"
+
+
+namespace Parallaction {
+
+typedef Common::Functor0<void> Opcode;
+typedef Common::Array<const Opcode*>	OpcodeSet;
+
+#define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op()
+#define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op()
+
+class Parallaction_ns;
+class Parallaction_br;
+
+class CommandExec {
+protected:
+	struct ParallactionStruct1 {
+		CommandPtr cmd;
+		ZonePtr	z;
+	} _cmdRunCtxt;
+
+	OpcodeSet	_opcodes;
+
+public:
+	virtual void init() = 0;
+	virtual void run(CommandList &list, ZonePtr z = nullZonePtr);
+	CommandExec() {
+	}
+	virtual ~CommandExec() {
+		for (Common::Array<const Opcode*>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
+			delete *i;
+		_opcodes.clear();
+	}
+};
+
+class CommandExec_ns : public CommandExec {
+
+	Parallaction_ns	*_vm;
+
+protected:
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(set);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(clear);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(start);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(speak);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(get);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(location);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(open);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(close);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(on);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(off);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(call);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(toggle);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(drop);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(quit);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(move);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(stop);
+
+public:
+	void init();
+
+	CommandExec_ns(Parallaction_ns* vm);
+	~CommandExec_ns();
+};
+
+class CommandExec_br : public CommandExec_ns {
+
+protected:
+	Parallaction_br	*_vm;
+
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(location);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(open);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(close);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(on);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(off);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(call);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(drop);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(move);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(start);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(stop);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(character);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(followme);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(onmouse);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(offmouse);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(add);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(leave);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(inc);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(dec);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(ifeq);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(iflt);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(ifgt);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(let);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(music);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(fix);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(unfix);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(zeta);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(scroll);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(swap);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(give);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(text);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(part);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(testsfx);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(ret);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(onsave);
+	DECLARE_UNQUALIFIED_COMMAND_OPCODE(offsave);
+
+public:
+	void		init();
+
+	CommandExec_br(Parallaction_br* vm);
+	~CommandExec_br();
+};
+
+
+
+
+
+class ProgramExec {
+protected:
+	struct ParallactionStruct2 {
+		AnimationPtr	anim;
+		ProgramPtr		program;
+		InstructionList::iterator inst;
+		uint16		modCounter;
+		bool		suspend;
+	} _instRunCtxt;
+
+	OpcodeSet	_opcodes;
+
+public:
+	virtual void init() = 0;
+	virtual void runScripts(ProgramList::iterator first, ProgramList::iterator last);
+	ProgramExec() {
+	}
+	virtual ~ProgramExec() {
+		for (Common::Array<const Opcode*>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
+			delete *i;
+		_opcodes.clear();
+	}
+};
+
+class ProgramExec_ns : public ProgramExec {
+
+	Parallaction_ns *_vm;
+
+protected:
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(invalid);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(loop);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endloop);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(null);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(call);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(put);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(wait);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(start);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(sound);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
+
+public:
+	void init();
+
+	ProgramExec_ns(Parallaction_ns *vm);
+	~ProgramExec_ns();
+};
+
+class ProgramExec_br : public ProgramExec_ns {
+
+	Parallaction_br *_vm;
+
+protected:
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on);
+ 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(loop);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(dec);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(put);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(wait);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(start);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(process);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(color);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(mask);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(print);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(text);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(mul);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(div);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(ifeq);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(iflt);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(ifgt);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endif);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(stop);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
+
+public:
+	void init();
+	ProgramExec_br(Parallaction_br *vm);
+	~ProgramExec_br();
+};
+
+} // namespace Parallaction
+
+#endif
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
index 734360167b..eca01ea06a 100644
--- a/engines/parallaction/exec_br.cpp
+++ b/engines/parallaction/exec_br.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "parallaction/exec.h"
 #include "parallaction/input.h"
 #include "parallaction/parallaction.h"
 
@@ -64,12 +65,13 @@ namespace Parallaction {
 
 #define SetOpcodeTable(x) table = &x;
 
-typedef Common::Functor0Mem<void, Parallaction_br> OpcodeV2;
-#define COMMAND_OPCODE(op) table->push_back(new OpcodeV2(this, &Parallaction_br::cmdOp_##op))
-#define DECLARE_COMMAND_OPCODE(op) void Parallaction_br::cmdOp_##op()
+typedef Common::Functor0Mem<void, CommandExec_br> OpcodeV1;
+#define COMMAND_OPCODE(op) table->push_back(new OpcodeV1(this, &CommandExec_br::cmdOp_##op))
+#define DECLARE_COMMAND_OPCODE(op) void CommandExec_br::cmdOp_##op()
 
-#define INSTRUCTION_OPCODE(op) table->push_back(new OpcodeV2(this, &Parallaction_br::instOp_##op))
-#define DECLARE_INSTRUCTION_OPCODE(op) void Parallaction_br::instOp_##op()
+typedef Common::Functor0Mem<void, ProgramExec_br> OpcodeV2;
+#define INSTRUCTION_OPCODE(op) table->push_back(new OpcodeV2(this, &ProgramExec_br::instOp_##op))
+#define DECLARE_INSTRUCTION_OPCODE(op) void ProgramExec_br::instOp_##op()
 
 void Parallaction_br::setupSubtitles(char *s, char *s2, int y) {
 	debugC(5, kDebugExec, "setupSubtitles(%s, %s, %i)", s, s2, y);
@@ -114,7 +116,7 @@ DECLARE_COMMAND_OPCODE(location) {
 	warning("Parallaction_br::cmdOp_location command not yet implemented");
 
 	// TODO: handle startPos and startPos2
-	scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string);
+	_vm->scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string);
 }
 
 
@@ -137,7 +139,7 @@ DECLARE_COMMAND_OPCODE(on) {
 		z->_flags &= ~kFlagsRemove;
 
 		if ((z->_type & 0xFFFF) & kZoneGet) {
-			_gfx->showGfxObj(z->u.get->gfxobj, true);
+			_vm->_gfx->showGfxObj(z->u.get->gfxobj, true);
 		}
 	}
 }
@@ -151,14 +153,14 @@ DECLARE_COMMAND_OPCODE(off) {
 		z->_flags |= kFlagsRemove;
 
 		if ((z->_type & 0xFFFF) & kZoneGet) {
-			_gfx->showGfxObj(z->u.get->gfxobj, false);
+			_vm->_gfx->showGfxObj(z->u.get->gfxobj, false);
 		}
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(call) {
-	callFunction(_cmdRunCtxt.cmd->u._callable, &_cmdRunCtxt.z);
+	_vm->callFunction(_cmdRunCtxt.cmd->u._callable, &_cmdRunCtxt.z);
 }
 
 
@@ -182,7 +184,7 @@ DECLARE_COMMAND_OPCODE(stop) {
 
 DECLARE_COMMAND_OPCODE(character) {
 	debugC(9, kDebugExec, "Parallaction_br::cmdOp_character(%s)", _cmdRunCtxt.cmd->u._string);
-	changeCharacter(_cmdRunCtxt.cmd->u._string);
+	_vm->changeCharacter(_cmdRunCtxt.cmd->u._string);
 }
 
 
@@ -192,12 +194,12 @@ DECLARE_COMMAND_OPCODE(followme) {
 
 
 DECLARE_COMMAND_OPCODE(onmouse) {
-	_input->showCursor(true);
+	_vm->_input->showCursor(true);
 }
 
 
 DECLARE_COMMAND_OPCODE(offmouse) {
-	_input->showCursor(false);
+	_vm->_input->showCursor(false);
 }
 
 
@@ -212,42 +214,42 @@ DECLARE_COMMAND_OPCODE(leave) {
 
 
 DECLARE_COMMAND_OPCODE(inc) {
-	_counters[_cmdRunCtxt.cmd->u._lvalue] += _cmdRunCtxt.cmd->u._rvalue;
+	_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] += _cmdRunCtxt.cmd->u._rvalue;
 }
 
 
 DECLARE_COMMAND_OPCODE(dec) {
-	_counters[_cmdRunCtxt.cmd->u._lvalue] -= _cmdRunCtxt.cmd->u._rvalue;
+	_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] -= _cmdRunCtxt.cmd->u._rvalue;
 }
 
 
 DECLARE_COMMAND_OPCODE(ifeq) {
-	if (_counters[_cmdRunCtxt.cmd->u._lvalue] == _cmdRunCtxt.cmd->u._rvalue) {
-		setLocationFlags(kFlagsTestTrue);
+	if (_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] == _cmdRunCtxt.cmd->u._rvalue) {
+		_vm->setLocationFlags(kFlagsTestTrue);
 	} else {
-		clearLocationFlags(kFlagsTestTrue);
+		_vm->clearLocationFlags(kFlagsTestTrue);
 	}
 }
 
 DECLARE_COMMAND_OPCODE(iflt) {
-	if (_counters[_cmdRunCtxt.cmd->u._lvalue] < _cmdRunCtxt.cmd->u._rvalue) {
-		setLocationFlags(kFlagsTestTrue);
+	if (_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] < _cmdRunCtxt.cmd->u._rvalue) {
+		_vm->setLocationFlags(kFlagsTestTrue);
 	} else {
-		clearLocationFlags(kFlagsTestTrue);
+		_vm->clearLocationFlags(kFlagsTestTrue);
 	}
 }
 
 DECLARE_COMMAND_OPCODE(ifgt) {
-	if (_counters[_cmdRunCtxt.cmd->u._lvalue] > _cmdRunCtxt.cmd->u._rvalue) {
-		setLocationFlags(kFlagsTestTrue);
+	if (_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] > _cmdRunCtxt.cmd->u._rvalue) {
+		_vm->setLocationFlags(kFlagsTestTrue);
 	} else {
-		clearLocationFlags(kFlagsTestTrue);
+		_vm->clearLocationFlags(kFlagsTestTrue);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(let) {
-	_counters[_cmdRunCtxt.cmd->u._lvalue] = _cmdRunCtxt.cmd->u._rvalue;
+	_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] = _cmdRunCtxt.cmd->u._rvalue;
 }
 
 
@@ -267,15 +269,15 @@ DECLARE_COMMAND_OPCODE(unfix) {
 
 
 DECLARE_COMMAND_OPCODE(zeta) {
-	_location._zeta0 = _cmdRunCtxt.cmd->u._zeta0;
-	_location._zeta1 = _cmdRunCtxt.cmd->u._zeta1;
-	_location._zeta2 = _cmdRunCtxt.cmd->u._zeta2;
+	_vm->_location._zeta0 = _cmdRunCtxt.cmd->u._zeta0;
+	_vm->_location._zeta1 = _cmdRunCtxt.cmd->u._zeta1;
+	_vm->_location._zeta2 = _cmdRunCtxt.cmd->u._zeta2;
 }
 
 
 DECLARE_COMMAND_OPCODE(scroll) {
 	warning("Parallaction_br::cmdOp_scroll not yet implemented");
-	_gfx->setVar("scroll_x", _cmdRunCtxt.cmd->u._rvalue );
+	_vm->_gfx->setVar("scroll_x", _cmdRunCtxt.cmd->u._rvalue );
 }
 
 
@@ -291,7 +293,7 @@ DECLARE_COMMAND_OPCODE(give) {
 
 DECLARE_COMMAND_OPCODE(text) {
 	CommandData *data = &_cmdRunCtxt.cmd->u;
-	setupSubtitles(data->_string, data->_string2, data->_zeta0);
+	_vm->setupSubtitles(data->_string, data->_string2, data->_zeta0);
 }
 
 
@@ -302,7 +304,7 @@ DECLARE_COMMAND_OPCODE(part) {
 
 DECLARE_COMMAND_OPCODE(testsfx) {
 	warning("Parallaction_br::cmdOp_testsfx not completely implemented");
-	clearLocationFlags(kFlagsTestTrue);	// should test if sfx are enabled
+	_vm->clearLocationFlags(kFlagsTestTrue);	// should test if sfx are enabled
 }
 
 
@@ -332,7 +334,7 @@ DECLARE_INSTRUCTION_OPCODE(on) {
 		z->_flags &= ~kFlagsRemove;
 
 		if ((z->_type & 0xFFFF) & kZoneGet) {
-			_gfx->showGfxObj(z->u.get->gfxobj, true);
+			_vm->_gfx->showGfxObj(z->u.get->gfxobj, true);
 		}
 	}
 }
@@ -346,7 +348,7 @@ DECLARE_INSTRUCTION_OPCODE(off) {
 		z->_flags |= kFlagsRemove;
 
 		if ((z->_type & 0xFFFF) & kZoneGet) {
-			_gfx->showGfxObj(z->u.get->gfxobj, false);
+			_vm->_gfx->showGfxObj(z->u.get->gfxobj, false);
 		}
 	}
 }
@@ -430,7 +432,7 @@ DECLARE_INSTRUCTION_OPCODE(start) {
 
 
 DECLARE_INSTRUCTION_OPCODE(process) {
-	_activeZone2 = (*_instRunCtxt.inst)->_z;
+	_vm->_activeZone2 = (*_instRunCtxt.inst)->_z;
 }
 
 
@@ -444,7 +446,7 @@ DECLARE_INSTRUCTION_OPCODE(color) {
 
 	int16 entry = inst->_opB.getRValue();
 
-	_gfx->_palette.setEntry(entry, inst->_colors[0], inst->_colors[1], inst->_colors[2]);
+	_vm->_gfx->_palette.setEntry(entry, inst->_colors[0], inst->_colors[1], inst->_colors[2]);
 
 }
 
@@ -465,7 +467,7 @@ DECLARE_INSTRUCTION_OPCODE(print) {
 
 DECLARE_INSTRUCTION_OPCODE(text) {
 	InstructionPtr inst = (*_instRunCtxt.inst);
-	setupSubtitles(inst->_text, inst->_text2, inst->_y);
+	_vm->setupSubtitles(inst->_text, inst->_text2, inst->_y);
 }
 
 
@@ -496,7 +498,7 @@ DECLARE_INSTRUCTION_OPCODE(stop) {
 DECLARE_INSTRUCTION_OPCODE(endscript) {
 	if ((_instRunCtxt.anim->_flags & kFlagsLooping) == 0) {
 		_instRunCtxt.anim->_flags &= ~kFlagsActing;
-		runCommands(_instRunCtxt.anim->_commands, _instRunCtxt.anim);
+		_vm->_cmdExec->run(_instRunCtxt.anim->_commands, _instRunCtxt.anim);
 		_instRunCtxt.program->_status = kProgramDone;
 	}
 	_instRunCtxt.program->_ip = _instRunCtxt.program->_instructions.begin();
@@ -504,11 +506,10 @@ DECLARE_INSTRUCTION_OPCODE(endscript) {
 	_instRunCtxt.suspend = true;
 }
 
-void Parallaction_br::initOpcodes() {
-
+void CommandExec_br::init() {
 	Common::Array<const Opcode*> *table = 0;
 
-	SetOpcodeTable(_commandOpcodes);
+	SetOpcodeTable(_opcodes);
 	COMMAND_OPCODE(invalid);
 	COMMAND_OPCODE(set);
 	COMMAND_OPCODE(clear);
@@ -551,8 +552,21 @@ void Parallaction_br::initOpcodes() {
 	COMMAND_OPCODE(ret);
 	COMMAND_OPCODE(onsave);
 	COMMAND_OPCODE(offsave);
+}
+
+CommandExec_br::CommandExec_br(Parallaction_br* vm) : CommandExec_ns(vm), _vm(vm) {
+
+}
+
+CommandExec_br::~CommandExec_br() {
+
+}
 
-	SetOpcodeTable(_instructionOpcodes);
+void ProgramExec_br::init() {
+
+	Common::Array<const Opcode*> *table = 0;
+
+	SetOpcodeTable(_opcodes);
 	INSTRUCTION_OPCODE(invalid);
 	INSTRUCTION_OPCODE(on);
 	INSTRUCTION_OPCODE(off);
@@ -587,6 +601,12 @@ void Parallaction_br::initOpcodes() {
 	INSTRUCTION_OPCODE(endscript);
 }
 
+ProgramExec_br::ProgramExec_br(Parallaction_br *vm) : ProgramExec_ns(vm), _vm(vm) {
+}
+
+ProgramExec_br::~ProgramExec_br() {
+}
+
 #if 0
 void Parallaction_br::jobWaitRemoveLabelJob(void *parm, Job *job) {
 
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index abad9f273b..1250d276f6 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "parallaction/exec.h"
 #include "parallaction/input.h"
 #include "parallaction/parallaction.h"
 #include "parallaction/sound.h"
@@ -52,12 +53,13 @@ namespace Parallaction {
 
 #define SetOpcodeTable(x) table = &x;
 
-typedef Common::Functor0Mem<void, Parallaction_ns> OpcodeV2;
-#define COMMAND_OPCODE(op) table->push_back(new OpcodeV2(this, &Parallaction_ns::cmdOp_##op))
-#define DECLARE_COMMAND_OPCODE(op) void Parallaction_ns::cmdOp_##op()
+typedef Common::Functor0Mem<void, CommandExec_ns> OpcodeV1;
+#define COMMAND_OPCODE(op) table->push_back(new OpcodeV1(this, &CommandExec_ns::cmdOp_##op))
+#define DECLARE_COMMAND_OPCODE(op) void CommandExec_ns::cmdOp_##op()
 
-#define INSTRUCTION_OPCODE(op) table->push_back(new OpcodeV2(this, &Parallaction_ns::instOp_##op))
-#define DECLARE_INSTRUCTION_OPCODE(op) void Parallaction_ns::instOp_##op()
+typedef Common::Functor0Mem<void, ProgramExec_ns> OpcodeV2;
+#define INSTRUCTION_OPCODE(op) table->push_back(new OpcodeV2(this, &ProgramExec_ns::instOp_##op))
+#define DECLARE_INSTRUCTION_OPCODE(op) void ProgramExec_ns::instOp_##op()
 
 
 
@@ -137,7 +139,7 @@ DECLARE_INSTRUCTION_OPCODE(put) {
 	int16 y = inst->_opB.getRValue();
 	bool mask = (inst->_flags & kInstMaskedPut) == kInstMaskedPut;
 
-	_gfx->patchBackground(v18, x, y, mask);
+	_vm->_gfx->patchBackground(v18, x, y, mask);
 }
 
 DECLARE_INSTRUCTION_OPCODE(null) {
@@ -149,7 +151,7 @@ DECLARE_INSTRUCTION_OPCODE(invalid) {
 }
 
 DECLARE_INSTRUCTION_OPCODE(call) {
-	callFunction((*_instRunCtxt.inst)->_immediate, 0);
+	_vm->callFunction((*_instRunCtxt.inst)->_immediate, 0);
 }
 
 
@@ -165,7 +167,7 @@ DECLARE_INSTRUCTION_OPCODE(start) {
 
 
 DECLARE_INSTRUCTION_OPCODE(sound) {
-	_activeZone = (*_instRunCtxt.inst)->_z;
+	_vm->_activeZone = (*_instRunCtxt.inst)->_z;
 }
 
 
@@ -175,13 +177,13 @@ DECLARE_INSTRUCTION_OPCODE(move) {
 	int16 x = inst->_opA.getRValue();
 	int16 y = inst->_opB.getRValue();
 
-	_char.scheduleWalk(x, y);
+	_vm->_char.scheduleWalk(x, y);
 }
 
 DECLARE_INSTRUCTION_OPCODE(endscript) {
 	if ((_instRunCtxt.anim->_flags & kFlagsLooping) == 0) {
 		_instRunCtxt.anim->_flags &= ~kFlagsActing;
-		runCommands(_instRunCtxt.anim->_commands, _instRunCtxt.anim);
+		_vm->_cmdExec->run(_instRunCtxt.anim->_commands, _instRunCtxt.anim);
 		_instRunCtxt.program->_status = kProgramDone;
 	}
 	_instRunCtxt.program->_ip = _instRunCtxt.program->_instructions.begin();
@@ -201,7 +203,7 @@ DECLARE_COMMAND_OPCODE(set) {
 		_cmdRunCtxt.cmd->u._flags &= ~kFlagsGlobal;
 		_commandFlags |= _cmdRunCtxt.cmd->u._flags;
 	} else {
-		setLocationFlags(_cmdRunCtxt.cmd->u._flags);
+		_vm->setLocationFlags(_cmdRunCtxt.cmd->u._flags);
 	}
 }
 
@@ -211,7 +213,7 @@ DECLARE_COMMAND_OPCODE(clear) {
 		_cmdRunCtxt.cmd->u._flags &= ~kFlagsGlobal;
 		_commandFlags &= ~_cmdRunCtxt.cmd->u._flags;
 	} else {
-		clearLocationFlags(_cmdRunCtxt.cmd->u._flags);
+		_vm->clearLocationFlags(_cmdRunCtxt.cmd->u._flags);
 	}
 }
 
@@ -222,25 +224,25 @@ DECLARE_COMMAND_OPCODE(start) {
 
 
 DECLARE_COMMAND_OPCODE(speak) {
-	_activeZone = _cmdRunCtxt.cmd->u._zone;
+	_vm->_activeZone = _cmdRunCtxt.cmd->u._zone;
 }
 
 
 DECLARE_COMMAND_OPCODE(get) {
 	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsFixed;
-	runZone(_cmdRunCtxt.cmd->u._zone);
+	_vm->runZone(_cmdRunCtxt.cmd->u._zone);
 }
 
 
 DECLARE_COMMAND_OPCODE(location) {
-	scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string);
+	_vm->scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string);
 }
 
 
 DECLARE_COMMAND_OPCODE(open) {
 	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsClosed;
 	if (_cmdRunCtxt.cmd->u._zone->u.door->gfxobj) {
-		updateDoor(_cmdRunCtxt.cmd->u._zone);
+		_vm->updateDoor(_cmdRunCtxt.cmd->u._zone);
 	}
 }
 
@@ -248,7 +250,7 @@ DECLARE_COMMAND_OPCODE(open) {
 DECLARE_COMMAND_OPCODE(close) {
 	_cmdRunCtxt.cmd->u._zone->_flags |= kFlagsClosed;
 	if (_cmdRunCtxt.cmd->u._zone->u.door->gfxobj) {
-		updateDoor(_cmdRunCtxt.cmd->u._zone);
+		_vm->updateDoor(_cmdRunCtxt.cmd->u._zone);
 	}
 }
 
@@ -265,7 +267,7 @@ DECLARE_COMMAND_OPCODE(on) {
 		z->_flags &= ~kFlagsRemove;
 		z->_flags |= kFlagsActive;
 		if ((z->_type & 0xFFFF) == kZoneGet) {
-			_gfx->showGfxObj(z->u.get->gfxobj, true);
+			_vm->_gfx->showGfxObj(z->u.get->gfxobj, true);
 		}
 	}
 }
@@ -277,7 +279,7 @@ DECLARE_COMMAND_OPCODE(off) {
 
 
 DECLARE_COMMAND_OPCODE(call) {
-	callFunction(_cmdRunCtxt.cmd->u._callable, &_cmdRunCtxt.z);
+	_vm->callFunction(_cmdRunCtxt.cmd->u._callable, &_cmdRunCtxt.z);
 }
 
 
@@ -286,13 +288,13 @@ DECLARE_COMMAND_OPCODE(toggle) {
 		_cmdRunCtxt.cmd->u._flags &= ~kFlagsGlobal;
 		_commandFlags ^= _cmdRunCtxt.cmd->u._flags;
 	} else {
-		toggleLocationFlags(_cmdRunCtxt.cmd->u._flags);
+		_vm->toggleLocationFlags(_cmdRunCtxt.cmd->u._flags);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(drop){
-	dropItem( _cmdRunCtxt.cmd->u._object );
+	_vm->dropItem( _cmdRunCtxt.cmd->u._object );
 }
 
 
@@ -302,7 +304,7 @@ DECLARE_COMMAND_OPCODE(quit) {
 
 
 DECLARE_COMMAND_OPCODE(move) {
-	_char.scheduleWalk(_cmdRunCtxt.cmd->u._move.x, _cmdRunCtxt.cmd->u._move.y);
+	_vm->_char.scheduleWalk(_cmdRunCtxt.cmd->u._move.x, _cmdRunCtxt.cmd->u._move.y);
 }
 
 
@@ -356,7 +358,7 @@ void Parallaction_ns::drawAnimations() {
 }
 
 
-void Parallaction_ns::runScripts() {
+void ProgramExec::runScripts(ProgramList::iterator first, ProgramList::iterator last) {
 	if (_engineFlags & kEnginePauseJobs) {
 		return;
 	}
@@ -365,7 +367,7 @@ void Parallaction_ns::runScripts() {
 
 	static uint16 modCounter = 0;
 
-	for (ProgramList::iterator it = _location._programs.begin(); it != _location._programs.end(); it++) {
+	for (ProgramList::iterator it = first; it != last; it++) {
 
 		AnimationPtr a = (*it)->_anim;
 
@@ -388,7 +390,7 @@ void Parallaction_ns::runScripts() {
 			_instRunCtxt.modCounter = modCounter;
 			_instRunCtxt.suspend = false;
 
-			(*_instructionOpcodes[(*inst)->_index])();
+			(*_opcodes[(*inst)->_index])();
 
 			inst = _instRunCtxt.inst;		// handles endloop correctly
 
@@ -405,17 +407,13 @@ label1:
 			a->_z = a->_top + a->height();
 	}
 
-	_char._ani->_z = _char._ani->height() + _char._ani->_top;
-	if (_char._ani->gfxobj) {
-		_char._ani->gfxobj->z = _char._ani->_z;
-	}
 	modCounter++;
 
 	return;
 }
 
 
-void Parallaction::runCommands(CommandList& list, ZonePtr z) {
+void CommandExec::run(CommandList& list, ZonePtr z) {
 	if (list.size() == 0)
 		return;
 
@@ -425,7 +423,7 @@ void Parallaction::runCommands(CommandList& list, ZonePtr z) {
 	for ( ; it != list.end(); it++) {
 
 		CommandPtr cmd = *it;
-		uint32 v8 = getLocationFlags();
+		uint32 v8 = _vm->getLocationFlags();
 
 		if (_engineFlags & kEngineQuit)
 			break;
@@ -434,15 +432,15 @@ void Parallaction::runCommands(CommandList& list, ZonePtr z) {
 			v8 = _commandFlags | kFlagsGlobal;
 		}
 
+		debugC(3, kDebugExec, "runCommands[%i] (on: %x, off: %x)", cmd->_id,  cmd->_flagsOn, cmd->_flagsOff);
+
 		if ((cmd->_flagsOn & v8) != cmd->_flagsOn) continue;
 		if ((cmd->_flagsOff & ~v8) != cmd->_flagsOff) continue;
 
-//		debugC(3, kDebugExec, "runCommands[%i]: %s (on: %x, off: %x)", cmd->_id, _commandsNamesRes[cmd->_id-1], cmd->_flagsOn, cmd->_flagsOff);
-
 		_cmdRunCtxt.z = z;
 		_cmdRunCtxt.cmd = cmd;
 
-		(*_commandOpcodes[cmd->_id])();
+		(*_opcodes[cmd->_id])();
 	}
 
 	debugC(3, kDebugExec, "runCommands completed");
@@ -451,6 +449,13 @@ void Parallaction::runCommands(CommandList& list, ZonePtr z) {
 
 }
 
+CommandExec_ns::CommandExec_ns(Parallaction_ns* vm) : _vm(vm) {
+
+}
+
+CommandExec_ns::~CommandExec_ns() {
+
+}
 
 //
 //	ZONE TYPE: EXAMINE
@@ -527,7 +532,7 @@ uint16 Parallaction::runZone(ZonePtr z) {
 
 	debugC(3, kDebugExec, "runZone completed");
 
-	runCommands(z->_commands, z);
+	_cmdExec->run(z->_commands, z);
 
 	return 0;
 }
@@ -654,11 +659,34 @@ ZonePtr Parallaction::hitZone(uint32 type, uint16 x, uint16 y) {
 }
 
 
-void Parallaction_ns::initOpcodes() {
+void CommandExec_ns::init() {
+	Common::Array<const Opcode*> *table = 0;
+
+	SetOpcodeTable(_opcodes);
+	COMMAND_OPCODE(invalid);
+	COMMAND_OPCODE(set);
+	COMMAND_OPCODE(clear);
+	COMMAND_OPCODE(start);
+	COMMAND_OPCODE(speak);
+	COMMAND_OPCODE(get);
+	COMMAND_OPCODE(location);
+	COMMAND_OPCODE(open);
+	COMMAND_OPCODE(close);
+	COMMAND_OPCODE(on);
+	COMMAND_OPCODE(off);
+	COMMAND_OPCODE(call);
+	COMMAND_OPCODE(toggle);
+	COMMAND_OPCODE(drop);
+	COMMAND_OPCODE(quit);
+	COMMAND_OPCODE(move);
+	COMMAND_OPCODE(stop);
+}
+
+void ProgramExec_ns::init() {
 
 	Common::Array<const Opcode*> *table = 0;
 
-	SetOpcodeTable(_instructionOpcodes);
+	SetOpcodeTable(_opcodes);
 	INSTRUCTION_OPCODE(invalid);
 	INSTRUCTION_OPCODE(on);
 	INSTRUCTION_OPCODE(off);
@@ -680,25 +708,12 @@ void Parallaction_ns::initOpcodes() {
 	INSTRUCTION_OPCODE(move);
 	INSTRUCTION_OPCODE(endscript);
 
-	SetOpcodeTable(_commandOpcodes);
-	COMMAND_OPCODE(invalid);
-	COMMAND_OPCODE(set);
-	COMMAND_OPCODE(clear);
-	COMMAND_OPCODE(start);
-	COMMAND_OPCODE(speak);
-	COMMAND_OPCODE(get);
-	COMMAND_OPCODE(location);
-	COMMAND_OPCODE(open);
-	COMMAND_OPCODE(close);
-	COMMAND_OPCODE(on);
-	COMMAND_OPCODE(off);
-	COMMAND_OPCODE(call);
-	COMMAND_OPCODE(toggle);
-	COMMAND_OPCODE(drop);
-	COMMAND_OPCODE(quit);
-	COMMAND_OPCODE(move);
-	COMMAND_OPCODE(stop);
 }
 
+ProgramExec_ns::ProgramExec_ns(Parallaction_ns *vm) : _vm(vm) {
+	}
+
+ProgramExec_ns::~ProgramExec_ns() {
+}
 
 }	// namespace Parallaction
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index 65acbcfe58..3797158661 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -302,7 +302,7 @@ bool Input::translateInventoryInput() {
 			_vm->dropItem(z->u.merge->_obj1);
 			_vm->dropItem(z->u.merge->_obj2);
 			_vm->addInventoryItem(z->u.merge->_obj3);
-			_vm->runCommands(z->_commands);
+			_vm->_cmdExec->run(z->_commands);
 		}
 
 		return true;
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index b2146bd292..295f10820f 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -84,12 +84,11 @@ Parallaction::Parallaction(OSystem *syst, const PARALLACTIONGameDescription *gam
 
 
 Parallaction::~Parallaction() {
-	clearSet(_commandOpcodes);
-	clearSet(_instructionOpcodes);
-
 	delete _debugger;
 	delete _globalTable;
 	delete _callableNames;
+	delete _cmdExec;
+	delete _programExec;
 
 	_gfx->clearGfxObjects(kGfxObjCharacter | kGfxObjNormal);
 	hideDialogueStuff();
@@ -386,7 +385,11 @@ void Parallaction::runGame() {
 	_gfx->beginFrame();
 
 	if (_input->_inputMode == Input::kInputModeGame) {
-		runScripts();
+		_programExec->runScripts(_location._programs.begin(), _location._programs.end());
+		_char._ani->_z = _char._ani->height() + _char._ani->_top;
+		if (_char._ani->gfxobj) {
+			_char._ani->gfxobj->z = _char._ani->_z;
+		}
 		walk();
 		drawAnimations();
 	}
@@ -422,7 +425,7 @@ void Parallaction::doLocationEnterTransition() {
 	pal.makeGrayscale();
 	_gfx->setPalette(pal);
 
-	runScripts();
+	_programExec->runScripts(_location._programs.begin(), _location._programs.end());
 	drawAnimations();
 
 	_gfx->updateScreen();
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index c095cab667..13c56cf57b 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -33,6 +33,7 @@
 
 #include "engines/engine.h"
 
+#include "parallaction/exec.h"
 #include "parallaction/input.h"
 #include "parallaction/inventory.h"
 #include "parallaction/parser.h"
@@ -238,10 +239,6 @@ public:
 
 
 
-#define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op()
-#define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op()
-
-
 #define NUM_LOCATIONS 120
 
 class Parallaction : public Engine {
@@ -259,23 +256,6 @@ public:
 
 	Input	*_input;
 
-	OpcodeSet	_commandOpcodes;
-
-	struct ParallactionStruct1 {
-		CommandPtr cmd;
-		ZonePtr	z;
-	} _cmdRunCtxt;
-
-	OpcodeSet	_instructionOpcodes;
-
-	struct ParallactionStruct2 {
-		AnimationPtr	anim;
-		ProgramPtr		program;
-		InstructionList::iterator inst;
-		uint16		modCounter;
-		bool		suspend;
-	} _instRunCtxt;
-
 	void		processInput(InputData* data);
 
 	void		pauseJobs();
@@ -292,8 +272,6 @@ public:
 
 	void		runDialogue(SpeakData*);
 
-	void		runCommands(CommandList& list, ZonePtr z = nullZonePtr);
-
 	AnimationPtr findAnimation(const char *name);
 	void		freeAnimations();
 
@@ -327,6 +305,8 @@ public:
 	Gfx*			_gfx;
 	Disk*			_disk;
 
+	CommandExec*	_cmdExec;
+	ProgramExec*	_programExec;
 	Character		_char;
 
 	void			setLocationFlags(uint32 flags);
@@ -367,10 +347,8 @@ protected:		// members
 	void		runGame();
 	void		updateView();
 
-	void		scheduleLocationSwitch(const char *location);
 	void		doLocationEnterTransition();
 	virtual void changeLocation(char *location) = 0;
-	virtual void changeCharacter(const char *name) = 0;
 	virtual void runPendingZones() = 0;
 	void		allocateLocationSlot(const char *name);
 	void		finalizeLocationParsing();
@@ -389,6 +367,9 @@ protected:		// members
 
 
 public:
+	void		scheduleLocationSwitch(const char *location);
+	virtual void changeCharacter(const char *name) = 0;
+
 	virtual	void callFunction(uint index, void* parm) { }
 
 	virtual void setArrowCursor() = 0;
@@ -398,7 +379,6 @@ public:
 
 	void updateDoor(ZonePtr z);
 
-	virtual void runScripts() = 0;
 	virtual void walk() = 0;
 	virtual void drawAnimations() = 0;
 
@@ -533,7 +513,6 @@ private:
 
 	void initResources();
 	void initCursors();
-	void initParsers();
 
 	static byte _resMouseArrow[256];
 	byte	*_mouseArrow;
@@ -596,49 +575,12 @@ private:
 	const Callable *_callables;
 
 protected:
-	void runScripts();
 	void walk();
 	void drawAnimations();
 
 	void		parseLocation(const char *filename);
 	void		loadProgram(AnimationPtr a, const char *filename);
 
-	void		initOpcodes();
-
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(set);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(clear);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(start);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(speak);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(get);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(location);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(open);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(close);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(on);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(off);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(call);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(toggle);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(drop);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(quit);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(move);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(stop);
-
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(invalid);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(loop);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endloop);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(null);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(call);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(put);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(wait);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(start);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(sound);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
-
 	void		selectStartLocation();
 
 	void		guiStart();
@@ -671,6 +613,9 @@ public:
 	typedef void (Parallaction_br::*Callable)(void*);
 	virtual	void callFunction(uint index, void* parm);
 	void		changeCharacter(const char *name);
+	void setupSubtitles(char *s, char *s2, int y);
+	void clearSubtitles();
+
 
 public:
 	Table		*_countersNames;
@@ -698,8 +643,6 @@ private:
 	void		initResources();
 	void		initFonts();
 	void		freeFonts();
-	void		initOpcodes();
-	void		initParsers();
 
 	void setArrowCursor();
 	void setInventoryCursor(int pos);
@@ -741,68 +684,6 @@ private:
 	void parseLocation(const char* name);
 	void loadProgram(AnimationPtr a, const char *filename);
 
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(location);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(open);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(close);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(on);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(off);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(call);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(drop);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(move);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(start);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(stop);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(character);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(followme);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(onmouse);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(offmouse);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(add);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(leave);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(inc);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(dec);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(ifeq);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(iflt);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(ifgt);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(let);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(music);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(fix);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(unfix);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(zeta);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(scroll);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(swap);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(give);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(text);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(part);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(testsfx);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(ret);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(onsave);
-	DECLARE_UNQUALIFIED_COMMAND_OPCODE(offsave);
-
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(loop);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(dec);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(put);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(wait);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(start);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(process);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(color);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(mask);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(print);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(text);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(mul);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(div);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(ifeq);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(iflt);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(ifgt);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endif);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(stop);
-	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
-
-	void setupSubtitles(char *s, char *s2, int y);
-	void clearSubtitles();
 #if 0
 	void jobWaitRemoveLabelJob(void *parm, Job *job);
 	void jobPauseSfx(void *parm, Job *job);
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index c382f6a7f6..6606550132 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -72,12 +72,16 @@ int Parallaction_br::init() {
 	initResources();
 	initFonts();
 	initCursors();
-	initOpcodes();
 	_locationParser = new LocationParser_br(this);
 	_locationParser->init();
 	_programParser = new ProgramParser_br(this);
 	_programParser->init();
 
+	_cmdExec = new CommandExec_br(this);
+	_cmdExec->init();
+	_programExec = new ProgramExec_br(this);
+	_programExec->init();
+
 	_part = -1;
 
 	_subtitle[0] = -1;
@@ -226,8 +230,14 @@ void Parallaction_br::changeLocation(char *location) {
 	freeBackground();
 	_gfx->clearGfxObjects(kGfxObjNormal | kGfxObjCharacter);
 	_location._programs.clear();
+
+	_location._animations.remove(_char._ani);
+
 	freeZones();
 	freeAnimations();
+
+	_location._animations.push_front(_char._ani);
+
 //	free(_location._comment);
 //	_location._comment = 0;
 //	_location._commands.clear();
@@ -236,9 +246,9 @@ void Parallaction_br::changeLocation(char *location) {
 
 	// load new location
 	parseLocation(location);
-	runCommands(_location._commands);
+	_cmdExec->run(_location._commands);
 //	doLocationEnterTransition();
-	runCommands(_location._aCommands);
+	_cmdExec->run(_location._aCommands);
 
 	_engineFlags &= ~kEngineChangeLocation;
 }
@@ -287,12 +297,16 @@ void Parallaction_br::loadProgram(AnimationPtr a, const char *filename) {
 
 
 void Parallaction_br::changeCharacter(const char *name) {
+	printf("changeCharacter(%s)\n", name);
+
 	const char *charName = _char.getName();
 	if (!scumm_stricmp(charName, name)) {
 		return;
 	}
 
 	_char.setName(name);
+	_char._ani->gfxobj = _gfx->loadAnim(name);
+	_char._ani->gfxobj->setFlags(kGfxObjCharacter);
 	_char._talk = _disk->loadTalk(name);
 }
 
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index a2217e4a73..850123de97 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -135,12 +135,16 @@ int Parallaction_ns::init() {
 	initResources();
 	initFonts();
 	initCursors();
-	initOpcodes();
 	_locationParser = new LocationParser_ns(this);
 	_locationParser->init();
 	_programParser = new ProgramParser_ns(this);
 	_programParser->init();
 
+	_cmdExec = new CommandExec_ns(this);
+	_cmdExec->init();
+	_programExec = new ProgramExec_ns(this);
+	_programExec->init();
+
 	_introSarcData1 = 0;
 	_introSarcData2 = 1;
 	_introSarcData3 = 200;
@@ -353,11 +357,11 @@ void Parallaction_ns::changeLocation(char *location) {
 	// and acommands are executed, so that it can be set again if needed.
 	_engineFlags &= ~kEngineChangeLocation;
 
-	runCommands(_location._commands);
+	_cmdExec->run(_location._commands);
 
 	doLocationEnterTransition();
 
-	runCommands(_location._aCommands);
+	_cmdExec->run(_location._aCommands);
 
 	if (_location._hasSound)
 		_soundMan->playSfx(_location._soundFile, 0, true);
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index 0a8ded9e29..7d74dd0e0a 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -347,7 +347,7 @@ uint16 Parallaction::checkDoor() {
 			_zoneTrap = nullZonePtr;
 
 		} else {
-			runCommands(z->_commands, z);
+			_cmdExec->run(z->_commands, z);
 		}
 	}
 
@@ -356,13 +356,13 @@ uint16 Parallaction::checkDoor() {
 
 	if (z) {
 		setLocationFlags(kFlagsEnter);
-		runCommands(z->_commands, z);
+		_cmdExec->run(z->_commands, z);
 		clearLocationFlags(kFlagsEnter);
 		_zoneTrap = z;
 	} else
 	if (_zoneTrap) {
 		setLocationFlags(kFlagsExit);
-		runCommands(_zoneTrap->_commands, _zoneTrap);
+		_cmdExec->run(_zoneTrap->_commands, _zoneTrap);
 		clearLocationFlags(kFlagsExit);
 		_zoneTrap = nullZonePtr;
 	}
-- 
cgit v1.2.3


From 8ba56e98cf1887600b204f347af4ee183c326cd1 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Fri, 11 Jul 2008 13:36:22 +0000
Subject: Cleanup.

svn-id: r33006
---
 engines/parallaction/exec.h      |   8 ++-
 engines/parallaction/exec_br.cpp |  80 ++++++++++++------------
 engines/parallaction/exec_ns.cpp | 129 +++++++++++++++++++--------------------
 3 files changed, 108 insertions(+), 109 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h
index ca359c2a8e..f41ce52302 100644
--- a/engines/parallaction/exec.h
+++ b/engines/parallaction/exec.h
@@ -47,7 +47,7 @@ protected:
 	struct ParallactionStruct1 {
 		CommandPtr cmd;
 		ZonePtr	z;
-	} _cmdRunCtxt;
+	} _ctxt;
 
 	OpcodeSet	_opcodes;
 
@@ -153,14 +153,16 @@ protected:
 		InstructionList::iterator inst;
 		uint16		modCounter;
 		bool		suspend;
-	} _instRunCtxt;
+	} _ctxt;
 
 	OpcodeSet	_opcodes;
 
+	uint16	_modCounter;
+
 public:
 	virtual void init() = 0;
 	virtual void runScripts(ProgramList::iterator first, ProgramList::iterator last);
-	ProgramExec() {
+	ProgramExec() : _modCounter(0) {
 	}
 	virtual ~ProgramExec() {
 		for (Common::Array<const Opcode*>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
index eca01ea06a..edb832cffc 100644
--- a/engines/parallaction/exec_br.cpp
+++ b/engines/parallaction/exec_br.cpp
@@ -116,7 +116,7 @@ DECLARE_COMMAND_OPCODE(location) {
 	warning("Parallaction_br::cmdOp_location command not yet implemented");
 
 	// TODO: handle startPos and startPos2
-	_vm->scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string);
+	_vm->scheduleLocationSwitch(_ctxt.cmd->u._string);
 }
 
 
@@ -131,7 +131,7 @@ DECLARE_COMMAND_OPCODE(close) {
 
 
 DECLARE_COMMAND_OPCODE(on) {
-	CommandData *data = &_cmdRunCtxt.cmd->u;
+	CommandData *data = &_ctxt.cmd->u;
 	ZonePtr z = data->_zone;
 
 	if (z) {
@@ -146,7 +146,7 @@ DECLARE_COMMAND_OPCODE(on) {
 
 
 DECLARE_COMMAND_OPCODE(off) {
-	CommandData *data = &_cmdRunCtxt.cmd->u;
+	CommandData *data = &_ctxt.cmd->u;
 	ZonePtr z = data->_zone;
 
 	if (z) {
@@ -160,7 +160,7 @@ DECLARE_COMMAND_OPCODE(off) {
 
 
 DECLARE_COMMAND_OPCODE(call) {
-	_vm->callFunction(_cmdRunCtxt.cmd->u._callable, &_cmdRunCtxt.z);
+	_vm->callFunction(_ctxt.cmd->u._callable, &_ctxt.z);
 }
 
 
@@ -174,17 +174,17 @@ DECLARE_COMMAND_OPCODE(move) {
 }
 
 DECLARE_COMMAND_OPCODE(start) {
-	_cmdRunCtxt.cmd->u._zone->_flags |= kFlagsActing;
+	_ctxt.cmd->u._zone->_flags |= kFlagsActing;
 }
 
 DECLARE_COMMAND_OPCODE(stop) {
-	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsActing;
+	_ctxt.cmd->u._zone->_flags &= ~kFlagsActing;
 }
 
 
 DECLARE_COMMAND_OPCODE(character) {
-	debugC(9, kDebugExec, "Parallaction_br::cmdOp_character(%s)", _cmdRunCtxt.cmd->u._string);
-	_vm->changeCharacter(_cmdRunCtxt.cmd->u._string);
+	debugC(9, kDebugExec, "Parallaction_br::cmdOp_character(%s)", _ctxt.cmd->u._string);
+	_vm->changeCharacter(_ctxt.cmd->u._string);
 }
 
 
@@ -214,17 +214,17 @@ DECLARE_COMMAND_OPCODE(leave) {
 
 
 DECLARE_COMMAND_OPCODE(inc) {
-	_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] += _cmdRunCtxt.cmd->u._rvalue;
+	_vm->_counters[_ctxt.cmd->u._lvalue] += _ctxt.cmd->u._rvalue;
 }
 
 
 DECLARE_COMMAND_OPCODE(dec) {
-	_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] -= _cmdRunCtxt.cmd->u._rvalue;
+	_vm->_counters[_ctxt.cmd->u._lvalue] -= _ctxt.cmd->u._rvalue;
 }
 
 
 DECLARE_COMMAND_OPCODE(ifeq) {
-	if (_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] == _cmdRunCtxt.cmd->u._rvalue) {
+	if (_vm->_counters[_ctxt.cmd->u._lvalue] == _ctxt.cmd->u._rvalue) {
 		_vm->setLocationFlags(kFlagsTestTrue);
 	} else {
 		_vm->clearLocationFlags(kFlagsTestTrue);
@@ -232,7 +232,7 @@ DECLARE_COMMAND_OPCODE(ifeq) {
 }
 
 DECLARE_COMMAND_OPCODE(iflt) {
-	if (_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] < _cmdRunCtxt.cmd->u._rvalue) {
+	if (_vm->_counters[_ctxt.cmd->u._lvalue] < _ctxt.cmd->u._rvalue) {
 		_vm->setLocationFlags(kFlagsTestTrue);
 	} else {
 		_vm->clearLocationFlags(kFlagsTestTrue);
@@ -240,7 +240,7 @@ DECLARE_COMMAND_OPCODE(iflt) {
 }
 
 DECLARE_COMMAND_OPCODE(ifgt) {
-	if (_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] > _cmdRunCtxt.cmd->u._rvalue) {
+	if (_vm->_counters[_ctxt.cmd->u._lvalue] > _ctxt.cmd->u._rvalue) {
 		_vm->setLocationFlags(kFlagsTestTrue);
 	} else {
 		_vm->clearLocationFlags(kFlagsTestTrue);
@@ -249,7 +249,7 @@ DECLARE_COMMAND_OPCODE(ifgt) {
 
 
 DECLARE_COMMAND_OPCODE(let) {
-	_vm->_counters[_cmdRunCtxt.cmd->u._lvalue] = _cmdRunCtxt.cmd->u._rvalue;
+	_vm->_counters[_ctxt.cmd->u._lvalue] = _ctxt.cmd->u._rvalue;
 }
 
 
@@ -259,25 +259,25 @@ DECLARE_COMMAND_OPCODE(music) {
 
 
 DECLARE_COMMAND_OPCODE(fix) {
-	_cmdRunCtxt.cmd->u._zone->_flags |= kFlagsFixed;
+	_ctxt.cmd->u._zone->_flags |= kFlagsFixed;
 }
 
 
 DECLARE_COMMAND_OPCODE(unfix) {
-	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsFixed;
+	_ctxt.cmd->u._zone->_flags &= ~kFlagsFixed;
 }
 
 
 DECLARE_COMMAND_OPCODE(zeta) {
-	_vm->_location._zeta0 = _cmdRunCtxt.cmd->u._zeta0;
-	_vm->_location._zeta1 = _cmdRunCtxt.cmd->u._zeta1;
-	_vm->_location._zeta2 = _cmdRunCtxt.cmd->u._zeta2;
+	_vm->_location._zeta0 = _ctxt.cmd->u._zeta0;
+	_vm->_location._zeta1 = _ctxt.cmd->u._zeta1;
+	_vm->_location._zeta2 = _ctxt.cmd->u._zeta2;
 }
 
 
 DECLARE_COMMAND_OPCODE(scroll) {
 	warning("Parallaction_br::cmdOp_scroll not yet implemented");
-	_vm->_gfx->setVar("scroll_x", _cmdRunCtxt.cmd->u._rvalue );
+	_vm->_gfx->setVar("scroll_x", _ctxt.cmd->u._rvalue );
 }
 
 
@@ -292,7 +292,7 @@ DECLARE_COMMAND_OPCODE(give) {
 
 
 DECLARE_COMMAND_OPCODE(text) {
-	CommandData *data = &_cmdRunCtxt.cmd->u;
+	CommandData *data = &_ctxt.cmd->u;
 	_vm->setupSubtitles(data->_string, data->_string2, data->_zeta0);
 }
 
@@ -326,7 +326,7 @@ DECLARE_COMMAND_OPCODE(offsave) {
 
 
 DECLARE_INSTRUCTION_OPCODE(on) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 	ZonePtr z = inst->_z;
 
 	if (z) {
@@ -341,7 +341,7 @@ DECLARE_INSTRUCTION_OPCODE(on) {
 
 
 DECLARE_INSTRUCTION_OPCODE(off) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 	ZonePtr z = inst->_z;
 
 	if (z) {
@@ -355,7 +355,7 @@ DECLARE_INSTRUCTION_OPCODE(off) {
 
 
 DECLARE_INSTRUCTION_OPCODE(set) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
 	int16 rvalue = inst->_opB.getRValue();
 	int16* lvalue = inst->_opA.getLValue();
@@ -366,21 +366,21 @@ DECLARE_INSTRUCTION_OPCODE(set) {
 
 
 DECLARE_INSTRUCTION_OPCODE(loop) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
-	_instRunCtxt.program->_loopCounter = inst->_opB.getRValue();
-	_instRunCtxt.program->_loopStart = _instRunCtxt.inst;
+	_ctxt.program->_loopCounter = inst->_opB.getRValue();
+	_ctxt.program->_loopStart = _ctxt.inst;
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(inc) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
 	int16 rvalue = inst->_opB.getRValue();
 
 	if (inst->_flags & kInstMod) {	// mod
 		int16 _bx = (rvalue > 0 ? rvalue : -rvalue);
-		if (_instRunCtxt.modCounter % _bx != 0) return;
+		if (_ctxt.modCounter % _bx != 0) return;
 
 		rvalue = (rvalue > 0 ?  1 : -1);
 	}
@@ -427,12 +427,12 @@ DECLARE_INSTRUCTION_OPCODE(wait) {
 
 
 DECLARE_INSTRUCTION_OPCODE(start) {
-	(*_instRunCtxt.inst)->_z->_flags |= kFlagsActing;
+	(*_ctxt.inst)->_z->_flags |= kFlagsActing;
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(process) {
-	_vm->_activeZone2 = (*_instRunCtxt.inst)->_z;
+	_vm->_activeZone2 = (*_ctxt.inst)->_z;
 }
 
 
@@ -442,7 +442,7 @@ DECLARE_INSTRUCTION_OPCODE(move) {
 
 
 DECLARE_INSTRUCTION_OPCODE(color) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
 	int16 entry = inst->_opB.getRValue();
 
@@ -453,7 +453,7 @@ DECLARE_INSTRUCTION_OPCODE(color) {
 
 DECLARE_INSTRUCTION_OPCODE(mask) {
 #if 0
-	Instruction *inst = *_instRunCtxt.inst;
+	Instruction *inst = *_ctxt.inst;
 	_gfx->_bgLayers[0] = inst->_opA.getRValue();
 	_gfx->_bgLayers[1] = inst->_opB.getRValue();
 	_gfx->_bgLayers[2] = inst->_opC.getRValue();
@@ -466,7 +466,7 @@ DECLARE_INSTRUCTION_OPCODE(print) {
 }
 
 DECLARE_INSTRUCTION_OPCODE(text) {
-	InstructionPtr inst = (*_instRunCtxt.inst);
+	InstructionPtr inst = (*_ctxt.inst);
 	_vm->setupSubtitles(inst->_text, inst->_text2, inst->_y);
 }
 
@@ -496,14 +496,14 @@ DECLARE_INSTRUCTION_OPCODE(stop) {
 }
 
 DECLARE_INSTRUCTION_OPCODE(endscript) {
-	if ((_instRunCtxt.anim->_flags & kFlagsLooping) == 0) {
-		_instRunCtxt.anim->_flags &= ~kFlagsActing;
-		_vm->_cmdExec->run(_instRunCtxt.anim->_commands, _instRunCtxt.anim);
-		_instRunCtxt.program->_status = kProgramDone;
+	if ((_ctxt.anim->_flags & kFlagsLooping) == 0) {
+		_ctxt.anim->_flags &= ~kFlagsActing;
+		_vm->_cmdExec->run(_ctxt.anim->_commands, _ctxt.anim);
+		_ctxt.program->_status = kProgramDone;
 	}
-	_instRunCtxt.program->_ip = _instRunCtxt.program->_instructions.begin();
+	_ctxt.program->_ip = _ctxt.program->_instructions.begin();
 
-	_instRunCtxt.suspend = true;
+	_ctxt.suspend = true;
 }
 
 void CommandExec_br::init() {
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 1250d276f6..9a93197f04 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -65,7 +65,7 @@ typedef Common::Functor0Mem<void, ProgramExec_ns> OpcodeV2;
 
 
 DECLARE_INSTRUCTION_OPCODE(on) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
 	inst->_a->_flags |= kFlagsActive;
 	inst->_a->_flags &= ~kFlagsRemove;
@@ -73,31 +73,31 @@ DECLARE_INSTRUCTION_OPCODE(on) {
 
 
 DECLARE_INSTRUCTION_OPCODE(off) {
-	(*_instRunCtxt.inst)->_a->_flags |= kFlagsRemove;
+	(*_ctxt.inst)->_a->_flags |= kFlagsRemove;
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(loop) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
-	_instRunCtxt.program->_loopCounter = inst->_opB.getRValue();
-	_instRunCtxt.program->_loopStart = _instRunCtxt.inst;
+	_ctxt.program->_loopCounter = inst->_opB.getRValue();
+	_ctxt.program->_loopStart = _ctxt.inst;
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(endloop) {
-	if (--_instRunCtxt.program->_loopCounter > 0) {
-		_instRunCtxt.inst = _instRunCtxt.program->_loopStart;
+	if (--_ctxt.program->_loopCounter > 0) {
+		_ctxt.inst = _ctxt.program->_loopStart;
 	}
 }
 
 DECLARE_INSTRUCTION_OPCODE(inc) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 	int16 _si = inst->_opB.getRValue();
 
 	if (inst->_flags & kInstMod) {	// mod
 		int16 _bx = (_si > 0 ? _si : -_si);
-		if (_instRunCtxt.modCounter % _bx != 0) return;
+		if (_modCounter % _bx != 0) return;
 
 		_si = (_si > 0 ?  1 : -1);
 	}
@@ -118,7 +118,7 @@ DECLARE_INSTRUCTION_OPCODE(inc) {
 
 
 DECLARE_INSTRUCTION_OPCODE(set) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 
 	int16 _si = inst->_opB.getRValue();
 	int16 *lvalue = inst->_opA.getLValue();
@@ -129,7 +129,7 @@ DECLARE_INSTRUCTION_OPCODE(set) {
 
 
 DECLARE_INSTRUCTION_OPCODE(put) {
-	InstructionPtr inst = *_instRunCtxt.inst;
+	InstructionPtr inst = *_ctxt.inst;
 	Graphics::Surface v18;
 	v18.w = inst->_a->width();
 	v18.h = inst->_a->height();
@@ -147,32 +147,32 @@ DECLARE_INSTRUCTION_OPCODE(null) {
 }
 
 DECLARE_INSTRUCTION_OPCODE(invalid) {
-	error("Can't execute invalid opcode %i", (*_instRunCtxt.inst)->_index);
+	error("Can't execute invalid opcode %i", (*_ctxt.inst)->_index);
 }
 
 DECLARE_INSTRUCTION_OPCODE(call) {
-	_vm->callFunction((*_instRunCtxt.inst)->_immediate, 0);
+	_vm->callFunction((*_ctxt.inst)->_immediate, 0);
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(wait) {
 	if (_engineFlags & kEngineWalking)
-		_instRunCtxt.suspend = true;
+		_ctxt.suspend = true;
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(start) {
-	(*_instRunCtxt.inst)->_a->_flags |= (kFlagsActing | kFlagsActive);
+	(*_ctxt.inst)->_a->_flags |= (kFlagsActing | kFlagsActive);
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(sound) {
-	_vm->_activeZone = (*_instRunCtxt.inst)->_z;
+	_vm->_activeZone = (*_ctxt.inst)->_z;
 }
 
 
 DECLARE_INSTRUCTION_OPCODE(move) {
-	InstructionPtr inst = (*_instRunCtxt.inst);
+	InstructionPtr inst = (*_ctxt.inst);
 
 	int16 x = inst->_opA.getRValue();
 	int16 y = inst->_opB.getRValue();
@@ -181,82 +181,82 @@ DECLARE_INSTRUCTION_OPCODE(move) {
 }
 
 DECLARE_INSTRUCTION_OPCODE(endscript) {
-	if ((_instRunCtxt.anim->_flags & kFlagsLooping) == 0) {
-		_instRunCtxt.anim->_flags &= ~kFlagsActing;
-		_vm->_cmdExec->run(_instRunCtxt.anim->_commands, _instRunCtxt.anim);
-		_instRunCtxt.program->_status = kProgramDone;
+	if ((_ctxt.anim->_flags & kFlagsLooping) == 0) {
+		_ctxt.anim->_flags &= ~kFlagsActing;
+		_vm->_cmdExec->run(_ctxt.anim->_commands, _ctxt.anim);
+		_ctxt.program->_status = kProgramDone;
 	}
-	_instRunCtxt.program->_ip = _instRunCtxt.program->_instructions.begin();
+	_ctxt.program->_ip = _ctxt.program->_instructions.begin();
 
-	_instRunCtxt.suspend = true;
+	_ctxt.suspend = true;
 }
 
 
 
 
 DECLARE_COMMAND_OPCODE(invalid) {
-	error("Can't execute invalid command '%i'", _cmdRunCtxt.cmd->_id);
+	error("Can't execute invalid command '%i'", _ctxt.cmd->_id);
 }
 
 DECLARE_COMMAND_OPCODE(set) {
-	if (_cmdRunCtxt.cmd->u._flags & kFlagsGlobal) {
-		_cmdRunCtxt.cmd->u._flags &= ~kFlagsGlobal;
-		_commandFlags |= _cmdRunCtxt.cmd->u._flags;
+	if (_ctxt.cmd->u._flags & kFlagsGlobal) {
+		_ctxt.cmd->u._flags &= ~kFlagsGlobal;
+		_commandFlags |= _ctxt.cmd->u._flags;
 	} else {
-		_vm->setLocationFlags(_cmdRunCtxt.cmd->u._flags);
+		_vm->setLocationFlags(_ctxt.cmd->u._flags);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(clear) {
-	if (_cmdRunCtxt.cmd->u._flags & kFlagsGlobal) {
-		_cmdRunCtxt.cmd->u._flags &= ~kFlagsGlobal;
-		_commandFlags &= ~_cmdRunCtxt.cmd->u._flags;
+	if (_ctxt.cmd->u._flags & kFlagsGlobal) {
+		_ctxt.cmd->u._flags &= ~kFlagsGlobal;
+		_commandFlags &= ~_ctxt.cmd->u._flags;
 	} else {
-		_vm->clearLocationFlags(_cmdRunCtxt.cmd->u._flags);
+		_vm->clearLocationFlags(_ctxt.cmd->u._flags);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(start) {
-	_cmdRunCtxt.cmd->u._zone->_flags |= kFlagsActing;
+	_ctxt.cmd->u._zone->_flags |= kFlagsActing;
 }
 
 
 DECLARE_COMMAND_OPCODE(speak) {
-	_vm->_activeZone = _cmdRunCtxt.cmd->u._zone;
+	_vm->_activeZone = _ctxt.cmd->u._zone;
 }
 
 
 DECLARE_COMMAND_OPCODE(get) {
-	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsFixed;
-	_vm->runZone(_cmdRunCtxt.cmd->u._zone);
+	_ctxt.cmd->u._zone->_flags &= ~kFlagsFixed;
+	_vm->runZone(_ctxt.cmd->u._zone);
 }
 
 
 DECLARE_COMMAND_OPCODE(location) {
-	_vm->scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string);
+	_vm->scheduleLocationSwitch(_ctxt.cmd->u._string);
 }
 
 
 DECLARE_COMMAND_OPCODE(open) {
-	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsClosed;
-	if (_cmdRunCtxt.cmd->u._zone->u.door->gfxobj) {
-		_vm->updateDoor(_cmdRunCtxt.cmd->u._zone);
+	_ctxt.cmd->u._zone->_flags &= ~kFlagsClosed;
+	if (_ctxt.cmd->u._zone->u.door->gfxobj) {
+		_vm->updateDoor(_ctxt.cmd->u._zone);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(close) {
-	_cmdRunCtxt.cmd->u._zone->_flags |= kFlagsClosed;
-	if (_cmdRunCtxt.cmd->u._zone->u.door->gfxobj) {
-		_vm->updateDoor(_cmdRunCtxt.cmd->u._zone);
+	_ctxt.cmd->u._zone->_flags |= kFlagsClosed;
+	if (_ctxt.cmd->u._zone->u.door->gfxobj) {
+		_vm->updateDoor(_ctxt.cmd->u._zone);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(on) {
-	ZonePtr z = _cmdRunCtxt.cmd->u._zone;
+	ZonePtr z = _ctxt.cmd->u._zone;
 	// WORKAROUND: the original DOS-based engine didn't check u->_zone before dereferencing
 	// the pointer to get structure members, thus leading to crashes in systems with memory
 	// protection.
@@ -274,27 +274,27 @@ DECLARE_COMMAND_OPCODE(on) {
 
 
 DECLARE_COMMAND_OPCODE(off) {
-	_cmdRunCtxt.cmd->u._zone->_flags |= kFlagsRemove;
+	_ctxt.cmd->u._zone->_flags |= kFlagsRemove;
 }
 
 
 DECLARE_COMMAND_OPCODE(call) {
-	_vm->callFunction(_cmdRunCtxt.cmd->u._callable, &_cmdRunCtxt.z);
+	_vm->callFunction(_ctxt.cmd->u._callable, &_ctxt.z);
 }
 
 
 DECLARE_COMMAND_OPCODE(toggle) {
-	if (_cmdRunCtxt.cmd->u._flags & kFlagsGlobal) {
-		_cmdRunCtxt.cmd->u._flags &= ~kFlagsGlobal;
-		_commandFlags ^= _cmdRunCtxt.cmd->u._flags;
+	if (_ctxt.cmd->u._flags & kFlagsGlobal) {
+		_ctxt.cmd->u._flags &= ~kFlagsGlobal;
+		_commandFlags ^= _ctxt.cmd->u._flags;
 	} else {
-		_vm->toggleLocationFlags(_cmdRunCtxt.cmd->u._flags);
+		_vm->toggleLocationFlags(_ctxt.cmd->u._flags);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(drop){
-	_vm->dropItem( _cmdRunCtxt.cmd->u._object );
+	_vm->dropItem( _ctxt.cmd->u._object );
 }
 
 
@@ -304,12 +304,12 @@ DECLARE_COMMAND_OPCODE(quit) {
 
 
 DECLARE_COMMAND_OPCODE(move) {
-	_vm->_char.scheduleWalk(_cmdRunCtxt.cmd->u._move.x, _cmdRunCtxt.cmd->u._move.y);
+	_vm->_char.scheduleWalk(_ctxt.cmd->u._move.x, _ctxt.cmd->u._move.y);
 }
 
 
 DECLARE_COMMAND_OPCODE(stop) {
-	_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsActing;
+	_ctxt.cmd->u._zone->_flags &= ~kFlagsActing;
 }
 
 
@@ -365,8 +365,6 @@ void ProgramExec::runScripts(ProgramList::iterator first, ProgramList::iterator
 
 	debugC(9, kDebugExec, "runScripts");
 
-	static uint16 modCounter = 0;
-
 	for (ProgramList::iterator it = first; it != last; it++) {
 
 		AnimationPtr a = (*it)->_anim;
@@ -384,17 +382,16 @@ void ProgramExec::runScripts(ProgramList::iterator first, ProgramList::iterator
 
 			debugC(9, kDebugExec, "Animation: %s, instruction: %i", a->_name, (*inst)->_index); //_instructionNamesRes[(*inst)->_index - 1]);
 
-			_instRunCtxt.inst = inst;
-			_instRunCtxt.anim = AnimationPtr(a);
-			_instRunCtxt.program = *it;
-			_instRunCtxt.modCounter = modCounter;
-			_instRunCtxt.suspend = false;
+			_ctxt.inst = inst;
+			_ctxt.anim = AnimationPtr(a);
+			_ctxt.program = *it;
+			_ctxt.suspend = false;
 
 			(*_opcodes[(*inst)->_index])();
 
-			inst = _instRunCtxt.inst;		// handles endloop correctly
+			inst = _ctxt.inst;		// handles endloop correctly
 
-			if (_instRunCtxt.suspend)
+			if (_ctxt.suspend)
 				goto label1;
 
 			inst++;
@@ -407,7 +404,7 @@ label1:
 			a->_z = a->_top + a->height();
 	}
 
-	modCounter++;
+	_modCounter++;
 
 	return;
 }
@@ -437,8 +434,8 @@ void CommandExec::run(CommandList& list, ZonePtr z) {
 		if ((cmd->_flagsOn & v8) != cmd->_flagsOn) continue;
 		if ((cmd->_flagsOff & ~v8) != cmd->_flagsOff) continue;
 
-		_cmdRunCtxt.z = z;
-		_cmdRunCtxt.cmd = cmd;
+		_ctxt.z = z;
+		_ctxt.cmd = cmd;
 
 		(*_opcodes[cmd->_id])();
 	}
@@ -711,7 +708,7 @@ void ProgramExec_ns::init() {
 }
 
 ProgramExec_ns::ProgramExec_ns(Parallaction_ns *vm) : _vm(vm) {
-	}
+}
 
 ProgramExec_ns::~ProgramExec_ns() {
 }
-- 
cgit v1.2.3


From 815d75e870bc4d365cfa979f3786840eecece2ec Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 11 Jul 2008 20:28:14 +0000
Subject: Don't use kPlainSoundType if you don't have to

svn-id: r33009
---
 engines/gob/sound/soundmixer.h | 2 +-
 engines/igor/igor.cpp          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/sound/soundmixer.h b/engines/gob/sound/soundmixer.h
index 5789885a99..3e8e6b5c1b 100644
--- a/engines/gob/sound/soundmixer.h
+++ b/engines/gob/sound/soundmixer.h
@@ -37,7 +37,7 @@ namespace Gob {
 
 class SoundMixer : public Audio::AudioStream {
 public:
-	SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType);
+	SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type);
 	~SoundMixer();
 
 	virtual void play(SoundDesc &sndDesc, int16 repCount,
diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp
index 018709f34f..4d4fb97762 100644
--- a/engines/igor/igor.cpp
+++ b/engines/igor/igor.cpp
@@ -404,7 +404,7 @@ void IgorEngine::playSound(int num, int type) {
 	debugC(9, kDebugEngine, "playSound() %d", num);
 	--num;
 	int soundOffset = -1;
-	Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType;
+	Audio::Mixer::SoundType soundType;
 	Audio::SoundHandle *soundHandle = 0;
 	if (type == 1) {
 		if (_mixer->isSoundHandleActive(_sfxHandle)) {
-- 
cgit v1.2.3


From 7ddd961bf2ded1d9cad114ea03018d44258e9ca8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 11 Jul 2008 20:28:50 +0000
Subject: cleanup

svn-id: r33010
---
 engines/scumm/saveload.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 36b82519e9..f9e4eb415c 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -411,15 +411,15 @@ void ScummEngine::listSavegames(bool *marks, int num) {
 	char prefix[256];
 	char slot[3];
 	int slotNum;
-	Common::StringList filenames;
+	Common::StringList files;
 
 	makeSavegameName(prefix, 99, false);
 	prefix[strlen(prefix)-2] = '*';
 	prefix[strlen(prefix)-1] = 0;
 	memset(marks, false, num * sizeof(bool));	//assume no savegames for this title
-	filenames = _saveFileMan->listSavefiles(prefix);
+	files = _saveFileMan->listSavefiles(prefix);
 
-	for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++){
+	for (Common::StringList::const_iterator file = files.begin(); file != files.end(); ++file) {
 		//Obtain the last 2 digits of the filename, since they correspond to the save slot
 		slot[0] = file->c_str()[file->size()-2];
 		slot[1] = file->c_str()[file->size()-1];
-- 
cgit v1.2.3


From c1ec21d999253d86513ce66876c692be198b91c0 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 12 Jul 2008 15:21:38 +0000
Subject: Changed tricky variable access from pointers to a new class that
 minds endianess. This should fix a few regressions with BE games on LE
 systems and vice versa that I introduced when I changed how variables are
 stored (which was necessary to get Woodruff work on BE systems).

svn-id: r33014
---
 engines/gob/goblin.cpp    | 330 +++++++++++++++++++---------------------------
 engines/gob/goblin.h      | 103 ++++++++-------
 engines/gob/inter.h       |   2 +-
 engines/gob/inter_v1.cpp  | 173 ++++++++++++------------
 engines/gob/inter_v2.cpp  |  12 +-
 engines/gob/mult.cpp      |  26 +++-
 engines/gob/mult.h        |   9 +-
 engines/gob/mult_v1.cpp   |  33 +++--
 engines/gob/mult_v2.cpp   |  26 ++--
 engines/gob/sound/sound.h |   2 +-
 engines/gob/variables.cpp |  58 ++++++++
 engines/gob/variables.h   |  26 ++++
 12 files changed, 441 insertions(+), 359 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp
index e7aed0790e..5add0b9cea 100644
--- a/engines/gob/goblin.cpp
+++ b/engines/gob/goblin.cpp
@@ -78,58 +78,6 @@ Goblin::Goblin(GobEngine *vm) : _vm(vm) {
 	_pressedMapY = 0;
 	_pathExistence = 0;
 
-	_some0ValPtr = 0;
-
-	_gobRetVarPtr = 0;
-	_curGobVarPtr = 0;
-	_curGobXPosVarPtr = 0;
-	_curGobYPosVarPtr = 0;
-	_itemInPocketVarPtr = 0;
-
-	_curGobStateVarPtr = 0;
-	_curGobFrameVarPtr = 0;
-	_curGobMultStateVarPtr = 0;
-	_curGobNextStateVarPtr = 0;
-	_curGobScrXVarPtr = 0;
-	_curGobScrYVarPtr = 0;
-	_curGobLeftVarPtr = 0;
-	_curGobTopVarPtr = 0;
-	_curGobRightVarPtr = 0;
-	_curGobBottomVarPtr = 0;
-	_curGobDoAnimVarPtr = 0;
-	_curGobOrderVarPtr = 0;
-	_curGobNoTickVarPtr = 0;
-	_curGobTypeVarPtr = 0;
-	_curGobMaxTickVarPtr = 0;
-	_curGobTickVarPtr = 0;
-	_curGobActStartStateVarPtr = 0;
-	_curGobLookDirVarPtr = 0;
-	_curGobPickableVarPtr = 0;
-	_curGobRelaxVarPtr = 0;
-	_curGobMaxFrameVarPtr = 0;
-
-	_destItemStateVarPtr = 0;
-	_destItemFrameVarPtr = 0;
-	_destItemMultStateVarPtr = 0;
-	_destItemNextStateVarPtr = 0;
-	_destItemScrXVarPtr = 0;
-	_destItemScrYVarPtr = 0;
-	_destItemLeftVarPtr = 0;
-	_destItemTopVarPtr = 0;
-	_destItemRightVarPtr = 0;
-	_destItemBottomVarPtr = 0;
-	_destItemDoAnimVarPtr = 0;
-	_destItemOrderVarPtr = 0;
-	_destItemNoTickVarPtr = 0;
-	_destItemTypeVarPtr = 0;
-	_destItemMaxTickVarPtr = 0;
-	_destItemTickVarPtr = 0;
-	_destItemActStartStVarPtr = 0;
-	_destItemLookDirVarPtr = 0;
-	_destItemPickableVarPtr = 0;
-	_destItemRelaxVarPtr = 0;
-	_destItemMaxFrameVarPtr = 0;
-
 	_destItemType = 0;
 	_destItemState = 0;
 	for (int i = 0; i < 20; i++) {
@@ -690,7 +638,7 @@ void Goblin::switchGoblin(int16 index) {
 	_gobDestY = tmp;
 	_vm->_map->_curGoblinY = tmp;
 
-	*_curGobVarPtr = _currentGoblin;
+	_curGobVarPtr = (uint32) _currentGoblin;
 	_pathExistence = 0;
 	_readyToAct = 0;
 }
@@ -1250,172 +1198,172 @@ void Goblin::loadObjects(const char *source) {
 
 void Goblin::saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal) {
 	Gob_Object *obj;
-	*_some0ValPtr = someVal;
-	*_curGobXPosVarPtr = xPos;
-	*_curGobYPosVarPtr = yPos;
-	*_itemInPocketVarPtr = _itemIndInPocket;
+	_some0ValPtr = (uint32) someVal;
+	_curGobXPosVarPtr = (uint32) xPos;
+	_curGobYPosVarPtr = (uint32) yPos;
+	_itemInPocketVarPtr = (uint32) _itemIndInPocket;
 
 	obj = _goblins[_currentGoblin];
 
-	*_curGobStateVarPtr = obj->state;
-	*_curGobFrameVarPtr = obj->curFrame;
-	*_curGobMultStateVarPtr = obj->multState;
-	*_curGobNextStateVarPtr = obj->nextState;
-	*_curGobScrXVarPtr = obj->xPos;
-	*_curGobScrYVarPtr = obj->yPos;
-	*_curGobLeftVarPtr = obj->left;
-	*_curGobTopVarPtr = obj->top;
-	*_curGobRightVarPtr = obj->right;
-	*_curGobBottomVarPtr = obj->bottom;
-	*_curGobDoAnimVarPtr = obj->doAnim;
-	*_curGobOrderVarPtr = obj->order;
-	*_curGobNoTickVarPtr = obj->noTick;
-	*_curGobTypeVarPtr = obj->type;
-	*_curGobMaxTickVarPtr = obj->maxTick;
-	*_curGobTickVarPtr = obj->tick;
-	*_curGobActStartStateVarPtr = obj->actionStartState;
-	*_curGobLookDirVarPtr = obj->curLookDir;
-	*_curGobPickableVarPtr = obj->pickable;
-	*_curGobRelaxVarPtr = obj->relaxTime;
-	*_curGobMaxFrameVarPtr = getObjMaxFrame(obj);
+	_curGobStateVarPtr = (uint32) obj->state;
+	_curGobFrameVarPtr = (uint32) obj->curFrame;
+	_curGobMultStateVarPtr = (uint32) obj->multState;
+	_curGobNextStateVarPtr = (uint32) obj->nextState;
+	_curGobScrXVarPtr = (uint32) obj->xPos;
+	_curGobScrYVarPtr = (uint32) obj->yPos;
+	_curGobLeftVarPtr = (uint32) obj->left;
+	_curGobTopVarPtr = (uint32) obj->top;
+	_curGobRightVarPtr = (uint32) obj->right;
+	_curGobBottomVarPtr = (uint32) obj->bottom;
+	_curGobDoAnimVarPtr = (uint32) obj->doAnim;
+	_curGobOrderVarPtr = (uint32) obj->order;
+	_curGobNoTickVarPtr = (uint32) obj->noTick;
+	_curGobTypeVarPtr = (uint32) obj->type;
+	_curGobMaxTickVarPtr = (uint32) obj->maxTick;
+	_curGobTickVarPtr = (uint32) obj->tick;
+	_curGobActStartStateVarPtr = (uint32) obj->actionStartState;
+	_curGobLookDirVarPtr = (uint32) obj->curLookDir;
+	_curGobPickableVarPtr = (uint32) obj->pickable;
+	_curGobRelaxVarPtr = (uint32) obj->relaxTime;
+	_curGobMaxFrameVarPtr = (uint32) getObjMaxFrame(obj);
 
 	if (_actDestItemDesc == 0)
 		return;
 
 	obj = _actDestItemDesc;
-	*_destItemStateVarPtr = obj->state;
-	*_destItemFrameVarPtr = obj->curFrame;
-	*_destItemMultStateVarPtr = obj->multState;
-	*_destItemNextStateVarPtr = obj->nextState;
-	*_destItemScrXVarPtr = obj->xPos;
-	*_destItemScrYVarPtr = obj->yPos;
-	*_destItemLeftVarPtr = obj->left;
-	*_destItemTopVarPtr = obj->top;
-	*_destItemRightVarPtr = obj->right;
-	*_destItemBottomVarPtr = obj->bottom;
-	*_destItemDoAnimVarPtr = obj->doAnim;
-	*_destItemOrderVarPtr = obj->order;
-	*_destItemNoTickVarPtr = obj->noTick;
-	*_destItemTypeVarPtr = obj->type;
-	*_destItemMaxTickVarPtr = obj->maxTick;
-	*_destItemTickVarPtr = obj->tick;
-	*_destItemActStartStVarPtr = obj->actionStartState;
-	*_destItemLookDirVarPtr = obj->curLookDir;
-	*_destItemPickableVarPtr = obj->pickable;
-	*_destItemRelaxVarPtr = obj->relaxTime;
-	*_destItemMaxFrameVarPtr = getObjMaxFrame(obj);
+	_destItemStateVarPtr = (uint32) obj->state;
+	_destItemFrameVarPtr = (uint32) obj->curFrame;
+	_destItemMultStateVarPtr = (uint32) obj->multState;
+	_destItemNextStateVarPtr = (uint32) obj->nextState;
+	_destItemScrXVarPtr = (uint32) obj->xPos;
+	_destItemScrYVarPtr = (uint32) obj->yPos;
+	_destItemLeftVarPtr = (uint32) obj->left;
+	_destItemTopVarPtr = (uint32) obj->top;
+	_destItemRightVarPtr = (uint32) obj->right;
+	_destItemBottomVarPtr = (uint32) obj->bottom;
+	_destItemDoAnimVarPtr = (uint32) obj->doAnim;
+	_destItemOrderVarPtr = (uint32) obj->order;
+	_destItemNoTickVarPtr = (uint32) obj->noTick;
+	_destItemTypeVarPtr = (uint32) obj->type;
+	_destItemMaxTickVarPtr = (uint32) obj->maxTick;
+	_destItemTickVarPtr = (uint32) obj->tick;
+	_destItemActStartStVarPtr = (uint32) obj->actionStartState;
+	_destItemLookDirVarPtr = (uint32) obj->curLookDir;
+	_destItemPickableVarPtr = (uint32) obj->pickable;
+	_destItemRelaxVarPtr = (uint32) obj->relaxTime;
+	_destItemMaxFrameVarPtr = (uint32) getObjMaxFrame(obj);
 
 	_destItemState = obj->state;
 	_destItemType = obj->type;
 }
 
 void Goblin::initVarPointers(void) {
-	_gobRetVarPtr = (int32 *)VAR_ADDRESS(59);
-	_curGobStateVarPtr = (int32 *)VAR_ADDRESS(60);
-	_curGobFrameVarPtr = (int32 *)VAR_ADDRESS(61);
-	_curGobMultStateVarPtr = (int32 *)VAR_ADDRESS(62);
-	_curGobNextStateVarPtr = (int32 *)VAR_ADDRESS(63);
-	_curGobScrXVarPtr = (int32 *)VAR_ADDRESS(64);
-	_curGobScrYVarPtr = (int32 *)VAR_ADDRESS(65);
-	_curGobLeftVarPtr = (int32 *)VAR_ADDRESS(66);
-	_curGobTopVarPtr = (int32 *)VAR_ADDRESS(67);
-	_curGobRightVarPtr = (int32 *)VAR_ADDRESS(68);
-	_curGobBottomVarPtr = (int32 *)VAR_ADDRESS(69);
-	_curGobDoAnimVarPtr = (int32 *)VAR_ADDRESS(70);
-	_curGobOrderVarPtr = (int32 *)VAR_ADDRESS(71);
-	_curGobNoTickVarPtr = (int32 *)VAR_ADDRESS(72);
-	_curGobTypeVarPtr = (int32 *)VAR_ADDRESS(73);
-	_curGobMaxTickVarPtr = (int32 *)VAR_ADDRESS(74);
-	_curGobTickVarPtr = (int32 *)VAR_ADDRESS(75);
-	_curGobActStartStateVarPtr = (int32 *)VAR_ADDRESS(76);
-	_curGobLookDirVarPtr = (int32 *)VAR_ADDRESS(77);
-	_curGobPickableVarPtr = (int32 *)VAR_ADDRESS(80);
-	_curGobRelaxVarPtr = (int32 *)VAR_ADDRESS(81);
-	_destItemStateVarPtr = (int32 *)VAR_ADDRESS(82);
-	_destItemFrameVarPtr = (int32 *)VAR_ADDRESS(83);
-	_destItemMultStateVarPtr = (int32 *)VAR_ADDRESS(84);
-	_destItemNextStateVarPtr = (int32 *)VAR_ADDRESS(85);
-	_destItemScrXVarPtr = (int32 *)VAR_ADDRESS(86);
-	_destItemScrYVarPtr = (int32 *)VAR_ADDRESS(87);
-	_destItemLeftVarPtr = (int32 *)VAR_ADDRESS(88);
-	_destItemTopVarPtr = (int32 *)VAR_ADDRESS(89);
-	_destItemRightVarPtr = (int32 *)VAR_ADDRESS(90);
-	_destItemBottomVarPtr = (int32 *)VAR_ADDRESS(91);
-	_destItemDoAnimVarPtr = (int32 *)VAR_ADDRESS(92);
-	_destItemOrderVarPtr = (int32 *)VAR_ADDRESS(93);
-	_destItemNoTickVarPtr = (int32 *)VAR_ADDRESS(94);
-	_destItemTypeVarPtr = (int32 *)VAR_ADDRESS(95);
-	_destItemMaxTickVarPtr = (int32 *)VAR_ADDRESS(96);
-	_destItemTickVarPtr = (int32 *)VAR_ADDRESS(97);
-	_destItemActStartStVarPtr = (int32 *)VAR_ADDRESS(98);
-	_destItemLookDirVarPtr = (int32 *)VAR_ADDRESS(99);
-	_destItemPickableVarPtr = (int32 *)VAR_ADDRESS(102);
-	_destItemRelaxVarPtr = (int32 *)VAR_ADDRESS(103);
-	_destItemMaxFrameVarPtr = (int32 *)VAR_ADDRESS(105);
-	_curGobVarPtr = (int32 *)VAR_ADDRESS(106);
-	_some0ValPtr = (int32 *)VAR_ADDRESS(107);
-	_curGobXPosVarPtr = (int32 *)VAR_ADDRESS(108);
-	_curGobYPosVarPtr = (int32 *)VAR_ADDRESS(109);
-	_curGobMaxFrameVarPtr = (int32 *)VAR_ADDRESS(110);
-
-	_itemInPocketVarPtr = (int32 *)VAR_ADDRESS(114);
-
-	*_itemInPocketVarPtr = -2;
+	_gobRetVarPtr.set(*_vm->_inter->_variables, 236);
+	_curGobStateVarPtr.set(*_vm->_inter->_variables, 240);
+	_curGobFrameVarPtr.set(*_vm->_inter->_variables, 244);
+	_curGobMultStateVarPtr.set(*_vm->_inter->_variables, 248);
+	_curGobNextStateVarPtr.set(*_vm->_inter->_variables, 252);
+	_curGobScrXVarPtr.set(*_vm->_inter->_variables, 256);
+	_curGobScrYVarPtr.set(*_vm->_inter->_variables, 260);
+	_curGobLeftVarPtr.set(*_vm->_inter->_variables, 264);
+	_curGobTopVarPtr.set(*_vm->_inter->_variables, 268);
+	_curGobRightVarPtr.set(*_vm->_inter->_variables, 272);
+	_curGobBottomVarPtr.set(*_vm->_inter->_variables, 276);
+	_curGobDoAnimVarPtr.set(*_vm->_inter->_variables, 280);
+	_curGobOrderVarPtr.set(*_vm->_inter->_variables, 284);
+	_curGobNoTickVarPtr.set(*_vm->_inter->_variables, 288);
+	_curGobTypeVarPtr.set(*_vm->_inter->_variables, 292);
+	_curGobMaxTickVarPtr.set(*_vm->_inter->_variables, 296);
+	_curGobTickVarPtr.set(*_vm->_inter->_variables, 300);
+	_curGobActStartStateVarPtr.set(*_vm->_inter->_variables, 304);
+	_curGobLookDirVarPtr.set(*_vm->_inter->_variables, 308);
+	_curGobPickableVarPtr.set(*_vm->_inter->_variables, 320);
+	_curGobRelaxVarPtr.set(*_vm->_inter->_variables, 324);
+	_destItemStateVarPtr.set(*_vm->_inter->_variables, 328);
+	_destItemFrameVarPtr.set(*_vm->_inter->_variables, 332);
+	_destItemMultStateVarPtr.set(*_vm->_inter->_variables, 336);
+	_destItemNextStateVarPtr.set(*_vm->_inter->_variables, 340);
+	_destItemScrXVarPtr.set(*_vm->_inter->_variables, 344);
+	_destItemScrYVarPtr.set(*_vm->_inter->_variables, 348);
+	_destItemLeftVarPtr.set(*_vm->_inter->_variables, 352);
+	_destItemTopVarPtr.set(*_vm->_inter->_variables, 356);
+	_destItemRightVarPtr.set(*_vm->_inter->_variables, 360);
+	_destItemBottomVarPtr.set(*_vm->_inter->_variables, 364);
+	_destItemDoAnimVarPtr.set(*_vm->_inter->_variables, 368);
+	_destItemOrderVarPtr.set(*_vm->_inter->_variables, 372);
+	_destItemNoTickVarPtr.set(*_vm->_inter->_variables, 376);
+	_destItemTypeVarPtr.set(*_vm->_inter->_variables, 380);
+	_destItemMaxTickVarPtr.set(*_vm->_inter->_variables, 384);
+	_destItemTickVarPtr.set(*_vm->_inter->_variables, 388);
+	_destItemActStartStVarPtr.set(*_vm->_inter->_variables, 392);
+	_destItemLookDirVarPtr.set(*_vm->_inter->_variables, 396);
+	_destItemPickableVarPtr.set(*_vm->_inter->_variables, 408);
+	_destItemRelaxVarPtr.set(*_vm->_inter->_variables, 412);
+	_destItemMaxFrameVarPtr.set(*_vm->_inter->_variables, 420);
+	_curGobVarPtr.set(*_vm->_inter->_variables, 424);
+	_some0ValPtr.set(*_vm->_inter->_variables, 428);
+	_curGobXPosVarPtr.set(*_vm->_inter->_variables, 432);
+	_curGobYPosVarPtr.set(*_vm->_inter->_variables, 436);
+	_curGobMaxFrameVarPtr.set(*_vm->_inter->_variables, 440);
+
+	_itemInPocketVarPtr.set(*_vm->_inter->_variables, 456);
+
+	_itemInPocketVarPtr = (uint32) -2;
 }
 
 void Goblin::loadGobDataFromVars(void) {
 	Gob_Object *obj;
 
-	_itemIndInPocket = *_itemInPocketVarPtr;
+	_itemIndInPocket = (int32) _itemInPocketVarPtr;
 
 	obj = _goblins[_currentGoblin];
 
-	obj->state = *_curGobStateVarPtr;
-	obj->curFrame = *_curGobFrameVarPtr;
-	obj->multState = *_curGobMultStateVarPtr;
-	obj->nextState = *_curGobNextStateVarPtr;
-	obj->xPos = *_curGobScrXVarPtr;
-	obj->yPos = *_curGobScrYVarPtr;
-	obj->left = *_curGobLeftVarPtr;
-	obj->top = *_curGobTopVarPtr;
-	obj->right = *_curGobRightVarPtr;
-	obj->bottom = *_curGobBottomVarPtr;
-	obj->doAnim = *_curGobDoAnimVarPtr;
-	obj->order = *_curGobOrderVarPtr;
-	obj->noTick = *_curGobNoTickVarPtr;
-	obj->type = *_curGobTypeVarPtr;
-	obj->maxTick = *_curGobMaxTickVarPtr;
-	obj->tick = *_curGobTickVarPtr;
-	obj->actionStartState = *_curGobActStartStateVarPtr;
-	obj->curLookDir = *_curGobLookDirVarPtr;
-	obj->pickable = *_curGobPickableVarPtr;
-	obj->relaxTime = *_curGobRelaxVarPtr;
+	obj->state = (int32) _curGobStateVarPtr;
+	obj->curFrame = (int32) _curGobFrameVarPtr;
+	obj->multState = (int32) _curGobMultStateVarPtr;
+	obj->nextState = (int32) _curGobNextStateVarPtr;
+	obj->xPos = (int32) _curGobScrXVarPtr;
+	obj->yPos = (int32) _curGobScrYVarPtr;
+	obj->left = (int32) _curGobLeftVarPtr;
+	obj->top = (int32) _curGobTopVarPtr;
+	obj->right = (int32) _curGobRightVarPtr;
+	obj->bottom = (int32) _curGobBottomVarPtr;
+	obj->doAnim = (int32) _curGobDoAnimVarPtr;
+	obj->order = (int32) _curGobOrderVarPtr;
+	obj->noTick = (int32) _curGobNoTickVarPtr;
+	obj->type = (int32) _curGobTypeVarPtr;
+	obj->maxTick = (int32) _curGobMaxTickVarPtr;
+	obj->tick = (int32) _curGobTickVarPtr;
+	obj->actionStartState = (int32) _curGobActStartStateVarPtr;
+	obj->curLookDir = (int32) _curGobLookDirVarPtr;
+	obj->pickable = (int32) _curGobPickableVarPtr;
+	obj->relaxTime = (int32) _curGobRelaxVarPtr;
 
 	if (_actDestItemDesc == 0)
 		return;
 
 	obj = _actDestItemDesc;
 
-	obj->state = *_destItemStateVarPtr;
-	obj->curFrame = *_destItemFrameVarPtr;
-	obj->multState = *_destItemMultStateVarPtr;
-	obj->nextState = *_destItemNextStateVarPtr;
-	obj->xPos = *_destItemScrXVarPtr;
-	obj->yPos = *_destItemScrYVarPtr;
-	obj->left = *_destItemLeftVarPtr;
-	obj->top = *_destItemTopVarPtr;
-	obj->right = *_destItemRightVarPtr;
-	obj->bottom = *_destItemBottomVarPtr;
-	obj->doAnim = *_destItemDoAnimVarPtr;
-	obj->order = *_destItemOrderVarPtr;
-	obj->noTick = *_destItemNoTickVarPtr;
-	obj->type = *_destItemTypeVarPtr;
-	obj->maxTick = *_destItemMaxTickVarPtr;
-	obj->tick = *_destItemTickVarPtr;
-	obj->actionStartState = *_destItemActStartStVarPtr;
-	obj->curLookDir = *_destItemLookDirVarPtr;
-	obj->pickable = *_destItemPickableVarPtr;
-	obj->relaxTime = *_destItemRelaxVarPtr;
+	obj->state = (int32) _destItemStateVarPtr;
+	obj->curFrame = (int32) _destItemFrameVarPtr;
+	obj->multState = (int32) _destItemMultStateVarPtr;
+	obj->nextState = (int32) _destItemNextStateVarPtr;
+	obj->xPos = (int32) _destItemScrXVarPtr;
+	obj->yPos = (int32) _destItemScrYVarPtr;
+	obj->left = (int32) _destItemLeftVarPtr;
+	obj->top = (int32) _destItemTopVarPtr;
+	obj->right = (int32) _destItemRightVarPtr;
+	obj->bottom = (int32) _destItemBottomVarPtr;
+	obj->doAnim = (int32) _destItemDoAnimVarPtr;
+	obj->order = (int32) _destItemOrderVarPtr;
+	obj->noTick = (int32) _destItemNoTickVarPtr;
+	obj->type = (int32) _destItemTypeVarPtr;
+	obj->maxTick = (int32) _destItemMaxTickVarPtr;
+	obj->tick = (int32) _destItemTickVarPtr;
+	obj->actionStartState = (int32) _destItemActStartStVarPtr;
+	obj->curLookDir = (int32) _destItemLookDirVarPtr;
+	obj->pickable = (int32) _destItemPickableVarPtr;
+	obj->relaxTime = (int32) _destItemRelaxVarPtr;
 
 	if (obj->type != _destItemType)
 		obj->toRedraw = 1;
diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h
index 3fd8a9f93b..2100bcbdac 100644
--- a/engines/gob/goblin.h
+++ b/engines/gob/goblin.h
@@ -28,6 +28,7 @@
 
 #include "gob/util.h"
 #include "gob/mult.h"
+#include "gob/variables.h"
 #include "gob/sound/sounddesc.h"
 
 namespace Gob {
@@ -115,57 +116,57 @@ public:
 	char _pathExistence;
 
 	// Pointers to interpreter variables
-	int32 *_some0ValPtr;
-
-	int32 *_gobRetVarPtr;
-	int32 *_curGobVarPtr;
-	int32 *_curGobXPosVarPtr;
-	int32 *_curGobYPosVarPtr;
-	int32 *_itemInPocketVarPtr;
-
-	int32 *_curGobStateVarPtr;
-	int32 *_curGobFrameVarPtr;
-	int32 *_curGobMultStateVarPtr;
-	int32 *_curGobNextStateVarPtr;
-	int32 *_curGobScrXVarPtr;
-	int32 *_curGobScrYVarPtr;
-	int32 *_curGobLeftVarPtr;
-	int32 *_curGobTopVarPtr;
-	int32 *_curGobRightVarPtr;
-	int32 *_curGobBottomVarPtr;
-	int32 *_curGobDoAnimVarPtr;
-	int32 *_curGobOrderVarPtr;
-	int32 *_curGobNoTickVarPtr;
-	int32 *_curGobTypeVarPtr;
-	int32 *_curGobMaxTickVarPtr;
-	int32 *_curGobTickVarPtr;
-	int32 *_curGobActStartStateVarPtr;
-	int32 *_curGobLookDirVarPtr;
-	int32 *_curGobPickableVarPtr;
-	int32 *_curGobRelaxVarPtr;
-	int32 *_curGobMaxFrameVarPtr;
-
-	int32 *_destItemStateVarPtr;
-	int32 *_destItemFrameVarPtr;
-	int32 *_destItemMultStateVarPtr;
-	int32 *_destItemNextStateVarPtr;
-	int32 *_destItemScrXVarPtr;
-	int32 *_destItemScrYVarPtr;
-	int32 *_destItemLeftVarPtr;
-	int32 *_destItemTopVarPtr;
-	int32 *_destItemRightVarPtr;
-	int32 *_destItemBottomVarPtr;
-	int32 *_destItemDoAnimVarPtr;
-	int32 *_destItemOrderVarPtr;
-	int32 *_destItemNoTickVarPtr;
-	int32 *_destItemTypeVarPtr;
-	int32 *_destItemMaxTickVarPtr;
-	int32 *_destItemTickVarPtr;
-	int32 *_destItemActStartStVarPtr;
-	int32 *_destItemLookDirVarPtr;
-	int32 *_destItemPickableVarPtr;
-	int32 *_destItemRelaxVarPtr;
-	int32 *_destItemMaxFrameVarPtr;
+	VariableReference _some0ValPtr;
+
+	VariableReference _gobRetVarPtr;
+	VariableReference _curGobVarPtr;
+	VariableReference _curGobXPosVarPtr;
+	VariableReference _curGobYPosVarPtr;
+	VariableReference _itemInPocketVarPtr;
+
+	VariableReference _curGobStateVarPtr;
+	VariableReference _curGobFrameVarPtr;
+	VariableReference _curGobMultStateVarPtr;
+	VariableReference _curGobNextStateVarPtr;
+	VariableReference _curGobScrXVarPtr;
+	VariableReference _curGobScrYVarPtr;
+	VariableReference _curGobLeftVarPtr;
+	VariableReference _curGobTopVarPtr;
+	VariableReference _curGobRightVarPtr;
+	VariableReference _curGobBottomVarPtr;
+	VariableReference _curGobDoAnimVarPtr;
+	VariableReference _curGobOrderVarPtr;
+	VariableReference _curGobNoTickVarPtr;
+	VariableReference _curGobTypeVarPtr;
+	VariableReference _curGobMaxTickVarPtr;
+	VariableReference _curGobTickVarPtr;
+	VariableReference _curGobActStartStateVarPtr;
+	VariableReference _curGobLookDirVarPtr;
+	VariableReference _curGobPickableVarPtr;
+	VariableReference _curGobRelaxVarPtr;
+	VariableReference _curGobMaxFrameVarPtr;
+
+	VariableReference _destItemStateVarPtr;
+	VariableReference _destItemFrameVarPtr;
+	VariableReference _destItemMultStateVarPtr;
+	VariableReference _destItemNextStateVarPtr;
+	VariableReference _destItemScrXVarPtr;
+	VariableReference _destItemScrYVarPtr;
+	VariableReference _destItemLeftVarPtr;
+	VariableReference _destItemTopVarPtr;
+	VariableReference _destItemRightVarPtr;
+	VariableReference _destItemBottomVarPtr;
+	VariableReference _destItemDoAnimVarPtr;
+	VariableReference _destItemOrderVarPtr;
+	VariableReference _destItemNoTickVarPtr;
+	VariableReference _destItemTypeVarPtr;
+	VariableReference _destItemMaxTickVarPtr;
+	VariableReference _destItemTickVarPtr;
+	VariableReference _destItemActStartStVarPtr;
+	VariableReference _destItemLookDirVarPtr;
+	VariableReference _destItemPickableVarPtr;
+	VariableReference _destItemRelaxVarPtr;
+	VariableReference _destItemMaxFrameVarPtr;
 
 	int16 _destItemType;
 	int16 _destItemState;
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 60b3974d6d..b684be6c07 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -79,7 +79,7 @@ protected:
 	};
 	struct OpGobParams {
 		int16 extraData;
-		int32 *retVarPtr;
+		VariableReference retVarPtr;
 		Goblin::Gob_Object *objDesc;
 	};
 
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index e2b8d65112..865d188a2e 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -912,12 +912,21 @@ void Inter_v1::o1_initMult() {
 	animDataVar = _vm->_parse->parseVarIndex();
 
 	if (_vm->_mult->_objects && (oldObjCount != _vm->_mult->_objCount)) {
+
 		warning("Initializing new objects without having "
 				"cleaned up the old ones at first");
+
+		for (int i = 0; i < _vm->_mult->_objCount; i++) {
+			delete _vm->_mult->_objects[i].pPosX;
+			delete _vm->_mult->_objects[i].pPosY;
+		}
+
 		delete[] _vm->_mult->_objects;
 		delete[] _vm->_mult->_renderData;
+
 		_vm->_mult->_objects = 0;
 		_vm->_mult->_renderObjs = 0;
+
 	}
 
 	if (_vm->_mult->_objects == 0) {
@@ -933,8 +942,8 @@ void Inter_v1::o1_initMult() {
 			uint32 offPosY = i * 4 + (posYVar / 4) * 4;
 			uint32 offAnim = animDataVar + i * 4 * _vm->_global->_inter_animDataSize;
 
-			_vm->_mult->_objects[i].pPosX = (int32 *) _variables->getAddressOff32(offPosX);
-			_vm->_mult->_objects[i].pPosY = (int32 *) _variables->getAddressOff32(offPosY);
+			_vm->_mult->_objects[i].pPosX = new VariableReference(*_vm->_inter->_variables, offPosX);
+			_vm->_mult->_objects[i].pPosY = new VariableReference(*_vm->_inter->_variables, offPosY);
 
 			_vm->_mult->_objects[i].pAnimData =
 				(Mult::Mult_AnimData *) _variables->getAddressOff8(offAnim,
@@ -1774,7 +1783,7 @@ bool Inter_v1::o1_goblinFunc(OpFuncParams &params) {
 
 	gobParams.extraData = 0;
 	gobParams.objDesc = 0;
-	gobParams.retVarPtr = (int32 *) VAR_ADDRESS(59);
+	gobParams.retVarPtr.set(*_vm->_inter->_variables, 236);
 
 	cmd = load16();
 	_vm->_global->_inter_execPtr += 2;
@@ -2268,49 +2277,49 @@ bool Inter_v1::o1_manageDataFile(OpFuncParams &params) {
 void Inter_v1::o1_setState(OpGobParams &params) {
 	params.objDesc->state = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemStateVarPtr = params.extraData;
+		_vm->_goblin->_destItemStateVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setCurFrame(OpGobParams &params) {
 	params.objDesc->curFrame = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemFrameVarPtr = params.extraData;
+		_vm->_goblin->_destItemFrameVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setNextState(OpGobParams &params) {
 	params.objDesc->nextState = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemNextStateVarPtr = params.extraData;
+		_vm->_goblin->_destItemNextStateVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setMultState(OpGobParams &params) {
 	params.objDesc->multState = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemMultStateVarPtr = params.extraData;
+		_vm->_goblin->_destItemMultStateVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setOrder(OpGobParams &params) {
 	params.objDesc->order = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemOrderVarPtr = params.extraData;
+		_vm->_goblin->_destItemOrderVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setActionStartState(OpGobParams &params) {
 	params.objDesc->actionStartState = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemActStartStVarPtr = params.extraData;
+		_vm->_goblin->_destItemActStartStVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setCurLookDir(OpGobParams &params) {
 	params.objDesc->curLookDir = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemLookDirVarPtr = params.extraData;
+		_vm->_goblin->_destItemLookDirVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setType(OpGobParams &params) {
 	params.objDesc->type = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemTypeVarPtr = params.extraData;
+		_vm->_goblin->_destItemTypeVarPtr = (uint32) params.extraData;
 
 	if (params.extraData == 0)
 		params.objDesc->toRedraw = 1;
@@ -2319,107 +2328,107 @@ void Inter_v1::o1_setType(OpGobParams &params) {
 void Inter_v1::o1_setNoTick(OpGobParams &params) {
 	params.objDesc->noTick = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemNoTickVarPtr = params.extraData;
+		_vm->_goblin->_destItemNoTickVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setPickable(OpGobParams &params) {
 	params.objDesc->pickable = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemPickableVarPtr = params.extraData;
+		_vm->_goblin->_destItemPickableVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setXPos(OpGobParams &params) {
 	params.objDesc->xPos = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemScrXVarPtr = params.extraData;
+		_vm->_goblin->_destItemScrXVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setYPos(OpGobParams &params) {
 	params.objDesc->yPos = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemScrYVarPtr = params.extraData;
+		_vm->_goblin->_destItemScrYVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setDoAnim(OpGobParams &params) {
 	params.objDesc->doAnim = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemDoAnimVarPtr = params.extraData;
+		_vm->_goblin->_destItemDoAnimVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setRelaxTime(OpGobParams &params) {
 	params.objDesc->relaxTime = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemRelaxVarPtr = params.extraData;
+		_vm->_goblin->_destItemRelaxVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_setMaxTick(OpGobParams &params) {
 	params.objDesc->maxTick = params.extraData;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc)
-		*_vm->_goblin->_destItemMaxTickVarPtr = params.extraData;
+		_vm->_goblin->_destItemMaxTickVarPtr = (uint32) params.extraData;
 }
 
 void Inter_v1::o1_getState(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->state;
+	params.retVarPtr = (uint32) params.objDesc->state;
 }
 
 void Inter_v1::o1_getCurFrame(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->curFrame;
+	params.retVarPtr = (uint32) params.objDesc->curFrame;
 }
 
 void Inter_v1::o1_getNextState(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->nextState;
+	params.retVarPtr = (uint32) params.objDesc->nextState;
 }
 
 void Inter_v1::o1_getMultState(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->multState;
+	params.retVarPtr = (uint32) params.objDesc->multState;
 }
 
 void Inter_v1::o1_getOrder(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->order;
+	params.retVarPtr = (uint32) params.objDesc->order;
 }
 
 void Inter_v1::o1_getActionStartState(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->actionStartState;
+	params.retVarPtr = (uint32) params.objDesc->actionStartState;
 }
 
 void Inter_v1::o1_getCurLookDir(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->curLookDir;
+	params.retVarPtr = (uint32) params.objDesc->curLookDir;
 }
 
 void Inter_v1::o1_getType(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->type;
+	params.retVarPtr = (uint32) params.objDesc->type;
 }
 
 void Inter_v1::o1_getNoTick(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->noTick;
+	params.retVarPtr = (uint32) params.objDesc->noTick;
 }
 
 void Inter_v1::o1_getPickable(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->pickable;
+	params.retVarPtr = (uint32) params.objDesc->pickable;
 }
 
 void Inter_v1::o1_getObjMaxFrame(OpGobParams &params) {
-	*params.retVarPtr = _vm->_goblin->getObjMaxFrame(params.objDesc);
+	params.retVarPtr = (uint32) _vm->_goblin->getObjMaxFrame(params.objDesc);
 }
 
 void Inter_v1::o1_getXPos(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->xPos;
+	params.retVarPtr = (uint32) params.objDesc->xPos;
 }
 
 void Inter_v1::o1_getYPos(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->yPos;
+	params.retVarPtr = (uint32) params.objDesc->yPos;
 }
 
 void Inter_v1::o1_getDoAnim(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->doAnim;
+	params.retVarPtr = (uint32) params.objDesc->doAnim;
 }
 
 void Inter_v1::o1_getRelaxTime(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->relaxTime;
+	params.retVarPtr = (uint32) params.objDesc->relaxTime;
 }
 
 void Inter_v1::o1_getMaxTick(OpGobParams &params) {
-	*params.retVarPtr = params.objDesc->maxTick;
+	params.retVarPtr = (uint32) params.objDesc->maxTick;
 }
 
 void Inter_v1::o1_manipulateMap(OpGobParams &params) {
@@ -2435,9 +2444,9 @@ void Inter_v1::o1_getItem(OpGobParams &params) {
 	int16 yPos = load16();
 
 	if ((_vm->_map->_itemsMap[yPos][xPos] & 0xFF00) != 0)
-		*params.retVarPtr = (_vm->_map->_itemsMap[yPos][xPos] & 0xFF00) >> 8;
+		params.retVarPtr = (uint32) ((_vm->_map->_itemsMap[yPos][xPos] & 0xFF00) >> 8);
 	else
-		*params.retVarPtr = _vm->_map->_itemsMap[yPos][xPos];
+		params.retVarPtr = (uint32) _vm->_map->_itemsMap[yPos][xPos];
 }
 
 void Inter_v1::o1_manipulateMapIndirect(OpGobParams &params) {
@@ -2460,9 +2469,9 @@ void Inter_v1::o1_getItemIndirect(OpGobParams &params) {
 	yPos = VAR(yPos);
 
 	if ((_vm->_map->_itemsMap[yPos][xPos] & 0xFF00) != 0)
-		*params.retVarPtr = (_vm->_map->_itemsMap[yPos][xPos] & 0xFF00) >> 8;
+		params.retVarPtr = (uint32) ((_vm->_map->_itemsMap[yPos][xPos] & 0xFF00) >> 8);
 	else
-		*params.retVarPtr = _vm->_map->_itemsMap[yPos][xPos];
+		params.retVarPtr = (uint32) _vm->_map->_itemsMap[yPos][xPos];
 }
 
 void Inter_v1::o1_setPassMap(OpGobParams &params) {
@@ -2500,11 +2509,11 @@ void Inter_v1::o1_setGoblinPosH(OpGobParams &params) {
 	params.objDesc->curFrame = 0;
 	params.objDesc->state = 21;
 	if (_vm->_goblin->_currentGoblin == item) {
-		*_vm->_goblin->_curGobScrXVarPtr = params.objDesc->xPos;
-		*_vm->_goblin->_curGobScrYVarPtr = params.objDesc->yPos;
+		_vm->_goblin->_curGobScrXVarPtr = (uint32) params.objDesc->xPos;
+		_vm->_goblin->_curGobScrYVarPtr = (uint32) params.objDesc->yPos;
 
-		*_vm->_goblin->_curGobFrameVarPtr = 0;
-		*_vm->_goblin->_curGobStateVarPtr = 18;
+		_vm->_goblin->_curGobFrameVarPtr = 0;
+		_vm->_goblin->_curGobStateVarPtr = 18;
 		_vm->_goblin->_pressedMapX = _vm->_goblin->_gobPositions[item].x;
 		_vm->_goblin->_pressedMapY = _vm->_goblin->_gobPositions[item].y;
 	}
@@ -2512,12 +2521,12 @@ void Inter_v1::o1_setGoblinPosH(OpGobParams &params) {
 
 void Inter_v1::o1_getGoblinPosXH(OpGobParams &params) {
 	int16 item = load16();
-	*params.retVarPtr = _vm->_goblin->_gobPositions[item].x >> 1;
+	params.retVarPtr = (uint32) (_vm->_goblin->_gobPositions[item].x >> 1);
 }
 
 void Inter_v1::o1_getGoblinPosYH(OpGobParams &params) {
 	int16 item = load16();
-	*params.retVarPtr = _vm->_goblin->_gobPositions[item].y >> 1;
+	params.retVarPtr = (uint32) (_vm->_goblin->_gobPositions[item].y >> 1);
 }
 
 void Inter_v1::o1_setGoblinMultState(OpGobParams &params) {
@@ -2539,14 +2548,14 @@ void Inter_v1::o1_setGoblinMultState(OpGobParams &params) {
 		params.objDesc->xPos = animLayer->posX;
 		params.objDesc->yPos = animLayer->posY;
 
-		*_vm->_goblin->_curGobScrXVarPtr = params.objDesc->xPos;
-		*_vm->_goblin->_curGobScrYVarPtr = params.objDesc->yPos;
-		*_vm->_goblin->_curGobFrameVarPtr = 0;
-		*_vm->_goblin->_curGobStateVarPtr = params.objDesc->state;
-		*_vm->_goblin->_curGobNextStateVarPtr = params.objDesc->nextState;
-		*_vm->_goblin->_curGobMultStateVarPtr = params.objDesc->multState;
-		*_vm->_goblin->_curGobMaxFrameVarPtr =
-				_vm->_goblin->getObjMaxFrame(params.objDesc);
+		_vm->_goblin->_curGobScrXVarPtr = (uint32) params.objDesc->xPos;
+		_vm->_goblin->_curGobScrYVarPtr = (uint32) params.objDesc->yPos;
+		_vm->_goblin->_curGobFrameVarPtr = 0;
+		_vm->_goblin->_curGobStateVarPtr = (uint32) params.objDesc->state;
+		_vm->_goblin->_curGobNextStateVarPtr = (uint32) params.objDesc->nextState;
+		_vm->_goblin->_curGobMultStateVarPtr = (uint32) params.objDesc->multState;
+		_vm->_goblin->_curGobMaxFrameVarPtr =
+				(uint32) _vm->_goblin->getObjMaxFrame(params.objDesc);
 		_vm->_goblin->_noPick = 1;
 		return;
 	}
@@ -2573,12 +2582,12 @@ void Inter_v1::o1_setGoblinMultState(OpGobParams &params) {
 	_vm->_goblin->_pressedMapY = yPos;
 	_vm->_map->_curGoblinY = yPos;
 
-	*_vm->_goblin->_curGobScrXVarPtr = params.objDesc->xPos;
-	*_vm->_goblin->_curGobScrYVarPtr = params.objDesc->yPos;
-	*_vm->_goblin->_curGobFrameVarPtr = 0;
-	*_vm->_goblin->_curGobStateVarPtr = 21;
-	*_vm->_goblin->_curGobNextStateVarPtr = 21;
-	*_vm->_goblin->_curGobMultStateVarPtr = -1;
+	_vm->_goblin->_curGobScrXVarPtr = (uint32) params.objDesc->xPos;
+	_vm->_goblin->_curGobScrYVarPtr = (uint32) params.objDesc->yPos;
+	_vm->_goblin->_curGobFrameVarPtr = 0;
+	_vm->_goblin->_curGobStateVarPtr = 21;
+	_vm->_goblin->_curGobNextStateVarPtr = 21;
+	_vm->_goblin->_curGobMultStateVarPtr = (uint32) -1;
 	_vm->_goblin->_noPick = 0;
 }
 
@@ -2598,11 +2607,11 @@ void Inter_v1::o1_setItemIndInPocket(OpGobParams &params) {
 }
 
 void Inter_v1::o1_getItemIdInPocket(OpGobParams &params) {
-	*params.retVarPtr = _vm->_goblin->_itemIdInPocket;
+	params.retVarPtr = (uint32) _vm->_goblin->_itemIdInPocket;
 }
 
 void Inter_v1::o1_getItemIndInPocket(OpGobParams &params) {
-	*params.retVarPtr = _vm->_goblin->_itemIndInPocket;
+	params.retVarPtr = (uint32) _vm->_goblin->_itemIndInPocket;
 }
 
 void Inter_v1::o1_setGoblinPos(OpGobParams &params) {
@@ -2632,10 +2641,10 @@ void Inter_v1::o1_setGoblinPos(OpGobParams &params) {
 	params.objDesc->state = 21;
 
 	if (_vm->_goblin->_currentGoblin == item) {
-		*_vm->_goblin->_curGobScrXVarPtr = params.objDesc->xPos;
-		*_vm->_goblin->_curGobScrYVarPtr = params.objDesc->yPos;
-		*_vm->_goblin->_curGobFrameVarPtr = 0;
-		*_vm->_goblin->_curGobStateVarPtr = 18;
+		_vm->_goblin->_curGobScrXVarPtr = (uint32) params.objDesc->xPos;
+		_vm->_goblin->_curGobScrYVarPtr = (uint32) params.objDesc->yPos;
+		_vm->_goblin->_curGobFrameVarPtr = 0;
+		_vm->_goblin->_curGobStateVarPtr = 18;
 
 		_vm->_goblin->_pressedMapX = _vm->_goblin->_gobPositions[item].x;
 		_vm->_goblin->_pressedMapY = _vm->_goblin->_gobPositions[item].y;
@@ -2659,11 +2668,11 @@ void Inter_v1::o1_setGoblinState(OpGobParams &params) {
 	params.objDesc->yPos = animLayer->posY;
 
 	if (item == _vm->_goblin->_currentGoblin) {
-		*_vm->_goblin->_curGobScrXVarPtr = params.objDesc->xPos;
-		*_vm->_goblin->_curGobScrYVarPtr = params.objDesc->yPos;
-		*_vm->_goblin->_curGobFrameVarPtr = 0;
-		*_vm->_goblin->_curGobStateVarPtr = params.objDesc->state;
-		*_vm->_goblin->_curGobMultStateVarPtr = params.objDesc->multState;
+		_vm->_goblin->_curGobScrXVarPtr = (uint32) params.objDesc->xPos;
+		_vm->_goblin->_curGobScrYVarPtr = (uint32) params.objDesc->yPos;
+		_vm->_goblin->_curGobFrameVarPtr = 0;
+		_vm->_goblin->_curGobStateVarPtr = (uint32) params.objDesc->state;
+		_vm->_goblin->_curGobMultStateVarPtr = (uint32) params.objDesc->multState;
 	}
 }
 
@@ -2686,13 +2695,13 @@ void Inter_v1::o1_setGoblinStateRedraw(OpGobParams &params) {
 	params.objDesc->toRedraw = 1;
 	params.objDesc->type = 0;
 	if (params.objDesc == _vm->_goblin->_actDestItemDesc) {
-		*_vm->_goblin->_destItemScrXVarPtr = params.objDesc->xPos;
-		*_vm->_goblin->_destItemScrYVarPtr = params.objDesc->yPos;
+		_vm->_goblin->_destItemScrXVarPtr = (uint32) params.objDesc->xPos;
+		_vm->_goblin->_destItemScrYVarPtr = (uint32) params.objDesc->yPos;
 
-		*_vm->_goblin->_destItemStateVarPtr = params.objDesc->state;
-		*_vm->_goblin->_destItemNextStateVarPtr = -1;
-		*_vm->_goblin->_destItemMultStateVarPtr = -1;
-		*_vm->_goblin->_destItemFrameVarPtr = 0;
+		_vm->_goblin->_destItemStateVarPtr = (uint32) params.objDesc->state;
+		_vm->_goblin->_destItemNextStateVarPtr = (uint32) -1;
+		_vm->_goblin->_destItemMultStateVarPtr = (uint32) -1;
+		_vm->_goblin->_destItemFrameVarPtr = 0;
 	}
 }
 
@@ -2712,12 +2721,12 @@ void Inter_v1::o1_decRelaxTime(OpGobParams &params) {
 
 void Inter_v1::o1_getGoblinPosX(OpGobParams &params) {
 	int16 item = load16();
-	*params.retVarPtr = _vm->_goblin->_gobPositions[item].x;
+	params.retVarPtr = (uint32) _vm->_goblin->_gobPositions[item].x;
 }
 
 void Inter_v1::o1_getGoblinPosY(OpGobParams &params) {
 	int16 item = load16();
-	*params.retVarPtr = _vm->_goblin->_gobPositions[item].y;
+	params.retVarPtr = (uint32) _vm->_goblin->_gobPositions[item].y;
 }
 
 void Inter_v1::o1_clearPathExistence(OpGobParams &params) {
@@ -2741,9 +2750,9 @@ void Inter_v1::o1_getObjectIntersect(OpGobParams &params) {
 	params.objDesc = _vm->_goblin->_objects[params.extraData];
 	if (_vm->_goblin->objIntersected(params.objDesc,
 				_vm->_goblin->_goblins[item]))
-		*params.retVarPtr = 1;
+		params.retVarPtr = 1;
 	else
-		*params.retVarPtr = 0;
+		params.retVarPtr = 0;
 }
 
 void Inter_v1::o1_getGoblinIntersect(OpGobParams &params) {
@@ -2753,9 +2762,9 @@ void Inter_v1::o1_getGoblinIntersect(OpGobParams &params) {
 	params.objDesc = _vm->_goblin->_goblins[params.extraData];
 	if (_vm->_goblin->objIntersected(params.objDesc,
 				_vm->_goblin->_goblins[item]))
-		*params.retVarPtr = 1;
+		params.retVarPtr = 1;
 	else
-		*params.retVarPtr = 0;
+		params.retVarPtr = 0;
 }
 
 void Inter_v1::o1_setItemPos(OpGobParams &params) {
@@ -2886,7 +2895,7 @@ void Inter_v1::o1_initGoblin(OpGobParams &params) {
 		_vm->_map->_destY = _vm->_goblin->_gobPositions[0].y;
 		_vm->_goblin->_gobDestY = _vm->_goblin->_gobPositions[0].y;
 
-		*_vm->_goblin->_curGobVarPtr = 0;
+		_vm->_goblin->_curGobVarPtr = 0;
 		_vm->_goblin->_pathExistence = 0;
 		_vm->_goblin->_readyToAct = 0;
 	}
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index d8c33fcce6..2f1d2ec0be 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -880,9 +880,15 @@ void Inter_v2::o2_initMult() {
 
 		_vm->_mult->clearObjectVideos();
 
+		for (int i = 0; i < _vm->_mult->_objCount; i++) {
+			delete _vm->_mult->_objects[i].pPosX;
+			delete _vm->_mult->_objects[i].pPosY;
+		}
+
 		delete[] _vm->_mult->_objects;
 		delete[] _vm->_mult->_renderObjs;
 		delete[] _vm->_mult->_orderArray;
+
 		_vm->_mult->_objects = 0;
 		_vm->_mult->_renderObjs = 0;
 		_vm->_mult->_orderArray = 0;
@@ -907,8 +913,8 @@ void Inter_v2::o2_initMult() {
 			uint32 offPosY = i * 4 + (posYVar / 4) * 4;
 			uint32 offAnim = animDataVar + i * 4 * _vm->_global->_inter_animDataSize;
 
-			_vm->_mult->_objects[i].pPosX = (int32 *) _variables->getAddressOff32(offPosX);
-			_vm->_mult->_objects[i].pPosY = (int32 *) _variables->getAddressOff32(offPosY);
+			_vm->_mult->_objects[i].pPosX = new VariableReference(*_vm->_inter->_variables, offPosX);
+			_vm->_mult->_objects[i].pPosY = new VariableReference(*_vm->_inter->_variables, offPosY);
 
 			_vm->_mult->_objects[i].pAnimData =
 				(Mult::Mult_AnimData *) _variables->getAddressOff8(offAnim,
@@ -1046,7 +1052,7 @@ void Inter_v2::o2_loadMultObject() {
 
 	} else if ((objAnim.animType != 100) && (objAnim.animType != 101)) {
 
-		if ((*(obj.pPosX) == -1234) && (*(obj.pPosY) == -4321)) {
+		if ((((int32) *(obj.pPosX)) == -1234) && (((int32) *(obj.pPosY)) == -4321)) {
 
 			if (obj.videoSlot > 0)
 				_vm->_vidPlayer->slotClose(obj.videoSlot - 1);
diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp
index 3d6a7942f9..b9373d48b3 100644
--- a/engines/gob/mult.cpp
+++ b/engines/gob/mult.cpp
@@ -93,12 +93,18 @@ Mult::Mult(GobEngine *vm) : _vm(vm) {
 }
 
 Mult::~Mult() {
+	if (_objects)
+		for (int i = 0; i < _objCount; i++) {
+			delete _objects[i].pPosX;
+			delete _objects[i].pPosY;
+		}
+
 	delete[] _objects;
 	delete[] _orderArray;
 	delete[] _renderData;
 	delete[] _renderObjs;
-	delete[] _animArrayX;
-	delete[] _animArrayY;
+	delete _animArrayX;
+	delete _animArrayY;
 	delete[] _animArrayData;
 	delete _multData;
 }
@@ -123,6 +129,12 @@ void Mult::freeAll(void) {
 void Mult::freeMult() {
 	clearObjectVideos();
 
+	if (_objects)
+		for (int i = 0; i < _objCount; i++) {
+			delete _objects[i].pPosX;
+			delete _objects[i].pPosY;
+		}
+
 	delete[] _objects;
 	delete[] _renderData;
 	delete[] _renderObjs;
@@ -203,11 +215,17 @@ void Mult::playMult(int16 startFrame, int16 endFrame, char checkEscape,
 		if (_animDataAllocated) {
 			clearObjectVideos();
 
+			if (_objects)
+				for (int i = 0; i < _objCount; i++) {
+					delete _objects[i].pPosX;
+					delete _objects[i].pPosY;
+				}
+
 			delete[] _objects;
 			delete[] _renderData;
 			delete[] _renderObjs;
-			delete[] _animArrayX;
-			delete[] _animArrayY;
+			delete _animArrayX;
+			delete _animArrayY;
 			delete[] _animArrayData;
 			delete[] _orderArray;
 
diff --git a/engines/gob/mult.h b/engines/gob/mult.h
index aaf2e2826c..3bb3af17b3 100644
--- a/engines/gob/mult.h
+++ b/engines/gob/mult.h
@@ -27,6 +27,7 @@
 #define GOB_MULT_H
 
 #include "gob/video.h"
+#include "gob/variables.h"
 
 namespace Gob {
 
@@ -77,8 +78,8 @@ public:
 	} PACKED_STRUCT;
 
 	struct Mult_Object {
-		int32 *pPosX;
-		int32 *pPosY;
+		VariableReference *pPosX;
+		VariableReference *pPosY;
 		Mult_AnimData *pAnimData;
 		int16 tick;
 		int16 lastLeft;
@@ -267,8 +268,8 @@ protected:
 
 	bool _doPalSubst;
 
-	int32 *_animArrayX;
-	int32 *_animArrayY;
+	Variables *_animArrayX;
+	Variables *_animArrayY;
 	Mult_AnimData *_animArrayData;
 
 	int16 _palKeyIndex;
diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp
index 22683437e7..a369e7d297 100644
--- a/engines/gob/mult_v1.cpp
+++ b/engines/gob/mult_v1.cpp
@@ -216,10 +216,16 @@ void Mult_v1::freeMultKeys() {
 	if (_animDataAllocated) {
 		clearObjectVideos();
 
+		if (_objects)
+			for (int i = 0; i < _objCount; i++) {
+				delete _objects[i].pPosX;
+				delete _objects[i].pPosY;
+			}
+
 		delete[] _objects;
 		delete[] _renderData;
-		delete[] _animArrayX;
-		delete[] _animArrayY;
+		delete _animArrayX;
+		delete _animArrayY;
 		delete[] _animArrayData;
 
 		_objects = 0;
@@ -263,6 +269,14 @@ void Mult_v1::playMultInit() {
 	_oldPalette = _vm->_global->_pPaletteDesc->vgaPal;
 
 	if (!_animSurf) {
+		if (_objects)
+			for (int i = 0; i < _objCount; i++) {
+				delete _objects[i].pPosX;
+				delete _objects[i].pPosY;
+			}
+
+		delete[] _objects;
+
 		_vm->_util->setFrameRate(_multData->frameRate);
 		_animTop = 0;
 		_animLeft = 0;
@@ -270,30 +284,27 @@ void Mult_v1::playMultInit() {
 		_animHeight = 200;
 		_objCount = 4;
 
-		delete[] _objects;
 		delete[] _renderData;
-		delete[] _animArrayX;
-		delete[] _animArrayY;
+		delete _animArrayX;
+		delete _animArrayY;
 		delete[] _animArrayData;
 
 		_objects = new Mult_Object[_objCount];
 		_renderData = new int16[9 * _objCount];
-		_animArrayX = new int32[_objCount];
-		_animArrayY = new int32[_objCount];
+		_animArrayX = new VariablesLE(_objCount * 4);
+		_animArrayY = new VariablesLE(_objCount * 4);
 		_animArrayData = new Mult_AnimData[_objCount];
 
 		memset(_objects, 0, _objCount * sizeof(Mult_Object));
 		memset(_renderData, 0, _objCount * 9 * sizeof(int16));
-		memset(_animArrayX, 0, _objCount * sizeof(int32));
-		memset(_animArrayY, 0, _objCount * sizeof(int32));
 		memset(_animArrayData, 0, _objCount * sizeof(Mult_AnimData));
 
 		for (_counter = 0; _counter < _objCount; _counter++) {
 			Mult_Object &multObj = _objects[_counter];
 			Mult_AnimData &animData = _animArrayData[_counter];
 
-			multObj.pPosX = (int32 *) &_animArrayX[_counter];
-			multObj.pPosY = (int32 *) &_animArrayY[_counter];
+			multObj.pPosX = new VariableReference(*_animArrayX, _counter * 4);
+			multObj.pPosY = new VariableReference(*_animArrayY, _counter * 4);
 			multObj.pAnimData = &animData;
 
 			animData.isStatic = 1;
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 3a83ac1867..20a81174e5 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -329,8 +329,8 @@ void Mult_v2::freeMultKeys() {
 	if (_animDataAllocated) {
 		freeMult();
 
-		delete[] _animArrayX;
-		delete[] _animArrayY;
+		delete _animArrayX;
+		delete _animArrayY;
 		delete[] _animArrayData;
 
 		_animArrayX = 0;
@@ -510,6 +510,13 @@ void Mult_v2::playMultInit() {
 	if (!_animSurf) {
 		int16 width, height;
 
+		for (int i = 0; i < _objCount; i++) {
+			delete _objects[i].pPosX;
+			delete _objects[i].pPosY;
+		}
+
+		delete[] _objects;
+	
 		_vm->_util->setFrameRate(_multData->frameRate);
 		_animTop = 0;
 		_animLeft = 0;
@@ -517,33 +524,30 @@ void Mult_v2::playMultInit() {
 		_animHeight = _vm->_video->_surfHeight;
 		_objCount = 4;
 
-		delete[] _objects;
 		delete[] _orderArray;
 		delete[] _renderObjs;
-		delete[] _animArrayX;
-		delete[] _animArrayY;
+		delete _animArrayX;
+		delete _animArrayY;
 		delete[] _animArrayData;
 
 		_objects = new Mult_Object[_objCount];
 		_orderArray = new int8[_objCount];
 		_renderObjs = new Mult_Object*[_objCount];
-		_animArrayX = new int32[_objCount];
-		_animArrayY = new int32[_objCount];
+		_animArrayX = new VariablesLE(_objCount * 4);
+		_animArrayY = new VariablesLE(_objCount * 4);
 		_animArrayData = new Mult_AnimData[_objCount];
 
 		memset(_objects, 0, _objCount * sizeof(Mult_Object));
 		memset(_orderArray, 0, _objCount * sizeof(int8));
 		memset(_renderObjs, 0, _objCount * sizeof(Mult_Object *));
-		memset(_animArrayX, 0, _objCount * sizeof(int32));
-		memset(_animArrayY, 0, _objCount * sizeof(int32));
 		memset(_animArrayData, 0, _objCount * sizeof(Mult_AnimData));
 
 		for (_counter = 0; _counter < _objCount; _counter++) {
 			Mult_Object &multObj = _objects[_counter];
 			Mult_AnimData &animData = _animArrayData[_counter];
 
-			multObj.pPosX = (int32 *) &_animArrayX[_counter];
-			multObj.pPosY = (int32 *) &_animArrayY[_counter];
+			multObj.pPosX = new VariableReference(*_animArrayX, _counter * 4);
+			multObj.pPosY = new VariableReference(*_animArrayY, _counter * 4);
 			multObj.pAnimData = &animData;
 
 			animData.isStatic = 1;
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index b59510e4bb..07b5a737db 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -144,4 +144,4 @@ private:
 
 } // End of namespace Gob
 
-#endif // GOB_SOUND_H
+#endif // GOB_SOUND_SOUND_H
diff --git a/engines/gob/variables.cpp b/engines/gob/variables.cpp
index 0eea2f6547..805aaeb839 100644
--- a/engines/gob/variables.cpp
+++ b/engines/gob/variables.cpp
@@ -308,4 +308,62 @@ uint32 VariablesBE::read32(const byte *buf) const {
 	return READ_BE_UINT32(buf);
 }
 
+VariableReference::VariableReference() {
+	_vars = 0;
+	_offset = 0;
+}
+
+VariableReference::VariableReference(Variables &vars, uint32 offset, Variables::Type type) {
+	set(vars, offset, type);
+}
+
+VariableReference::~VariableReference() {
+}
+
+void VariableReference::set(Variables &vars, uint32 offset, Variables::Type type) {
+	_vars = &vars;
+	_offset = offset;
+	_type = type;
+}
+
+VariableReference &VariableReference::operator=(uint32 value) {
+	if (_vars) {
+		switch (_type) {
+			case Variables::kVariableType8:
+				_vars->writeOff8(_offset, (uint8) value);
+				break;
+			case Variables::kVariableType16:
+				_vars->writeOff16(_offset, (uint16) value);
+				break;
+			case Variables::kVariableType32:
+				_vars->writeOff32(_offset, value);
+				break;
+		}
+	}
+	return *this;
+}
+
+VariableReference::operator uint32() {
+	if (_vars) {
+		switch (_type) {
+			case Variables::kVariableType8:
+				return (uint32) _vars->readOff8(_offset);
+			case Variables::kVariableType16:
+				return (uint32) _vars->readOff16(_offset);
+			case Variables::kVariableType32:
+				return _vars->readOff32(_offset);
+		}
+	}
+
+	return 0;
+}
+
+VariableReference &VariableReference::operator+=(uint32 value) {
+	return (*this = (*this + value));
+}
+
+VariableReference &VariableReference::operator*=(uint32 value) {
+	return (*this = (*this * value));
+}
+
 } // End of namespace Gob
diff --git a/engines/gob/variables.h b/engines/gob/variables.h
index 5989ed38ee..32f160a6bd 100644
--- a/engines/gob/variables.h
+++ b/engines/gob/variables.h
@@ -30,6 +30,12 @@ namespace Gob {
 
 class Variables {
 public:
+	enum Type {
+		kVariableType8,
+		kVariableType16,
+		kVariableType32
+	};
+
 	Variables(uint32 size);
 	virtual ~Variables();
 
@@ -142,6 +148,26 @@ protected:
 	uint32 read32(const byte *buf) const;
 };
 
+class VariableReference {
+	public:
+		VariableReference();
+		VariableReference(Variables &vars, uint32 offset,
+				Variables::Type type = Variables::kVariableType32);
+		~VariableReference();
+
+		void set(Variables &vars, uint32 offset, Variables::Type type = Variables::kVariableType32);
+
+		VariableReference &operator=(uint32 value);
+		VariableReference &operator+=(uint32 value);
+		VariableReference &operator*=(uint32 value);
+		operator uint32();
+
+	private:
+		Variables *_vars;
+		uint32 _offset;
+		Variables::Type _type;
+};
+
 } // End of namespace Gob
 
 #endif // GOB_VARIABLES_H
-- 
cgit v1.2.3


From 5de579930d9ff33c2e7eeb1c267d3ef61227e558 Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Sat, 12 Jul 2008 20:35:44 +0000
Subject: Minor constness fix to help with aliasing

svn-id: r33017
---
 engines/gob/driver_vga.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp
index f68ce47783..2d3a10b570 100644
--- a/engines/gob/driver_vga.cpp
+++ b/engines/gob/driver_vga.cpp
@@ -112,7 +112,7 @@ void VGAVideoDriver::drawSprite(SurfaceDesc *source, SurfaceDesc *dest,
 	if ((width < 1) || (height < 1))
 		return;
 
-	byte *srcPos = source->getVidMem() + (top * source->getWidth()) + left;
+	const byte *srcPos = source->getVidMem() + (top * source->getWidth()) + left;
 	byte *destPos = dest->getVidMem() + (y * dest->getWidth()) + x;
 
 	uint32 size = width * height;
-- 
cgit v1.2.3


From 9c2d96530be10b2f8badb500330f744bd6cdc937 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sun, 13 Jul 2008 03:30:14 +0000
Subject: Properly implemented the OFF command. The new rendering order for
 graphics let this mistake finally surface.

svn-id: r33021
---
 engines/parallaction/exec.h      |  2 ++
 engines/parallaction/exec_ns.cpp | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h
index f41ce52302..887d6be526 100644
--- a/engines/parallaction/exec.h
+++ b/engines/parallaction/exec.h
@@ -68,6 +68,8 @@ class CommandExec_ns : public CommandExec {
 	Parallaction_ns	*_vm;
 
 protected:
+	void updateGetZone(ZonePtr z, bool visible);
+
 	DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid);
 	DECLARE_UNQUALIFIED_COMMAND_OPCODE(set);
 	DECLARE_UNQUALIFIED_COMMAND_OPCODE(clear);
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 9a93197f04..4ee0aca6c1 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -254,27 +254,34 @@ DECLARE_COMMAND_OPCODE(close) {
 	}
 }
 
+void CommandExec_ns::updateGetZone(ZonePtr z, bool visible) {
+	if (!z) {
+		return;
+	}
+
+	if ((z->_type & 0xFFFF) == kZoneGet) {
+		_vm->_gfx->showGfxObj(z->u.get->gfxobj, visible);
+	}
+}
 
 DECLARE_COMMAND_OPCODE(on) {
 	ZonePtr z = _ctxt.cmd->u._zone;
-	// WORKAROUND: the original DOS-based engine didn't check u->_zone before dereferencing
-	// the pointer to get structure members, thus leading to crashes in systems with memory
-	// protection.
-	// As a side note, the overwritten address is the 5th entry in the DOS interrupt table
-	// (print screen handler): this suggests that a system would hang when the print screen
-	// key is pressed after playing Nippon Safes, provided that this code path is taken.
+
 	if (z) {
 		z->_flags &= ~kFlagsRemove;
 		z->_flags |= kFlagsActive;
-		if ((z->_type & 0xFFFF) == kZoneGet) {
-			_vm->_gfx->showGfxObj(z->u.get->gfxobj, true);
-		}
+		updateGetZone(z, true);
 	}
 }
 
 
 DECLARE_COMMAND_OPCODE(off) {
-	_ctxt.cmd->u._zone->_flags |= kFlagsRemove;
+	ZonePtr z = _ctxt.cmd->u._zone;
+
+	if (z) {
+		_ctxt.cmd->u._zone->_flags |= kFlagsRemove;
+		updateGetZone(z, false);
+	}
 }
 
 
-- 
cgit v1.2.3


From 2a80bd0678c29787dd9959cf66842f2e0483327e Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sun, 13 Jul 2008 03:39:42 +0000
Subject: Cleanup and improved debugging output for CommandExec::run()

svn-id: r33022
---
 engines/parallaction/exec_ns.cpp | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 4ee0aca6c1..d1cfb14557 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -418,28 +418,38 @@ label1:
 
 
 void CommandExec::run(CommandList& list, ZonePtr z) {
-	if (list.size() == 0)
+	if (list.size() == 0) {
+		debugC(3, kDebugExec, "runCommands: nothing to do");
 		return;
+	}
+
+	debugC(3, kDebugExec, "runCommands starting");
 
-	debugC(3, kDebugExec, "runCommands");
+	uint32 useFlags = 0;
+	bool useLocalFlags;
 
 	CommandList::iterator it = list.begin();
 	for ( ; it != list.end(); it++) {
-
-		CommandPtr cmd = *it;
-		uint32 v8 = _vm->getLocationFlags();
-
 		if (_engineFlags & kEngineQuit)
 			break;
 
+		CommandPtr cmd = *it;
+
 		if (cmd->_flagsOn & kFlagsGlobal) {
-			v8 = _commandFlags | kFlagsGlobal;
+			useFlags = _commandFlags | kFlagsGlobal;
+			useLocalFlags = false;
+		} else {
+			useFlags = _vm->getLocationFlags();
+			useLocalFlags = true;
 		}
 
-		debugC(3, kDebugExec, "runCommands[%i] (on: %x, off: %x)", cmd->_id,  cmd->_flagsOn, cmd->_flagsOff);
+		bool onMatch = (cmd->_flagsOn & useFlags) == cmd->_flagsOn;
+		bool offMatch = (cmd->_flagsOff & ~useFlags) == cmd->_flagsOff;
+
+		debugC(3, kDebugExec, "runCommands[%i] (on: %x, off: %x), (%s = %x)", cmd->_id,  cmd->_flagsOn, cmd->_flagsOff,
+			useLocalFlags ? "LOCALFLAGS" : "GLOBALFLAGS", useFlags);
 
-		if ((cmd->_flagsOn & v8) != cmd->_flagsOn) continue;
-		if ((cmd->_flagsOff & ~v8) != cmd->_flagsOff) continue;
+		if (!onMatch || !offMatch) continue;
 
 		_ctxt.z = z;
 		_ctxt.cmd = cmd;
-- 
cgit v1.2.3


From 059936854c897c8090a776a4af23965e72fa48f9 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sun, 13 Jul 2008 06:27:31 +0000
Subject: Cleanup of walk code.

svn-id: r33023
---
 engines/parallaction/parallaction.cpp |  2 +-
 engines/parallaction/parallaction.h   | 12 ++---
 engines/parallaction/walk.cpp         | 96 ++++++++++++++++-------------------
 3 files changed, 50 insertions(+), 60 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 295f10820f..d03d61fc59 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -390,7 +390,7 @@ void Parallaction::runGame() {
 		if (_char._ani->gfxobj) {
 			_char._ani->gfxobj->z = _char._ani->_z;
 		}
-		walk();
+		walk(_char);
 		drawAnimations();
 	}
 
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 13c56cf57b..2d0a201686 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -261,9 +261,9 @@ public:
 	void		pauseJobs();
 	void		resumeJobs();
 
-	void		finalizeWalk(WalkNodeList *list);
-	int16		selectWalkFrame(const Common::Point& pos, const WalkNodePtr from);
-	void		clipMove(Common::Point& pos, const WalkNodePtr from);
+	void		finalizeWalk(Character &character);
+	int16		selectWalkFrame(Character &character, const Common::Point& pos, const WalkNodePtr to);
+	void		clipMove(Common::Point& pos, const WalkNodePtr to);
 
 	ZonePtr		findZone(const char *name);
 	ZonePtr		hitZone(uint32 type, uint16 x, uint16 y);
@@ -357,7 +357,7 @@ protected:		// members
 
 	void		displayComment(ExamineData *data);
 
-	uint16		checkDoor();
+	void		checkDoor(Character &character);
 
 	void		freeCharacter();
 
@@ -379,7 +379,7 @@ public:
 
 	void updateDoor(ZonePtr z);
 
-	virtual void walk() = 0;
+	virtual void walk(Character &character) = 0;
 	virtual void drawAnimations() = 0;
 
 	void		beep();
@@ -575,7 +575,7 @@ private:
 	const Callable *_callables;
 
 protected:
-	void walk();
+	void walk(Character &character);
 	void drawAnimations();
 
 	void		parseLocation(const char *filename);
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index 7d74dd0e0a..7a16960cbf 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -27,9 +27,11 @@
 
 namespace Parallaction {
 
+// should be reset on location switch
 static uint16 _doorData1 = 1000;
 static ZonePtr _zoneTrap;
 
+// should be reset on character switch
 static uint16	walkData1 = 0;
 static uint16	walkData2 = 0;	// next walk frame
 
@@ -259,30 +261,30 @@ uint16 PathBuilder::walkFunc1(int16 x, int16 y, WalkNodePtr Node) {
 	return 1;
 }
 
-void Parallaction::clipMove(Common::Point& pos, const WalkNodePtr from) {
+void Parallaction::clipMove(Common::Point& pos, const WalkNodePtr to) {
 
-	if ((pos.x < from->_x) && (pos.x < _pathBuffer->w) && (_pathBuffer->getValue(pos.x + 2, pos.y) != 0)) {
-		pos.x = (pos.x + 2 < from->_x) ? pos.x + 2 : from->_x;
+	if ((pos.x < to->_x) && (pos.x < _pathBuffer->w) && (_pathBuffer->getValue(pos.x + 2, pos.y) != 0)) {
+		pos.x = (pos.x + 2 < to->_x) ? pos.x + 2 : to->_x;
 	}
 
-	if ((pos.x > from->_x) && (pos.x > 0) && (_pathBuffer->getValue(pos.x - 2, pos.y) != 0)) {
-		pos.x = (pos.x - 2 > from->_x) ? pos.x - 2 : from->_x;
+	if ((pos.x > to->_x) && (pos.x > 0) && (_pathBuffer->getValue(pos.x - 2, pos.y) != 0)) {
+		pos.x = (pos.x - 2 > to->_x) ? pos.x - 2 : to->_x;
 	}
 
-	if ((pos.y < from->_y) && (pos.y < _pathBuffer->h) && (_pathBuffer->getValue(pos.x, pos.y + 2) != 0)) {
-		pos.y = (pos.y + 2 <= from->_y) ? pos.y + 2 : from->_y;
+	if ((pos.y < to->_y) && (pos.y < _pathBuffer->h) && (_pathBuffer->getValue(pos.x, pos.y + 2) != 0)) {
+		pos.y = (pos.y + 2 <= to->_y) ? pos.y + 2 : to->_y;
 	}
 
-	if ((pos.y > from->_y) && (pos.y > 0) && (_pathBuffer->getValue(pos.x, pos.y - 2) != 0)) {
-		pos.y = (pos.y - 2 >= from->_y) ? pos.y - 2 :from->_y;
+	if ((pos.y > to->_y) && (pos.y > 0) && (_pathBuffer->getValue(pos.x, pos.y - 2) != 0)) {
+		pos.y = (pos.y - 2 >= to->_y) ? pos.y - 2 : to->_y;
 	}
 
 	return;
 }
 
-int16 Parallaction::selectWalkFrame(const Common::Point& pos, const WalkNodePtr from) {
+int16 Parallaction::selectWalkFrame(Character &character, const Common::Point& pos, const WalkNodePtr to) {
 
-	Common::Point dist(from->_x - pos.x, from->_y - pos.y);
+	Common::Point dist(to->_x - pos.x, to->_y - pos.y);
 
 	if (dist.x < 0)
 		dist.x = -dist.x;
@@ -293,14 +295,14 @@ int16 Parallaction::selectWalkFrame(const Common::Point& pos, const WalkNodePtr
 
 	// walk frame selection
 	int16 v16;
-	if (_char._ani->getFrameNum() == 20) {
+	if (character._ani->getFrameNum() == 20) {
 
 		if (dist.x > dist.y) {
-			walkData2 = (from->_x > pos.x) ? 0 : 7;
+			walkData2 = (to->_x > pos.x) ? 0 : 7;
 			walkData1 %= 12;
 			v16 = walkData1 / 2;
 		} else {
-			walkData2 = (from->_y > pos.y) ? 14 : 17;
+			walkData2 = (to->_y > pos.y) ? 14 : 17;
 			walkData1 %= 8;
 			v16 = walkData1 / 4;
 		}
@@ -308,11 +310,11 @@ int16 Parallaction::selectWalkFrame(const Common::Point& pos, const WalkNodePtr
 	} else {
 
 		if (dist.x > dist.y) {
-			walkData2 = (from->_x > pos.x) ? 0 : 9;
+			walkData2 = (to->_x > pos.x) ? 0 : 9;
 			walkData1 %= 16;
 			v16 = walkData1 / 2;
 		} else {
-			walkData2 = (from->_y > pos.y) ? 18 : 21;
+			walkData2 = (to->_y > pos.y) ? 18 : 21;
 			walkData1 %= 8;
 			v16 = walkData1 / 4;
 		}
@@ -322,9 +324,7 @@ int16 Parallaction::selectWalkFrame(const Common::Point& pos, const WalkNodePtr
 	return v16;
 }
 
-uint16 Parallaction::checkDoor() {
-//	printf("checkDoor()...");
-
+void Parallaction::checkDoor(Character &character) {
 	if (_currentLocationIndex != _doorData1) {
 		_doorData1 = _currentLocationIndex;
 		_zoneTrap = nullZonePtr;
@@ -334,7 +334,7 @@ uint16 Parallaction::checkDoor() {
 
 	Common::Point foot;
 
-	_char.getFoot(foot);
+	character.getFoot(foot);
 	ZonePtr z = hitZone(kZoneDoor, foot.x, foot.y);
 
 	if (z) {
@@ -351,7 +351,7 @@ uint16 Parallaction::checkDoor() {
 		}
 	}
 
-	_char.getFoot(foot);
+	character.getFoot(foot);
 	z = hitZone(kZoneTrap, foot.x, foot.y);
 
 	if (z) {
@@ -367,61 +367,51 @@ uint16 Parallaction::checkDoor() {
 		_zoneTrap = nullZonePtr;
 	}
 
-//	printf("done\n");
-
-	_char._ani->_frame = walkData2;
-	return _char._ani->_frame;
 }
 
 
-void Parallaction::finalizeWalk(WalkNodeList *list) {
-	checkDoor();
-	delete list;
+void Parallaction::finalizeWalk(Character &character) {
+	checkDoor(character);
+	delete character._walkPath;
+	character._walkPath = 0;
+
+	character._ani->_frame = walkData2;
 }
 
-void Parallaction_ns::walk() {
+void Parallaction_ns::walk(Character &character) {
 	if ((_engineFlags & kEngineWalking) == 0) {
 		return;
 	}
 
-	WalkNodeList *list = _char._walkPath;
+	Common::Point curPos;
+	character.getFoot(curPos);
 
-	_char._ani->_oldPos.x = _char._ani->_left;
-	_char._ani->_oldPos.y = _char._ani->_top;
+	WalkNodeList::iterator it = character._walkPath->begin();
 
-	Common::Point pos;
-	_char.getFoot(pos);
-
-	WalkNodeList::iterator it = list->begin();
-
-	if (it != list->end()) {
-		if ((*it)->_x == pos.x && (*it)->_y == pos.y) {
+	if (it != character._walkPath->end()) {
+		if ((*it)->_x == curPos.x && (*it)->_y == curPos.y) {
 			debugC(1, kDebugWalk, "walk reached node (%i, %i)", (*it)->_x, (*it)->_y);
-			it = list->erase(it);
+			it = character._walkPath->erase(it);
 		}
 	}
-	if (it == list->end()) {
+	if (it == character._walkPath->end()) {
 		debugC(1, kDebugWalk, "walk reached last node");
-//		j->_finished = 1;
-		finalizeWalk(list);
+		finalizeWalk(character);
 		return;
 	}
-	_char._walkPath = list;
 
 	// selectWalkFrame must be performed before position is changed by clipMove
-	int16 v16 = selectWalkFrame(pos, *it);
-	clipMove(pos, *it);
-
-	_char.setFoot(pos);
+	int16 walkFrame = selectWalkFrame(character, curPos, *it);
 
-	Common::Point newpos(_char._ani->_left, _char._ani->_top);
+	Common::Point newPos(curPos);
+	clipMove(newPos, *it);
+	character.setFoot(newPos);
 
-	if (newpos == _char._ani->_oldPos) {
+	if (newPos == curPos) {
 		debugC(1, kDebugWalk, "walk was blocked by an unforeseen obstacle");
-//		j->_finished = 1;
-		finalizeWalk(list);
+		finalizeWalk(character);
 	} else {
-		_char._ani->_frame = v16 + walkData2 + 1;
+		character._ani->_frame = walkFrame + walkData2 + 1;
 	}
 
 	return;
-- 
cgit v1.2.3


From ba5f14692febafdad9c58be67eb6aa87b9afba2f Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Sun, 13 Jul 2008 12:20:24 +0000
Subject: - fix for bug #2016965: KYRA: does not compile in MSVC71

svn-id: r33030
---
 engines/kyra/sound_towns.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 6be2cae7a4..e96cef735c 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -34,11 +34,6 @@
 
 #include "common/util.h"
 
-#ifdef _MSC_VER
-#define	_USE_MATH_DEFINES
-#endif
-#include <math.h>
-
 #define		EUPHONY_FADEOUT_TICKS		600
 
 namespace Kyra {
@@ -2657,7 +2652,7 @@ void TownsPC98_OpnDriver::generateTables() {
 	delete [] _oprSinTbl;
 	_oprSinTbl = new uint32[1024];
 	for (int i = 0; i < 1024; i++) {
-		double val = sin((double) (((i << 1) + 1) * M_PI / 1024.0));
+		double val = sin((double) (((i << 1) + 1) * PI / 1024.0));
 		double d_dcb = log(1.0 / (double)ABS(val)) / log(2.0) * 256.0;
 		int32 i_dcb = (int32)(2.0 * d_dcb);
 		i_dcb = (i_dcb & 1) ? (i_dcb >> 1) + 1 : (i_dcb >> 1);
-- 
cgit v1.2.3


From ef95c6ff70c1b428ab1d086a9b0b551fc82c8451 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sun, 13 Jul 2008 13:04:36 +0000
Subject: More refactoring of walk code.

svn-id: r33033
---
 engines/parallaction/parallaction.cpp    |  56 +++++++++++++
 engines/parallaction/parallaction.h      |  10 ++-
 engines/parallaction/parallaction_ns.cpp |   2 +
 engines/parallaction/walk.cpp            | 133 ++++++++++---------------------
 4 files changed, 107 insertions(+), 94 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index d03d61fc59..3cde21b49c 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -503,6 +503,34 @@ void Parallaction::freeZones() {
 }
 
 
+enum {
+	WALK_LEFT = 0,
+	WALK_RIGHT = 1,
+	WALK_DOWN = 2,
+	WALK_UP = 3
+};
+
+struct WalkFrames {
+	int16 stillFrame[4];
+	int16 firstWalkFrame[4];
+	int16 numWalkFrames[4];
+	int16 frameRepeat[4];
+};
+
+WalkFrames _char20WalkFrames = {
+	{  0,  7, 14, 17 },
+	{  1,  8, 15, 18 },
+	{  6,  6,  2,  2 },
+	{  2,  2,  4,  4 }
+};
+
+WalkFrames _char24WalkFrames = {
+	{  0,  9, 18, 21 },
+	{  1, 10, 19, 22 },
+	{  8,  8,  2,  2 },
+	{  2,  2,  4,  4 }
+};
+
 const char Character::_prefixMini[] = "mini";
 const char Character::_suffixTras[] = "tras";
 const char Character::_empty[] = "\0";
@@ -513,6 +541,9 @@ Character::Character(Parallaction *vm) : _vm(vm), _ani(new Animation), _builder(
 	_head = NULL;
 	_objs = NULL;
 
+	_direction = WALK_DOWN;
+	_step = 0;
+
 	_dummy = false;
 
 	_ani->_left = 150;
@@ -633,4 +664,29 @@ void Parallaction::scheduleLocationSwitch(const char *location) {
 }
 
 
+
+
+
+void Character::updateDirection(const Common::Point& pos, const Common::Point& to) {
+
+	Common::Point dist(to.x - pos.x, to.y - pos.y);
+	WalkFrames *frames = (_ani->getFrameNum() == 20) ? &_char20WalkFrames : &_char24WalkFrames;
+
+	_step++;
+
+	if (dist.x == 0 && dist.y == 0) {
+		_ani->_frame = frames->stillFrame[_direction];
+		return;
+	}
+
+	if (dist.x < 0)
+		dist.x = -dist.x;
+	if (dist.y < 0)
+		dist.y = -dist.y;
+
+	_direction = (dist.x > dist.y) ? ((to.x > pos.x) ? WALK_LEFT : WALK_RIGHT) : ((to.y > pos.y) ? WALK_DOWN : WALK_UP);
+	_ani->_frame = frames->firstWalkFrame[_direction] + (_step / frames->frameRepeat[_direction]) % frames->numWalkFrames[_direction];
+}
+
+
 } // namespace Parallaction
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 2d0a201686..ef2dad9884 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -229,12 +229,17 @@ protected:
 	static const char _suffixTras[];
 	static const char _empty[];
 
+	int16		_direction, _step;
+
 public:
 	void setName(const char *name);
 	const char *getName() const;
 	const char *getBaseName() const;
 	const char *getFullName() const;
 	bool dummy() const;
+
+	void updateDirection(const Common::Point& pos, const Common::Point& to);
+
 };
 
 
@@ -263,7 +268,7 @@ public:
 
 	void		finalizeWalk(Character &character);
 	int16		selectWalkFrame(Character &character, const Common::Point& pos, const WalkNodePtr to);
-	void		clipMove(Common::Point& pos, const WalkNodePtr to);
+	void		clipMove(Common::Point& pos, const Common::Point& to);
 
 	ZonePtr		findZone(const char *name);
 	ZonePtr		hitZone(uint32 type, uint16 x, uint16 y);
@@ -357,7 +362,7 @@ protected:		// members
 
 	void		displayComment(ExamineData *data);
 
-	void		checkDoor(Character &character);
+	void		checkDoor(const Common::Point &foot);
 
 	void		freeCharacter();
 
@@ -384,6 +389,7 @@ public:
 
 	void		beep();
 
+	ZonePtr		_zoneTrap;
 
 public:
 //	const char **_zoneFlagNamesRes;
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 850123de97..d1b25f189a 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -305,6 +305,8 @@ void Parallaction_ns::changeLocation(char *location) {
 	_gfx->hideFloatingLabel();
 	_gfx->freeLabels();
 
+	_zoneTrap = nullZonePtr;
+
 	_input->stopHovering();
 	if (_engineFlags & kEngineBlockInput) {
 		setArrowCursor();
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index 7a16960cbf..40dfddb903 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -27,14 +27,6 @@
 
 namespace Parallaction {
 
-// should be reset on location switch
-static uint16 _doorData1 = 1000;
-static ZonePtr _zoneTrap;
-
-// should be reset on character switch
-static uint16	walkData1 = 0;
-static uint16	walkData2 = 0;	// next walk frame
-
 
 inline byte PathBuffer::getValue(uint16 x, uint16 y) {
 	byte m = data[(x >> 3) + y * internalWidth];
@@ -261,99 +253,43 @@ uint16 PathBuilder::walkFunc1(int16 x, int16 y, WalkNodePtr Node) {
 	return 1;
 }
 
-void Parallaction::clipMove(Common::Point& pos, const WalkNodePtr to) {
+void Parallaction::clipMove(Common::Point& pos, const Common::Point& to) {
 
-	if ((pos.x < to->_x) && (pos.x < _pathBuffer->w) && (_pathBuffer->getValue(pos.x + 2, pos.y) != 0)) {
-		pos.x = (pos.x + 2 < to->_x) ? pos.x + 2 : to->_x;
+	if ((pos.x < to.x) && (pos.x < _pathBuffer->w) && (_pathBuffer->getValue(pos.x + 2, pos.y) != 0)) {
+		pos.x = (pos.x + 2 < to.x) ? pos.x + 2 : to.x;
 	}
 
-	if ((pos.x > to->_x) && (pos.x > 0) && (_pathBuffer->getValue(pos.x - 2, pos.y) != 0)) {
-		pos.x = (pos.x - 2 > to->_x) ? pos.x - 2 : to->_x;
+	if ((pos.x > to.x) && (pos.x > 0) && (_pathBuffer->getValue(pos.x - 2, pos.y) != 0)) {
+		pos.x = (pos.x - 2 > to.x) ? pos.x - 2 : to.x;
 	}
 
-	if ((pos.y < to->_y) && (pos.y < _pathBuffer->h) && (_pathBuffer->getValue(pos.x, pos.y + 2) != 0)) {
-		pos.y = (pos.y + 2 <= to->_y) ? pos.y + 2 : to->_y;
+	if ((pos.y < to.y) && (pos.y < _pathBuffer->h) && (_pathBuffer->getValue(pos.x, pos.y + 2) != 0)) {
+		pos.y = (pos.y + 2 <= to.y) ? pos.y + 2 : to.y;
 	}
 
-	if ((pos.y > to->_y) && (pos.y > 0) && (_pathBuffer->getValue(pos.x, pos.y - 2) != 0)) {
-		pos.y = (pos.y - 2 >= to->_y) ? pos.y - 2 : to->_y;
+	if ((pos.y > to.y) && (pos.y > 0) && (_pathBuffer->getValue(pos.x, pos.y - 2) != 0)) {
+		pos.y = (pos.y - 2 >= to.y) ? pos.y - 2 : to.y;
 	}
 
 	return;
 }
 
-int16 Parallaction::selectWalkFrame(Character &character, const Common::Point& pos, const WalkNodePtr to) {
-
-	Common::Point dist(to->_x - pos.x, to->_y - pos.y);
-
-	if (dist.x < 0)
-		dist.x = -dist.x;
-	if (dist.y < 0)
-		dist.y = -dist.y;
-
-	walkData1++;
-
-	// walk frame selection
-	int16 v16;
-	if (character._ani->getFrameNum() == 20) {
-
-		if (dist.x > dist.y) {
-			walkData2 = (to->_x > pos.x) ? 0 : 7;
-			walkData1 %= 12;
-			v16 = walkData1 / 2;
-		} else {
-			walkData2 = (to->_y > pos.y) ? 14 : 17;
-			walkData1 %= 8;
-			v16 = walkData1 / 4;
-		}
-
-	} else {
-
-		if (dist.x > dist.y) {
-			walkData2 = (to->_x > pos.x) ? 0 : 9;
-			walkData1 %= 16;
-			v16 = walkData1 / 2;
-		} else {
-			walkData2 = (to->_y > pos.y) ? 18 : 21;
-			walkData1 %= 8;
-			v16 = walkData1 / 4;
-		}
-
-	}
-
-	return v16;
-}
-
-void Parallaction::checkDoor(Character &character) {
-	if (_currentLocationIndex != _doorData1) {
-		_doorData1 = _currentLocationIndex;
-		_zoneTrap = nullZonePtr;
-	}
-
-	_engineFlags &= ~kEngineWalking;
 
-	Common::Point foot;
+void Parallaction::checkDoor(const Common::Point &foot) {
 
-	character.getFoot(foot);
 	ZonePtr z = hitZone(kZoneDoor, foot.x, foot.y);
-
 	if (z) {
-
 		if ((z->_flags & kFlagsClosed) == 0) {
 			_location._startPosition = z->u.door->_startPos;
 			_location._startFrame = z->u.door->_startFrame;
-
 			scheduleLocationSwitch(z->u.door->_location);
 			_zoneTrap = nullZonePtr;
-
 		} else {
 			_cmdExec->run(z->_commands, z);
 		}
 	}
 
-	character.getFoot(foot);
 	z = hitZone(kZoneTrap, foot.x, foot.y);
-
 	if (z) {
 		setLocationFlags(kFlagsEnter);
 		_cmdExec->run(z->_commands, z);
@@ -371,11 +307,14 @@ void Parallaction::checkDoor(Character &character) {
 
 
 void Parallaction::finalizeWalk(Character &character) {
-	checkDoor(character);
+	_engineFlags &= ~kEngineWalking;
+
+	Common::Point foot;
+	character.getFoot(foot);
+	checkDoor(foot);
+
 	delete character._walkPath;
 	character._walkPath = 0;
-
-	character._ani->_frame = walkData2;
 }
 
 void Parallaction_ns::walk(Character &character) {
@@ -386,35 +325,45 @@ void Parallaction_ns::walk(Character &character) {
 	Common::Point curPos;
 	character.getFoot(curPos);
 
+	// update target, if previous was reached
 	WalkNodeList::iterator it = character._walkPath->begin();
-
 	if (it != character._walkPath->end()) {
 		if ((*it)->_x == curPos.x && (*it)->_y == curPos.y) {
 			debugC(1, kDebugWalk, "walk reached node (%i, %i)", (*it)->_x, (*it)->_y);
 			it = character._walkPath->erase(it);
 		}
 	}
+
+	// advance character towards the target
+	Common::Point targetPos;
 	if (it == character._walkPath->end()) {
 		debugC(1, kDebugWalk, "walk reached last node");
 		finalizeWalk(character);
-		return;
-	}
-
-	// selectWalkFrame must be performed before position is changed by clipMove
-	int16 walkFrame = selectWalkFrame(character, curPos, *it);
+		targetPos = curPos;
+	} else {
+		if (*it) {
+			// targetPos is saved to help setting character direction
+			targetPos.x = (*it)->_x;
+			targetPos.y = (*it)->_y;
+		}
 
-	Common::Point newPos(curPos);
-	clipMove(newPos, *it);
-	character.setFoot(newPos);
+		Common::Point newPos(curPos);
+		clipMove(newPos, targetPos);
+		character.setFoot(newPos);
 
-	if (newPos == curPos) {
-		debugC(1, kDebugWalk, "walk was blocked by an unforeseen obstacle");
-		finalizeWalk(character);
-	} else {
-		character._ani->_frame = walkFrame + walkData2 + 1;
+		if (newPos == curPos) {
+			debugC(1, kDebugWalk, "walk was blocked by an unforeseen obstacle");
+			finalizeWalk(character);
+		}
 	}
 
-	return;
+	// targetPos is used to select the direction (and the walkFrame) of a character,
+	// since it doesn't cause the sudden changes in orientation that newPos would.
+	// Since newPos is 'adjusted' according to walkable areas, an imaginary line drawn
+	// from curPos to newPos is prone to abrutply change in direction, thus making the
+	// code select 'too different' frames when walking diagonally against obstacles,
+	// and yielding an annoying shaking effect in the character.
+	character.updateDirection(curPos, targetPos);
 }
 
 
-- 
cgit v1.2.3


From 7b2645248c0d645266107bd732256c1c541f7278 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 14 Jul 2008 00:13:31 +0000
Subject: Made sure characters are not removed from the rendering list during
 switches.

svn-id: r33052
---
 engines/parallaction/parallaction_ns.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index d1b25f189a..cbf9ee985d 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -420,6 +420,7 @@ void Parallaction_ns::changeCharacter(const char *name) {
 	Common::String oldArchive = _disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1");
 	_char._ani->gfxobj = _gfx->loadAnim(_char.getFullName());
 	_char._ani->gfxobj->setFlags(kGfxObjCharacter);
+	_char._ani->gfxobj->clearFlags(kGfxObjNormal);
 
 	if (!_char.dummy()) {
 		if (getPlatform() == Common::kPlatformAmiga) {
-- 
cgit v1.2.3


From d0ae6885ac34510cea3363b72f9467dbe62de762 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 14 Jul 2008 00:21:05 +0000
Subject: Fixed regression in walk code. Now standing frames are correctly
 selected when the character encounters an unexpected blocking object in
 his/her path.

svn-id: r33053
---
 engines/parallaction/walk.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index 40dfddb903..a717b615e6 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -354,6 +354,7 @@ void Parallaction_ns::walk(Character &character) {
 		if (newPos == curPos) {
 			debugC(1, kDebugWalk, "walk was blocked by an unforeseen obstacle");
 			finalizeWalk(character);
+			targetPos = newPos;	// when walking is interrupted, targetPos must be hacked so that a still frame can be selected
 		}
 	}
 
-- 
cgit v1.2.3


From eaeb1587f408e540a1449d4b035e794e65937220 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 14 Jul 2008 10:33:57 +0000
Subject: Fix for missing data in the savegame format that could result in not
 being able to talk to Goewin in the apothecary after restoring a savegame

svn-id: r33057
---
 engines/lure/luredefs.h     | 2 +-
 engines/lure/res_struct.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h
index 603102a099..922e1207d0 100644
--- a/engines/lure/luredefs.h
+++ b/engines/lure/luredefs.h
@@ -36,7 +36,7 @@ namespace Lure {
 #define LURE_DAT_MAJOR 1
 #define LURE_DAT_MINOR 29
 #define LURE_MIN_SAVEGAME_MINOR 25
-#define LURE_SAVEGAME_MINOR 32
+#define LURE_SAVEGAME_MINOR 33
 
 #define LURE_DEBUG 1
 
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index de09f982d1..92cea948f9 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -456,6 +456,8 @@ void HotspotData::saveToStream(WriteStream *stream) {
 	stream->writeSint16LE(startY);
 	stream->writeUint16LE(roomNumber);
 	stream->writeByte(layer);
+	stream->writeUint16LE(walkX);
+	stream->writeUint16LE(walkY);
 
 	stream->writeUint16LE(width);
 	stream->writeUint16LE(height);
@@ -503,6 +505,10 @@ void HotspotData::loadFromStream(ReadStream *stream) {
 	uint8 saveVersion = LureEngine::getReference().saveVersion();
 	if (saveVersion >= 29)
 		layer = stream->readByte();
+	if (saveVersion >= 33) {
+		walkX = stream->readUint16LE();
+		walkY = stream->readUint16LE();
+	}
 
 	width = stream->readUint16LE();
 	height = stream->readUint16LE();
-- 
cgit v1.2.3


From c48f3ca8d8341d642690dbeb0207b77ecd58d291 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 14 Jul 2008 13:35:43 +0000
Subject: Removed all labels from the rendering list to avoid random crashes
 after introduction is over.

svn-id: r33058
---
 engines/parallaction/callables_ns.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp
index 7c053715f6..ed60a193ce 100644
--- a/engines/parallaction/callables_ns.cpp
+++ b/engines/parallaction/callables_ns.cpp
@@ -424,6 +424,7 @@ void Parallaction_ns::_c_testResult(void *parm) {
 	}
 	_inTestResult = true;
 
+	_gfx->freeLabels();
 	_gfx->updateScreen();
 
 	_disk->selectArchive("disk1");
-- 
cgit v1.2.3


From c25c406c00175155f635aa1e1d37adb5e37cdb4c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 14 Jul 2008 19:14:26 +0000
Subject: cleanup (and test for Marwan's branch.... ;)

svn-id: r33061
---
 engines/scumm/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 753ad45212..68d3010199 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -949,7 +949,7 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
 	sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
-	for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
+	for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
 		// Obtain the last 2 digits of the filename, since they correspond to the save slot
 		int slotNum = atoi(file->c_str() + file->size() - 2);
 		
-- 
cgit v1.2.3


From 9c91f091ff7a389da31534bce99908ba4e856163 Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Mon, 14 Jul 2008 20:34:31 +0000
Subject: Register spilling avoided in AGOS background drawing (and 2x
 unrolling)

svn-id: r33062
---
 engines/agos/gfx.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index c014413bdc..2d7d6641dc 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -744,10 +744,6 @@ void AGOSEngine_Simon1::drawImage(VC10_state *state) {
 }
 
 void AGOSEngine::drawBackGroundImage(VC10_state *state) {
-	const byte *src;
-	byte *dst;
-	uint h, i;
-
 	state->width = _screenWidth;
 	if (_window3Flag == 1) {
 		state->width = 0;
@@ -755,15 +751,19 @@ void AGOSEngine::drawBackGroundImage(VC10_state *state) {
 		state->y_skip = 0;
 	}
 
-	src = state->srcPtr + (state->width * state->y_skip) + (state->x_skip * 8);
-	dst = state->surf_addr;
+	const byte* src = state->srcPtr + (state->width * state->y_skip) + (state->x_skip * 8);
+	byte* dst = state->surf_addr;
 
 	state->draw_width *= 2;
 
-	h = state->draw_height;
+	uint h = state->draw_height;
+	const uint w = state->draw_width;
+	const byte paletteMod = state->paletteMod;
 	do {
-		for (i = 0; i != state->draw_width; i++)
-			dst[i] = src[i] + state->paletteMod;
+		for (uint i = 0; i != w; i+=2) {
+			dst[i] = src[i] + paletteMod;
+			dst[i+1] = src[i+1] + paletteMod;
+		}
 		dst += state->surf_pitch;
 		src += state->width;
 	} while (--h);
-- 
cgit v1.2.3


From ff5f3730c57a81816e3bc2e3365c4fc30701ca1f Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 14 Jul 2008 21:00:39 +0000
Subject: Don't draw scumm saveload dialog while reflowing layout, as that
 would use uninitialized values

svn-id: r33063
---
 engines/scumm/dialogs.cpp | 33 +++++++++++++++++++++++----------
 engines/scumm/dialogs.h   |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6d1cf1bbd8..89532b8961 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -31,6 +31,8 @@
 
 #include "graphics/scaler.h"
 
+#include "valgrind/memcheck.h"
+
 #ifdef __DS__
 #include "scummhelp.h"
 #endif
@@ -297,7 +299,7 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
 		break;
 	case GUI::kListSelectionChangedCmd: {
 		if (_gfxWidget) {
-			updateInfos();
+			updateInfos(true);
 		}
 
 		if (_saveMode) {
@@ -326,6 +328,10 @@ void SaveLoadChooser::reflowLayout() {
 
 		_container->resize(thumbX - hPad, thumbY - vPad, kThumbnailWidth + hPad * 2, thumbH + vPad * 2 + kLineHeight * 4);
 
+		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbX);
+		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbY);
+		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbH);
+
 		// Add the thumbnail display
 		_gfxWidget->resize(thumbX, thumbY, kThumbnailWidth, thumbH);
 
@@ -350,7 +356,7 @@ void SaveLoadChooser::reflowLayout() {
 		_fillR = g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillR");
 		_fillG = g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillG");
 		_fillB = g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillB");
-		updateInfos();
+		updateInfos(false);
 	} else {
 		_container->setFlags(GUI::WIDGET_INVISIBLE);
 		_gfxWidget->setFlags(GUI::WIDGET_INVISIBLE);
@@ -362,7 +368,7 @@ void SaveLoadChooser::reflowLayout() {
 	Dialog::reflowLayout();
 }
 
-void SaveLoadChooser::updateInfos() {
+void SaveLoadChooser::updateInfos(bool draw) {
 	int selItem = _list->getSelected();
 	Graphics::Surface *thumb;
 	thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
@@ -376,7 +382,8 @@ void SaveLoadChooser::updateInfos() {
 	}
 
 	delete thumb;
-	_gfxWidget->draw();
+	if (draw)
+		_gfxWidget->draw();
 
 	InfoStuff infos;
 	memset(&infos, 0, sizeof(InfoStuff));
@@ -386,12 +393,14 @@ void SaveLoadChooser::updateInfos() {
 			(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
 			infos.date & 0xFFFF);
 		_date->setLabel(buffer);
-		_date->draw();
+		if (draw)
+			_date->draw();
 
 		snprintf(buffer, 32, "Time: %.2d:%.2d",
 			(infos.time >> 8) & 0xFF, infos.time & 0xFF);
 		_time->setLabel(buffer);
-		_time->draw();
+		if (draw)
+			_time->draw();
 
 		int minutes = infos.playtime / 60;
 		int hours = minutes / 60;
@@ -400,19 +409,23 @@ void SaveLoadChooser::updateInfos() {
 		snprintf(buffer, 32, "Playtime: %.2d:%.2d",
 			hours & 0xFF, minutes & 0xFF);
 		_playtime->setLabel(buffer);
-		_playtime->draw();
+		if (draw)
+			_playtime->draw();
 	} else {
 		snprintf(buffer, 32, "No date saved");
 		_date->setLabel(buffer);
-		_date->draw();
+		if (draw)
+			_date->draw();
 
 		snprintf(buffer, 32, "No time saved");
 		_time->setLabel(buffer);
-		_time->draw();
+		if (draw)
+			_time->draw();
 
 		snprintf(buffer, 32, "No playtime saved");
 		_playtime->setLabel(buffer);
-		_playtime->draw();
+		if (draw)
+			_playtime->draw();
 	}
 }
 
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 7c99a0ebcc..730952676c 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -69,7 +69,7 @@ protected:
 
 	uint8 _fillR, _fillG, _fillB;
 
-	void updateInfos();
+	void updateInfos(bool draw);
 public:
 	SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine);
 	~SaveLoadChooser();
-- 
cgit v1.2.3


From ba4ba85124d5cffdd75093abb6759f7588280f06 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 14 Jul 2008 21:04:42 +0000
Subject: remove accidentally committed debugging code; fix shadowing warning

svn-id: r33064
---
 engines/scumm/dialogs.cpp | 22 ++++++++--------------
 engines/scumm/dialogs.h   |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 89532b8961..e4e2b2b620 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -31,8 +31,6 @@
 
 #include "graphics/scaler.h"
 
-#include "valgrind/memcheck.h"
-
 #ifdef __DS__
 #include "scummhelp.h"
 #endif
@@ -328,10 +326,6 @@ void SaveLoadChooser::reflowLayout() {
 
 		_container->resize(thumbX - hPad, thumbY - vPad, kThumbnailWidth + hPad * 2, thumbH + vPad * 2 + kLineHeight * 4);
 
-		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbX);
-		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbY);
-		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbH);
-
 		// Add the thumbnail display
 		_gfxWidget->resize(thumbX, thumbY, kThumbnailWidth, thumbH);
 
@@ -368,7 +362,7 @@ void SaveLoadChooser::reflowLayout() {
 	Dialog::reflowLayout();
 }
 
-void SaveLoadChooser::updateInfos(bool draw) {
+void SaveLoadChooser::updateInfos(bool redraw) {
 	int selItem = _list->getSelected();
 	Graphics::Surface *thumb;
 	thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
@@ -382,7 +376,7 @@ void SaveLoadChooser::updateInfos(bool draw) {
 	}
 
 	delete thumb;
-	if (draw)
+	if (redraw)
 		_gfxWidget->draw();
 
 	InfoStuff infos;
@@ -393,13 +387,13 @@ void SaveLoadChooser::updateInfos(bool draw) {
 			(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
 			infos.date & 0xFFFF);
 		_date->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_date->draw();
 
 		snprintf(buffer, 32, "Time: %.2d:%.2d",
 			(infos.time >> 8) & 0xFF, infos.time & 0xFF);
 		_time->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_time->draw();
 
 		int minutes = infos.playtime / 60;
@@ -409,22 +403,22 @@ void SaveLoadChooser::updateInfos(bool draw) {
 		snprintf(buffer, 32, "Playtime: %.2d:%.2d",
 			hours & 0xFF, minutes & 0xFF);
 		_playtime->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_playtime->draw();
 	} else {
 		snprintf(buffer, 32, "No date saved");
 		_date->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_date->draw();
 
 		snprintf(buffer, 32, "No time saved");
 		_time->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_time->draw();
 
 		snprintf(buffer, 32, "No playtime saved");
 		_playtime->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_playtime->draw();
 	}
 }
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 730952676c..0d04d8faea 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -69,7 +69,7 @@ protected:
 
 	uint8 _fillR, _fillG, _fillB;
 
-	void updateInfos(bool draw);
+	void updateInfos(bool redraw);
 public:
 	SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine);
 	~SaveLoadChooser();
-- 
cgit v1.2.3


From 60357650e03c8504b06631bba3ca520285977f15 Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Mon, 14 Jul 2008 23:10:51 +0000
Subject: Fix for bug #2016647 (FW: crash with italian amiga version). -
 Consists of a workaround for a script bug that used local   variable 251 when
 it should've used global variable 251. - Also added a fix for a crash when
 failing copy protection   in Amiga or Atari ST versions of Future Wars. NOTE:
 That any of the Amiga or Atari ST versions of Future Wars haven't crashed
 right in the beginning before seems like plain luck because accessing local
 variable 251 is out of bounds!

svn-id: r33068
---
 engines/cine/cine.h        |  1 +
 engines/cine/prc.cpp       |  9 ++++++---
 engines/cine/prc.h         |  2 +-
 engines/cine/script_fw.cpp | 14 ++++++++++++++
 engines/cine/various.cpp   | 14 ++++++++++++--
 5 files changed, 34 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 710840c17e..7568d8310e 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -107,6 +107,7 @@ private:
 extern CineEngine *g_cine;
 
 #define BOOT_PRC_NAME "AUTO00.PRC"
+#define COPY_PROT_FAIL_PRC_NAME "L201.ANI"
 
 enum {
 	VAR_MOUSE_X_MODE = 253,
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index 402c97b1a6..27b1044620 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -40,8 +40,9 @@ ScriptList objectScripts;
 
 /*! \todo Is script size of 0 valid?
  * \todo Fix script dump code
+ * @return Was the loading successful?
  */
-void loadPrc(const char *pPrcName) {
+bool loadPrc(const char *pPrcName) {
 	byte i;
 	uint16 numScripts;
 	byte *scriptPtr, *dataPtr;
@@ -52,9 +53,9 @@ void loadPrc(const char *pPrcName) {
 	scriptTable.clear();
 
 	// This is copy protection. Used to hang the machine
-	if (!scumm_stricmp(pPrcName, "L201.ANI")) {
+	if (!scumm_stricmp(pPrcName, COPY_PROT_FAIL_PRC_NAME)) {
 		exitEngine = 1;
-		return;
+		return false;
 	}
 
 	checkDataDisk(-1);
@@ -107,6 +108,8 @@ void loadPrc(const char *pPrcName) {
 		}
 	}
 #endif
+
+	return true;
 }
 
 } // End of namespace Cine
diff --git a/engines/cine/prc.h b/engines/cine/prc.h
index f5129d28b1..05bb240372 100644
--- a/engines/cine/prc.h
+++ b/engines/cine/prc.h
@@ -31,7 +31,7 @@ namespace Cine {
 extern ScriptList globalScripts;
 extern ScriptList objectScripts;
 
-void loadPrc(const char *pPrcName);
+bool loadPrc(const char *pPrcName);
 
 } // End of namespace Cine
 
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 148e673095..54a4976000 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -1019,6 +1019,20 @@ int FWScript::o1_divVar() {
 }
 
 int FWScript::o1_compareVar() {
+	// WORKAROUND: A workaround for a script bug in script file CODE2.PRC
+	// in at least some of the Amiga and Atari ST versions of Future Wars.
+	// Fixes bug #2016647 (FW: crash with italian amiga version). A local
+	// variable 251 is compared against value 0 although it's quite apparent
+	// from the context in the script that instead global variable 251 should
+	// be compared against value 0. So looks like someone made a typo when
+	// making the scripts. Therefore we change that particular comparison
+	// from using the local variable 251 to using the global variable 251.
+	if (g_cine->getGameType() == Cine::GType_FW && scumm_stricmp(currentPrcName, "CODE2.PRC") == 0 &&
+		(g_cine->getPlatform() == Common::kPlatformAmiga || g_cine->getPlatform() == Common::kPlatformAtariST) &&
+		_script.getByte(_pos) == 251 && _script.getByte(_pos + 1) == 0 && _script.getWord(_pos + 2) == 0) {
+		return o1_compareGlobalVar();
+	}
+
 	byte varIdx = getNextByte();
 	byte varType = getNextByte();
 
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 4b5d4efe13..69851aeff2 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -1518,12 +1518,22 @@ void mainLoopSub6(void) {
 
 void checkForPendingDataLoad(void) {
 	if (newPrcName[0] != 0) {
-		loadPrc(newPrcName);
+		bool loadPrcOk = loadPrc(newPrcName);
 
 		strcpy(currentPrcName, newPrcName);
 		strcpy(newPrcName, "");
 
-		addScriptToList0(1);
+		// Check that the loading of the script file was successful before
+		// trying to add script 1 from it to the global scripts list. This
+		// fixes a crash when failing copy protection in Amiga or Atari ST
+		// versions of Future Wars.
+		if (loadPrcOk) {
+			addScriptToList0(1);
+		} else if (scumm_stricmp(currentPrcName, COPY_PROT_FAIL_PRC_NAME)) {
+			// We only show an error here for other files than the file that
+			// is loaded if copy protection fails (i.e. L201.ANI).
+			warning("checkForPendingDataLoad: loadPrc(%s) failed", currentPrcName);
+		}
 	}
 
 	if (newRelName[0] != 0) {
-- 
cgit v1.2.3


From 551f6d71c3821fac0f9245ed667c8547e05d6778 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Tue, 15 Jul 2008 10:59:58 +0000
Subject: Made frame unpacking buffer dynamic (this frees some BSS space).

svn-id: r33072
---
 engines/parallaction/gfxbase.cpp  |  3 ---
 engines/parallaction/graphics.cpp | 10 ++++++++++
 engines/parallaction/graphics.h   |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index 9e7eb12ed8..e8250ac8fd 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -267,9 +267,6 @@ void Gfx::drawWrappedText(Font *font, Graphics::Surface* surf, char *text, byte
 }
 
 
-// this is the maximum size of an unpacked frame in BRA
-byte _unpackedBitmap[640*401];
-
 #if 0
 void Gfx::unpackBlt(const Common::Rect& r, byte *data, uint size, Graphics::Surface *surf, uint16 z, byte transparentColor) {
 
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 32d0e303eb..9b9ea8605a 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -33,6 +33,11 @@
 
 namespace Parallaction {
 
+// this is the size of the receiving buffer for unpacked frames,
+// since BRA uses some insanely big animations.
+#define MAXIMUM_UNPACKED_BITMAP_SIZE	640*401
+
+
 void Gfx::registerVar(const Common::String &name, int32 initialValue) {
 	if (_vars.contains(name)) {
 		warning("Variable '%s' already registered, ignoring initial value.\n", name.c_str());
@@ -752,6 +757,9 @@ Gfx::Gfx(Parallaction* vm) :
 	_halfbrite = false;
 	_hbCircleRadius = 0;
 
+	_unpackedBitmap = new byte[MAXIMUM_UNPACKED_BITMAP_SIZE];
+	assert(_unpackedBitmap);
+
 	registerVar("background_mode", 1);
 	_varBackgroundMode = 1;
 
@@ -769,6 +777,8 @@ Gfx::~Gfx() {
 	freeBackground();
 	freeLabels();
 
+	delete []_unpackedBitmap;
+
 	return;
 }
 
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 09f4b2f244..a7242ba6f4 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -547,6 +547,8 @@ public:
 	uint				_screenX;		// scrolling position
 	uint				_screenY;
 
+	byte				*_unpackedBitmap;
+
 protected:
 	Parallaction*		_vm;
 	bool				_halfbrite;
-- 
cgit v1.2.3


From 2bae0df17e2c2a77295b13b107b208e63147638d Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Tue, 15 Jul 2008 20:26:12 +0000
Subject: fix bug #1995042: stop previous sfx playback when starting a new sfx
 (matches original dos code). Also removed the "sound skipping" hack in final
 bam scene.

svn-id: r33078
---
 engines/queen/graphics.cpp | 11 ++---------
 engines/queen/graphics.h   |  4 ----
 engines/queen/sound.cpp    | 13 +++++++------
 engines/queen/sound.h      |  1 -
 4 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp
index f863f7663c..6d0a11ccfe 100644
--- a/engines/queen/graphics.cpp
+++ b/engines/queen/graphics.cpp
@@ -1175,15 +1175,8 @@ BamScene::BamScene(QueenEngine *vm)
 }
 
 void BamScene::playSfx() {
-	// Don't try to play all the sounds. This is only necessary for the
-	// fight bam, in which the number of 'sfx bam frames' is too much
-	// important / too much closer. The original game does not have
-	// this problem since its playSfx() function returns immediately
-	// if a sound is already being played.
-	if (_lastSoundIndex == 0 || _index - _lastSoundIndex >= SFX_SKIP) {
-		_vm->sound()->playSfx(_vm->logic()->currentRoomSfx());
-		_lastSoundIndex = _index;
-	}
+	_vm->sound()->playSfx(_vm->logic()->currentRoomSfx());
+	_lastSoundIndex = _index;
 }
 
 void BamScene::prepareAnimation() {
diff --git a/engines/queen/graphics.h b/engines/queen/graphics.h
index 6f00111635..7eadf9a191 100644
--- a/engines/queen/graphics.h
+++ b/engines/queen/graphics.h
@@ -248,10 +248,6 @@ public:
 		F_REQ_STOP = 2
 	};
 
-	enum {
-		SFX_SKIP = 8
-	};
-
 	uint16 _flag, _index;
 
 private:
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index d70fe7209d..3672eecce8 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -229,11 +229,6 @@ void PCSound::setVolume(int vol) {
 	_music->setVolume(vol);
 }
 
-void PCSound::waitFinished(bool isSpeech) {
-	while (_mixer->isSoundHandleActive(isSpeech ? _speechHandle : _sfxHandle))
-		_vm->input()->delay(10);
-}
-
 void PCSound::playSound(const char *base, bool isSpeech) {
 	char name[13];
 	strcpy(name, base);
@@ -243,7 +238,13 @@ void PCSound::playSound(const char *base, bool isSpeech) {
 			name[i] = '0';
 	}
 	strcat(name, ".SB");
-	waitFinished(isSpeech);
+	if (isSpeech) {
+		while (_mixer->isSoundHandleActive(_speechHandle)) {
+			_vm->input()->delay(10);
+		}
+	} else {
+		_mixer->stopHandle(_sfxHandle);
+	}
 	uint32 size;
 	Common::File *f = _vm->resource()->findSound(name, &size);
 	if (f) {
diff --git a/engines/queen/sound.h b/engines/queen/sound.h
index c2c1481cc6..331034f746 100644
--- a/engines/queen/sound.h
+++ b/engines/queen/sound.h
@@ -143,7 +143,6 @@ public:
 	void setVolume(int vol);
 
 protected:
-	void waitFinished(bool isSpeech);
 	void playSound(const char *base, bool isSpeech);
 
 	virtual void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) = 0;
-- 
cgit v1.2.3


From cdade7eff3e481ef7aca404ca13138cccd920365 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Tue, 15 Jul 2008 20:31:11 +0000
Subject: fix bug #1876741: changed .SB playback rate to 11840Hz (matches dos
 game)

svn-id: r33079
---
 engines/queen/sound.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 3672eecce8..f4e0116cf1 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -256,6 +256,8 @@ void PCSound::playSound(const char *base, bool isSpeech) {
 }
 
 void SBSound::playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
+	// In order to simplify the code, we don't parse the .sb header but hard-code the
+	// values. Refer to tracker item #1876741 for details on the format/fields.
 	int headerSize;
 	f->seek(2, SEEK_CUR);
 	uint16 version = f->readUint16LE();
@@ -277,7 +279,7 @@ void SBSound::playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *so
 	if (sound) {
 		f->read(sound, size);
 		byte flags = Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE;
-		_mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags);
+		_mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11840, flags);
 	}
 }
 
-- 
cgit v1.2.3


From bd17a600dcf86255be4e5d7d359b190e4b1351b1 Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Wed, 16 Jul 2008 09:08:44 +0000
Subject: Split the drawVertImage function in the agos engine to make it
 clearer and easier to profile

svn-id: r33083
---
 engines/agos/agos.h  |   2 +
 engines/agos/gfx.cpp | 103 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 59 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 74a0b026e9..8ad5487b35 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1075,6 +1075,8 @@ protected:
 	virtual void drawImage(VC10_state *state);
 	void drawBackGroundImage(VC10_state *state);
 	void drawVertImage(VC10_state *state);
+	void drawVertImageCompressed(VC10_state *state);
+	void drawVertImageUncompressed(VC10_state *state);
 
 	void setMoveRect(uint16 x, uint16 y, uint16 width, uint16 height);
 
diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 2d7d6641dc..6e91c5d94c 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -771,63 +771,74 @@ void AGOSEngine::drawBackGroundImage(VC10_state *state) {
 
 void AGOSEngine::drawVertImage(VC10_state *state) {
 	if (state->flags & kDFCompressed) {
-		uint w, h;
-		byte *src, *dst, *dstPtr;
+		drawVertImageCompressed(state);
+	} else {
+		drawVertImageUncompressed(state);
+	}
+}
 
-		state->x_skip *= 4;				/* reached */
+void AGOSEngine::drawVertImageUncompressed(VC10_state *state) {
+	assert ((state->flags & kDFCompressed) == 0) ;
 
-		state->dl = state->width;
-		state->dh = state->height;
+	const byte *src;
+	byte *dst;
+	uint count;
 
-		vc10_skip_cols(state);
+	src = state->srcPtr + (state->width * state->y_skip) * 8;
+	dst = state->surf_addr;
+	state->x_skip *= 4;
 
-		dstPtr = state->surf_addr;
-		if (!(state->flags & kDFNonTrans) && (state->flags & 0x40)) { /* reached */
-			dstPtr += vcReadVar(252);
-		}
-		w = 0;
-		do {
+	do {
+		for (count = 0; count != state->draw_width; count++) {
 			byte color;
+			color = (src[count + state->x_skip] / 16) + state->paletteMod;
+			if ((state->flags & kDFNonTrans) || color)
+				dst[count * 2] = color | state->palette;
+			color = (src[count + state->x_skip] & 15) + state->paletteMod;
+			if ((state->flags & kDFNonTrans) || color)
+				dst[count * 2 + 1] = color | state->palette;
+		}
+		dst += state->surf_pitch;
+		src += state->width * 8;
+	} while (--state->draw_height);
+}
 
-			src = vc10_depackColumn(state);
-			dst = dstPtr;
+void AGOSEngine::drawVertImageCompressed(VC10_state *state) {
+	assert (state->flags & kDFCompressed) ;
+	uint w, h;
+	byte *src, *dst, *dstPtr;
 
-			h = 0;
-			do {
-				color = (*src / 16);
-				if ((state->flags & kDFNonTrans) || color != 0)
-					dst[0] = color | state->palette;
-				color = (*src & 15);
-				if ((state->flags & kDFNonTrans) || color != 0)
-					dst[1] = color | state->palette;
-				dst += state->surf_pitch;
-				src++;
-			} while (++h != state->draw_height);
-			dstPtr += 2;
-		} while (++w != state->draw_width);
-	} else {
-		const byte *src;
-		byte *dst;
-		uint count;
+	state->x_skip *= 4;				/* reached */
 
-		src = state->srcPtr + (state->width * state->y_skip) * 8;
-		dst = state->surf_addr;
-		state->x_skip *= 4;
+	state->dl = state->width;
+	state->dh = state->height;
+
+	vc10_skip_cols(state);
 
+	dstPtr = state->surf_addr;
+	if (!(state->flags & kDFNonTrans) && (state->flags & 0x40)) { /* reached */
+		dstPtr += vcReadVar(252);
+	}
+	w = 0;
+	do {
+		byte color;
+
+		src = vc10_depackColumn(state);
+		dst = dstPtr;
+
+		h = 0;
 		do {
-			for (count = 0; count != state->draw_width; count++) {
-				byte color;
-				color = (src[count + state->x_skip] / 16) + state->paletteMod;
-				if ((state->flags & kDFNonTrans) || color)
-					dst[count * 2] = color | state->palette;
-				color = (src[count + state->x_skip] & 15) + state->paletteMod;
-				if ((state->flags & kDFNonTrans) || color)
-					dst[count * 2 + 1] = color | state->palette;
-			}
+			color = (*src / 16);
+			if ((state->flags & kDFNonTrans) || color != 0)
+				dst[0] = color | state->palette;
+			color = (*src & 15);
+			if ((state->flags & kDFNonTrans) || color != 0)
+				dst[1] = color | state->palette;
 			dst += state->surf_pitch;
-			src += state->width * 8;
-		} while (--state->draw_height);
-	}
+			src++;
+		} while (++h != state->draw_height);
+		dstPtr += 2;
+	} while (++w != state->draw_width);
 }
 
 void AGOSEngine::drawImage(VC10_state *state) {
-- 
cgit v1.2.3


From 17d86414cb5d7c2b4c5159b5b5d1b2330fa8eb83 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Thu, 17 Jul 2008 00:38:11 +0000
Subject: Fixed regression bug in dialogue, which de-facto allowed user to skip
 in-game protection.

svn-id: r33086
---
 engines/parallaction/dialogue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 6e91dd8a88..6d9dfa5e10 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -166,7 +166,7 @@ bool DialogueManager::displayAnswer(uint16 i) {
 		assert(id >= 0);
 		_visAnswers[id] = i;
 
-		_askPassword = (strstr(a->_text, "%p") != NULL);
+		_askPassword = (strstr(a->_text, "%P") != NULL);
 		_numVisAnswers++;
 
 		return true;
-- 
cgit v1.2.3


From 67bef188d3977478c7d57b4016885c9293642cd2 Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Thu, 17 Jul 2008 07:13:41 +0000
Subject: Patch #2019455: Patch for reducing the BSS size of Cine engine.

svn-id: r33087
---
 engines/cine/cine.h    |  1 +
 engines/cine/gfx.cpp   |  4 ++--
 engines/cine/texte.cpp | 10 ++++------
 engines/cine/texte.h   |  5 ++++-
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 7568d8310e..06f2dfd982 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -94,6 +94,7 @@ public:
 
 	Common::StringList _volumeResourceFiles;
 	StringPtrHashMap _volumeEntriesMap;
+	TextHandler _textHandler;
 
 private:
 	void initialize(void);
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 2b7f3b8890..1f868ccb75 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -337,7 +337,7 @@ int FWRenderer::drawChar(char character, int x, int y) {
 		x += 5;
 	} else if ((width = fontParamTable[(unsigned char)character].characterWidth)) {
 		idx = fontParamTable[(unsigned char)character].characterIdx;
-		drawSpriteRaw(textTable[idx][0], textTable[idx][1], 16, 8, _backBuffer, x, y);
+		drawSpriteRaw(g_cine->_textHandler.textTable[idx][0], g_cine->_textHandler.textTable[idx][1], 16, 8, _backBuffer, x, y);
 		x += width + 1;
 	}
 
@@ -938,7 +938,7 @@ int OSRenderer::drawChar(char character, int x, int y) {
 		x += 5;
 	} else if ((width = fontParamTable[(unsigned char)character].characterWidth)) {
 		idx = fontParamTable[(unsigned char)character].characterIdx;
-		drawSpriteRaw2(textTable[idx][0], 0, 16, 8, _backBuffer, x, y);
+		drawSpriteRaw2(g_cine->_textHandler.textTable[idx][0], 0, 16, 8, _backBuffer, x, y);
 		x += width + 1;
 	}
 
diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp
index 9b4b83f420..e4fd334926 100644
--- a/engines/cine/texte.cpp
+++ b/engines/cine/texte.cpp
@@ -31,8 +31,6 @@ namespace Cine {
 
 byte *textDataPtr;
 
-byte textTable[256][2][16 * 8];
-
 const char **failureMessages;
 const CommandeType *defaultActionCommand;
 const CommandeType *systemMenu;
@@ -77,14 +75,14 @@ void loadTextData(const char *pFileName, byte *pDestinationBuffer) {
 		loadRelatedPalette(pFileName);
 
 		for (i = 0; i < numCharacters; i++) {
-			gfxConvertSpriteToRaw(textTable[i][0], tempBuffer, 16, 8);
-			generateMask(textTable[i][0], textTable[i][1], 16 * 8, 0);
+			gfxConvertSpriteToRaw(g_cine->_textHandler.textTable[i][0], tempBuffer, 16, 8);
+			generateMask(g_cine->_textHandler.textTable[i][0], g_cine->_textHandler.textTable[i][1], 16 * 8, 0);
 			tempBuffer += dataSize;
 		}
 	} else {
 		for (i = 0; i < 90; i++) {
-			gfxConvertSpriteToRaw(textTable[i][0], tempBuffer, 8, 8);
-			generateMask(textTable[i][0], textTable[i][1], 8 * 8, 0);
+			gfxConvertSpriteToRaw(g_cine->_textHandler.textTable[i][0], tempBuffer, 8, 8);
+			generateMask(g_cine->_textHandler.textTable[i][0], g_cine->_textHandler.textTable[i][1], 8 * 8, 0);
 			tempBuffer += 0x40;
 		}
 	}
diff --git a/engines/cine/texte.h b/engines/cine/texte.h
index ae82832aea..f471c3c49e 100644
--- a/engines/cine/texte.h
+++ b/engines/cine/texte.h
@@ -34,7 +34,10 @@ namespace Cine {
 typedef char CommandeType[20];
 
 extern byte *textDataPtr;
-extern byte textTable[256][2][16 * 8];
+
+struct TextHandler {
+	byte textTable[256][2][16 * 8];
+};
 
 extern const char **failureMessages;
 extern const CommandeType *defaultActionCommand;
-- 
cgit v1.2.3


From 702e26965c48e99490c25ca635e41c14ac88add2 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 18 Jul 2008 04:16:00 +0000
Subject: Don't crash if you try to use music file #2 as music file #1. When
 the music wasn't found, it would close the file even if something else was
 already playing from it. (Some music is in both files.)

svn-id: r33094
---
 engines/sword2/music.cpp | 21 ++++++++++++++-------
 engines/sword2/sound.h   |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index fd72ba8d52..3b5a09578b 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -52,9 +52,11 @@ namespace Sword2 {
 static Audio::AudioStream *makeCLUStream(Common::File *fp, int size);
 
 static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd, uint32 id, uint32 *numSamples) {
-	debug(3, "Playing %s from CD %d", base, cd);
+	bool alreadyOpen;
 
 	if (!fh->file.isOpen()) {
+		alreadyOpen = false;
+
 		struct {
 			const char *ext;
 			int mode;
@@ -75,16 +77,14 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 		char filename[20];
 
 		for (int i = 0; i < ARRAYSIZE(file_types); i++) {
-			Common::File f;
-
 			sprintf(filename, "%s%d.%s", base, cd, file_types[i].ext);
-			if (f.open(filename)) {
+			if (Common::File::exists(filename)) {
 				soundMode = file_types[i].mode;
 				break;
 			}
 
 			sprintf(filename, "%s.%s", base, file_types[i].ext);
-			if (f.open(filename)) {
+			if (Common::File::exists(filename)) {
 				soundMode = file_types[i].mode;
 				break;
 			}
@@ -105,7 +105,8 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 				fh->idxTab = NULL;
 			}
 		}
-	}
+	} else
+		alreadyOpen = true;
 
 	uint32 entrySize = (fh->fileType == kCLUMode) ? 2 : 3;
 
@@ -134,7 +135,13 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 		*numSamples = len;
 
 	if (!pos || !len) {
-		fh->file.close();
+		// We couldn't find the sound. Possibly as a result of a bad
+		// installation (e.g. using the music file from CD 2 as the
+		// first music file). Don't close the file if it was already
+		// open though, because something is playing from it.
+		warning("getAudioStream: Could not find %s ID %d! Possibly the wrong file", base, id);
+		if (!alreadyOpen)
+			fh->file.close();
 		return NULL;
 	}
 
diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h
index 70bae6f851..b89ef8f12b 100644
--- a/engines/sword2/sound.h
+++ b/engines/sword2/sound.h
@@ -106,7 +106,7 @@ private:
 	void refill();
 
 	inline bool eosIntern() const {
-		return _pos >= _bufferEnd;
+		return !_file->isOpen() || _pos >= _bufferEnd;
 	}
 
 public:
-- 
cgit v1.2.3


From 8757326b5f2b464ddc6cc2b523f573c31a191ad3 Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Fri, 18 Jul 2008 14:01:53 +0000
Subject: Added savefile position comments to savegame loading routine (Helpful
 for debugging the formats).

svn-id: r33096
---
 engines/cine/various.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'engines')

diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 69851aeff2..ab2fa645c7 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -466,17 +466,26 @@ bool CineEngine::makeLoad(char *saveName) {
 
 	broken = brokenSave(*fHandle);
 
+	// At savefile position 0x0000:
 	currentDisk = fHandle->readUint16BE();
 
+	// At 0x0002:
 	fHandle->read(currentPartName, 13);
+	// At 0x000F:
 	fHandle->read(currentDatName, 13);
 
+	// At 0x001C:
 	saveVar2 = fHandle->readSint16BE();
 
+	// At 0x001E:
 	fHandle->read(currentPrcName, 13);
+	// At 0x002B:
 	fHandle->read(currentRelName, 13);
+	// At 0x0038:
 	fHandle->read(currentMsgName, 13);
+	// At 0x0045:
 	fHandle->read(bgName, 13);
+	// At 0x0052:
 	fHandle->read(currentCtName, 13);
 
 	checkDataDisk(currentDisk);
@@ -501,52 +510,84 @@ bool CineEngine::makeLoad(char *saveName) {
 		loadCtFW(currentCtName);
 	}
 
+	// At 0x005F:
 	fHandle->readUint16BE();
+	// At 0x0061:
 	fHandle->readUint16BE();
 
+	// At 0x0063:
 	for (i = 0; i < 255; i++) {
+		// At 0x0063 + i * 32 + 0:
 		objectTable[i].x = fHandle->readSint16BE();
+		// At 0x0063 + i * 32 + 2:
 		objectTable[i].y = fHandle->readSint16BE();
+		// At 0x0063 + i * 32 + 4:
 		objectTable[i].mask = fHandle->readUint16BE();
+		// At 0x0063 + i * 32 + 6:
 		objectTable[i].frame = fHandle->readSint16BE();
+		// At 0x0063 + i * 32 + 8:
 		objectTable[i].costume = fHandle->readSint16BE();
+		// At 0x0063 + i * 32 + 10:
 		fHandle->read(objectTable[i].name, 20);
+		// At 0x0063 + i * 32 + 30:
 		objectTable[i].part = fHandle->readUint16BE();
 	}
 
+	// At 0x2043 (i.e. 0x0063 + 255 * 32):
 	renderer->restorePalette(*fHandle);
 
+	// At 0x2083 (i.e. 0x2043 + 16 * 2 * 2):
 	globalVars.load(*fHandle, NUM_MAX_VAR - 1);
 
+	// At 0x2281 (i.e. 0x2083 + 255 * 2):
 	for (i = 0; i < 16; i++) {
+		// At 0x2281 + i * 2:
 		zoneData[i] = fHandle->readUint16BE();
 	}
 
+	// At 0x22A1 (i.e. 0x2281 + 16 * 2):
 	for (i = 0; i < 4; i++) {
+		// At 0x22A1 + i * 2:
 		commandVar3[i] = fHandle->readUint16BE();
 	}
 
+	// At 0x22A9 (i.e. 0x22A1 + 4 * 2):
 	fHandle->read(commandBuffer, 0x50);
 	renderer->setCommand(commandBuffer);
 
+	// At 0x22F9 (i.e. 0x22A9 + 0x50):
 	renderer->_cmdY = fHandle->readUint16BE();
 
+	// At 0x22FB:
 	bgVar0 = fHandle->readUint16BE();
+	// At 0x22FD:
 	allowPlayerInput = fHandle->readUint16BE();
+	// At 0x22FF:
 	playerCommand = fHandle->readSint16BE();
+	// At 0x2301:
 	commandVar1 = fHandle->readSint16BE();
+	// At 0x2303:
 	isDrawCommandEnabled = fHandle->readUint16BE();
+	// At 0x2305:
 	var5 = fHandle->readUint16BE();
+	// At 0x2307:
 	var4 = fHandle->readUint16BE();
+	// At 0x2309:
 	var3 = fHandle->readUint16BE();
+	// At 0x230B:
 	var2 = fHandle->readUint16BE();
+	// At 0x230D:
 	commandVar2 = fHandle->readSint16BE();
 
+	// At 0x230F:
 	renderer->_messageBg = fHandle->readUint16BE();
 
+	// At 0x2311:
 	fHandle->readUint16BE();
+	// At 0x2313:
 	fHandle->readUint16BE();
 
+	// At 0x2315:
 	loadResourcesFromSave(*fHandle, broken);
 
 	// TODO: handle screen params (really required ?)
-- 
cgit v1.2.3


From a49a3c6aaa31e3a59c0fa2fec87f82764e6c2bc2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 20 Jul 2008 16:27:12 +0000
Subject: cleanup

svn-id: r33135
---
 engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 1511b9aefc..b18b0ba70f 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -102,10 +102,10 @@ void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, SoundDesc *sound,
 	int32 version = file->readUint32BE();
 	if (version != 3) {
 		if (version == 2) {
-			warning("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version of compressed *.bun file, expected 3, but it's 2.");
-			warning("Suggested to recompress with latest tool from daily builds.");
+			warning("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version of compressed *.bun file, expected 3, but it's 2");
+			warning("Suggested to recompress with latest tool from daily builds");
 		} else
-			error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 3, but it's: %d.", version);
+			error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 3, but it's: %d", version);
 	}
 	sound->bits = file->readUint32BE();
 	sound->freq = file->readUint32BE();
-- 
cgit v1.2.3


From 2354ea80c6ec0da27594fab91b8dc0e1439cff56 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Sun, 20 Jul 2008 18:00:00 +0000
Subject: KYRA: disable incomplete PC-98 audio support for 0.12.0 release (use
 towns audio instead)

svn-id: r33145
---
 engines/kyra/kyra_v1.cpp     | 2 +-
 engines/kyra/sound_towns.cpp | 6 +++---
 engines/kyra/staticres.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 117194aea2..85c03dc1bb 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -114,7 +114,7 @@ int KyraEngine_v1::init() {
 				_sound = new SoundTownsPC98_v2(this, _mixer);
 		} else if (_flags.platform == Common::kPlatformPC98) {
 			if (_flags.gameID == GI_KYRA1)
-				_sound = new SoundPC98(this, _mixer);
+				_sound = new SoundTowns/*SoundPC98*/(this, _mixer);
 			else
 				_sound = new SoundTownsPC98_v2(this, _mixer);
 		} else if (midiDriver == MD_ADLIB) {
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index e96cef735c..0f2b916c9d 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -2363,7 +2363,7 @@ TownsPC98_OpnDriver::TownsPC98_OpnDriver(Audio::Mixer *mixer, OpnType type) :
 	_numSSG(type == OD_TOWNS ? 0 : 3), _hasADPCM(type == OD_TYPE86 ? true : false),
 	_numChan(type == OD_TYPE26 ? 3 : 6), _hasStereo(type == OD_TYPE26 ? false : true) {	
 	setTempo(84);
-	_baserate = (3579545.0 / (double)getRate()) / 144.0;
+	_baserate = (double)getRate() / 10368.0;
 }
 
 TownsPC98_OpnDriver::~TownsPC98_OpnDriver() {
@@ -3095,8 +3095,8 @@ SoundTownsPC98_v2::~SoundTownsPC98_v2() {
 }
 
 bool SoundTownsPC98_v2::init() {
-	_driver = new TownsPC98_OpnDriver(_mixer, _vm->gameFlags().platform == Common::kPlatformPC98 ?
-		TownsPC98_OpnDriver::OD_TYPE86 : TownsPC98_OpnDriver::OD_TOWNS);
+	_driver = new TownsPC98_OpnDriver(_mixer, /*_vm->gameFlags().platform == Common::kPlatformPC98 ?
+		TownsPC98_OpnDriver::OD_TYPE86 :*/ TownsPC98_OpnDriver::OD_TOWNS);
 	_useFmSfx = _vm->gameFlags().platform == Common::kPlatformPC98 ? true : false;
 	_vm->checkCD();
 	// FIXME: While checking for 'track1.XXX(X)' looks like
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 4f577c1d1e..03b832bf79 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1060,7 +1060,7 @@ void KyraEngine_LoK::initStaticResource() {
 	else if (_flags.platform == Common::kPlatformFMTowns)
 		_soundData = soundData_TOWNS;
 	else if (_flags.platform == Common::kPlatformPC98)
-		_soundData = soundData_PC98;
+		_soundData = soundData_TOWNS/*soundData_PC98*/;
 
 }
 
@@ -1286,7 +1286,7 @@ void KyraEngine_HoF::initStaticResource() {
 	else if (_flags.platform == Common::kPlatformFMTowns)
 		_soundData = soundData_TOWNS;
 	else if (_flags.platform == Common::kPlatformPC98)
-		_soundData = soundData_PC98;
+		_soundData = soundData_TOWNS/*soundData_PC98*/;
 
 	// setup sequence data
 	_sequences = _staticres->loadHofSequenceData(k2SeqplaySeqData, tmpSize);
-- 
cgit v1.2.3


From 0b8602f9950dcc6e6f11b719786244094564bb8e Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 20 Jul 2008 19:25:16 +0000
Subject: Commented out some more PC-98 audio stuff, to avoid warnings.

svn-id: r33146
---
 engines/kyra/staticres.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 03b832bf79..c05795dacd 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1034,8 +1034,10 @@ void KyraEngine_LoK::initStaticResource() {
 	}
 
 	// audio data tables
+#if 0
 	static const char *tIntro98[] = { "intro%d.dat" };
 	static const char *tIngame98[] = { "kyram%d.dat" };
+#endif
 
 	static const AudioDataStruct soundData_PC[] = {
 		{ _soundFilesIntro, _soundFilesIntroSize, 0, 0 },
@@ -1049,11 +1051,13 @@ void KyraEngine_LoK::initStaticResource() {
 		{ 0, 0, 0, 0}
 	};
 
+#if 0
 	static const AudioDataStruct soundData_PC98[] = {
 		{ tIntro98, 1, 0, 0 },
 		{ tIngame98, 1, 0, 0 },
 		{ 0, 0, 0, 0}
 	};
+#endif
 
 	if (_flags.platform == Common::kPlatformPC)
 		_soundData = soundData_PC;
@@ -1259,9 +1263,11 @@ void KyraEngine_HoF::initStaticResource() {
 	static const char *fmtMusicFileListFinale[] = { "finale%d.twn" };
 	static const char *fmtMusicFileListIngame[] = { "km%02d.twn" };
 
+#if 0
 	static const char *pc98MusicFileListIntro[] = { "intro%d.86" };
 	static const char *pc98MusicFileListFinale[] = { "finale%d.86" };
 	static const char *pc98MusicFileListIngame[] = { "km%02d.86" };
+#endif
 
 	static const AudioDataStruct soundData_PC[] = {
 		{ _musicFileListIntro, _musicFileListIntroSize, 0, 0 },
@@ -1275,11 +1281,13 @@ void KyraEngine_HoF::initStaticResource() {
 		{ fmtMusicFileListFinale, 1, _cdaTrackTableFinale, _cdaTrackTableFinaleSize >> 1 }
 	};
 
+#if 0
 	static const AudioDataStruct soundData_PC98[] = {
 		{ pc98MusicFileListIntro, 1, 0, 0 },
 		{ pc98MusicFileListIngame, 1, 0, 0 },
 		{ pc98MusicFileListFinale, 1, 0, 0 }		
 	};
+#endif
 
 	if (_flags.platform == Common::kPlatformPC)
 		_soundData = soundData_PC;
-- 
cgit v1.2.3


From 361bed0a9535104611d3e0e88d5b3e1ad788639d Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 21 Jul 2008 06:08:30 +0000
Subject: Massive refactoring of dialogue code, which is now implemented as a
 finite state machine. Related code in other files has been updated has well.

svn-id: r33162
---
 engines/parallaction/dialogue.cpp        | 384 +++++++++++++++++++------------
 engines/parallaction/exec_ns.cpp         |  17 +-
 engines/parallaction/input.cpp           |  11 +
 engines/parallaction/input.h             |   5 +-
 engines/parallaction/parallaction.cpp    |  35 +--
 engines/parallaction/parallaction.h      |  12 +-
 engines/parallaction/parallaction_br.cpp |  12 +-
 7 files changed, 300 insertions(+), 176 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 6d9dfa5e10..290f8cfd4f 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -42,13 +42,23 @@ namespace Parallaction {
 #define ANSWER_CHARACTER_X			10
 #define ANSWER_CHARACTER_Y			80
 
+
 class DialogueManager {
 
+	enum {
+		RUN_QUESTION,
+		RUN_ANSWER,
+		NEXT_QUESTION,
+		NEXT_ANSWER,
+		DIALOGUE_OVER
+	} _state;
+
 	Parallaction	*_vm;
-	SpeakData		*_data;
 	Dialogue		*_dialogue;
 
 	bool			_askPassword;
+	int				_passwordLen;
+	bool			_passwordChanged;
 
 	bool			isNpc;
 	GfxObj			*_questioner;
@@ -59,98 +69,70 @@ class DialogueManager {
 	uint16			_visAnswers[5];
 	int			_numVisAnswers;
 
+	int			_answerId;
+
+	int		_selection, _oldSelection;
+
+	uint32			_mouseButtons;
+	Common::Point	_mousePos;
+	bool			_isKeyDown;
+	uint16			_downKey;
+
+
 public:
-	DialogueManager(Parallaction *vm, SpeakData *data) : _vm(vm), _data(data) {
-		_dialogue = _data->_dialogue;
-		isNpc = scumm_stricmp(_data->_name, "yourself") && _data->_name[0] != '\0';
-		_questioner = isNpc ? _vm->_disk->loadTalk(_data->_name) : _vm->_char._talk;
-		_answerer = _vm->_char._talk;
-	}
+	DialogueManager(Parallaction *vm, ZonePtr z);
+	~DialogueManager();
 
-	~DialogueManager() {
-		if (isNpc) {
-			delete _questioner;
-		}
+	bool isOver() {
+		return _state == DIALOGUE_OVER;
 	}
-
 	void run();
 
+	ZonePtr			_z;
+	CommandList *_cmdList;
+
 protected:
-	void displayQuestion();
+	bool displayQuestion();
 	bool displayAnswers();
 	bool displayAnswer(uint16 i);
 
-	uint16 getAnswer();
-	int16 selectAnswer();
-	uint16 askPassword();
+	int16 selectAnswer1();
+	int16 selectAnswerN();
+	int16 askPassword();
 	int16 getHoverAnswer(int16 x, int16 y);
 
-};
-
-uint16 DialogueManager::askPassword() {
-	debugC(3, kDebugExec, "checkDialoguePassword()");
-
-	uint16 passwordLen = 0;
-	_password[0] = '\0';
-
-	_vm->_balloonMan->setDialogueBalloon(_q->_answers[0]->_text, 1, 3);
-	int id = _vm->_gfx->setItem(_answerer, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y);
-	_vm->_gfx->setItemFrame(id, 0);
-
-	Common::Event e;
-	bool changed = true;	// force first refresh
-
-	while (true) {
-		e.kbd.ascii = 0;
-
-		if (g_system->getEventManager()->pollEvent(e)) {
-			if (e.type == Common::EVENT_QUIT) {
-				_engineFlags |= kEngineQuit;
-				break;
-			}
-
-			if ((e.type == Common::EVENT_KEYDOWN) && isdigit(e.kbd.ascii)) {
-				_password[passwordLen] = e.kbd.ascii;
-				passwordLen++;
-				_password[passwordLen] = '\0';
-				changed = true;
-			}
-		}
-
-		if (changed) {
-			_vm->_balloonMan->setBalloonText(0, _q->_answers[0]->_text, 3);
-			_vm->_gfx->updateScreen();
-			changed = false;
-		}
-
-		if ((passwordLen == MAX_PASSWORD_LENGTH) || (e.kbd.ascii == Common::KEYCODE_RETURN)) {
+	void runQuestion();
+	void runAnswer();
+	void nextQuestion();
+	void nextAnswer();
 
-			if ((!scumm_stricmp(_vm->_char.getBaseName(), _doughName) && !scumm_strnicmp(_password, "1732461", 7)) ||
-			   (!scumm_stricmp(_vm->_char.getBaseName(), _donnaName) && !scumm_strnicmp(_password, "1622", 4)) ||
-			   (!scumm_stricmp(_vm->_char.getBaseName(), _dinoName) && !scumm_strnicmp(_password, "179", 3))) {
+	bool checkPassword();
+	void resetPassword();
+	void accumPassword(uint16 ascii);
+};
 
-				break;
+DialogueManager::DialogueManager(Parallaction *vm, ZonePtr z) : _vm(vm), _z(z) {
+	_dialogue = _z->u.speak->_dialogue;
+	isNpc = scumm_stricmp(_z->u.speak->_name, "yourself") && _z->u.speak->_name[0] != '\0';
+	_questioner = isNpc ? _vm->_disk->loadTalk(_z->u.speak->_name) : _vm->_char._talk;
+	_answerer = _vm->_char._talk;
 
-			} else {
-				passwordLen = 0;
-				_password[0] = '\0';
-				changed = true;
-			}
+	_askPassword = false;
+	_q = _dialogue->_questions[0];
 
-		}
+	_cmdList = 0;
+	_answerId = 0;
 
-		g_system->delayMillis(20);
+	_state = displayQuestion() ? RUN_QUESTION : NEXT_ANSWER;
+}
 
+DialogueManager::~DialogueManager() {
+	if (isNpc) {
+		delete _questioner;
 	}
-
-	_vm->hideDialogueStuff();
-
-	return 0;
-
+	_z = nullZonePtr;
 }
 
-
-
 bool DialogueManager::displayAnswer(uint16 i) {
 
 	Answer *a = _q->_answers[i];
@@ -183,134 +165,242 @@ bool DialogueManager::displayAnswers() {
 		displayAnswer(i);
 	}
 
+	if (_askPassword) {
+		resetPassword();
+//		_vm->_balloonMan->setDialogueBalloon(_q->_answers[0]->_text, 1, 3);
+		int id = _vm->_gfx->setItem(_answerer, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y);
+		_vm->_gfx->setItemFrame(id, 0);
+	} else
+	if (_numVisAnswers == 1) {
+		int id = _vm->_gfx->setItem(_answerer, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y);
+		_vm->_gfx->setItemFrame(id, _q->_answers[0]->_mood & 0xF);
+		_vm->_balloonMan->setBalloonText(0, _q->_answers[_visAnswers[0]]->_text, 0);
+	} else
+	if (_numVisAnswers > 1) {
+		int id = _vm->_gfx->setItem(_answerer, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y);
+		_vm->_gfx->setItemFrame(id, _q->_answers[_visAnswers[0]]->_mood & 0xF);
+		_oldSelection = -1;
+		_selection = 0;
+	}
+
 	return _numVisAnswers > 0;
 }
 
-void DialogueManager::displayQuestion() {
-
-	if (!scumm_stricmp(_q->_text, "NULL")) return;
+bool DialogueManager::displayQuestion() {
+	if (!scumm_stricmp(_q->_text, "NULL")) return false;
 
 	_vm->_balloonMan->setSingleBalloon(_q->_text, QUESTION_BALLOON_X, QUESTION_BALLOON_Y, _q->_mood & 0x10, 0);
 	int id = _vm->_gfx->setItem(_questioner, QUESTION_CHARACTER_X, QUESTION_CHARACTER_Y);
 	_vm->_gfx->setItemFrame(id, _q->_mood & 0xF);
 
-	_vm->_gfx->updateScreen();
-	_vm->_input->waitUntilLeftClick();
-	_vm->hideDialogueStuff();
-
-	return;
+	return true;
 }
 
-uint16 DialogueManager::getAnswer() {
 
-	uint16 answer = 0;
+bool DialogueManager::checkPassword() {
+	return ((!scumm_stricmp(_vm->_char.getBaseName(), _doughName) && !scumm_strnicmp(_password, "1732461", 7)) ||
+		   (!scumm_stricmp(_vm->_char.getBaseName(), _donnaName) && !scumm_strnicmp(_password, "1622", 4)) ||
+		   (!scumm_stricmp(_vm->_char.getBaseName(), _dinoName) && !scumm_strnicmp(_password, "179", 3)));
+}
 
-	if (_askPassword == false) {
-		answer = selectAnswer();
-	} else {
-		answer = askPassword();
-	}
+void DialogueManager::resetPassword() {
+	_passwordLen = 0;
+	_password[0] = '\0';
+	_passwordChanged = true;
+}
 
-	debugC(3, kDebugExec, "runDialogue: user selected answer #%i", answer);
+void DialogueManager::accumPassword(uint16 ascii) {
+	if (!isdigit(ascii)) {
+		return;
+	}
 
-	return answer;
+	_password[_passwordLen] = ascii;
+	_passwordLen++;
+	_password[_passwordLen] = '\0';
+	_passwordChanged = true;
 }
 
-void DialogueManager::run() {
+int16 DialogueManager::askPassword() {
 
-	_askPassword = false;
-	CommandList *cmdlist = NULL;
+	if (_isKeyDown) {
+		accumPassword(_downKey);
+	}
 
-	_q = _dialogue->_questions[0];
-	int16 answer;
+	if (_passwordChanged) {
+		_vm->_balloonMan->setBalloonText(0, _q->_answers[0]->_text, 3);
+		_passwordChanged = false;
+	}
 
-	while (_q) {
+	if ((_passwordLen == MAX_PASSWORD_LENGTH) || ((_isKeyDown) && (_downKey == Common::KEYCODE_RETURN))) {
+		if (checkPassword()) {
+			return 0;
+		} else {
+			resetPassword();
+		}
+	}
 
-		answer = 0;
+	return -1;
+}
 
-		displayQuestion();
+int16 DialogueManager::selectAnswer1() {
 
-		if (_engineFlags & kEngineQuit)
-			return;
+	if (_mouseButtons == kMouseLeftUp) {
+		return 0;
+	}
 
-		if (_q->_answers[0] == NULL) break;
+	return -1;
+}
 
-		if (scumm_stricmp(_q->_answers[0]->_text, "NULL")) {
-			if (!displayAnswers()) break;
-			answer = getAnswer();
+int16 DialogueManager::selectAnswerN() {
 
-			if (_engineFlags & kEngineQuit)
-				return;
+	_selection = _vm->_balloonMan->hitTestDialogueBalloon(_mousePos.x, _mousePos.y);
 
-			cmdlist = &_q->_answers[answer]->_commands;
+	if (_selection != _oldSelection) {
+		if (_oldSelection != -1) {
+			_vm->_balloonMan->setBalloonText(_oldSelection, _q->_answers[_visAnswers[_oldSelection]]->_text, 3);
 		}
 
-		_q = _q->_answers[answer]->_following._question;
+		if (_selection != -1) {
+			_vm->_balloonMan->setBalloonText(_selection, _q->_answers[_visAnswers[_selection]]->_text, 0);
+			_vm->_gfx->setItemFrame(0, _q->_answers[_visAnswers[_selection]]->_mood & 0xF);
+		}
 	}
 
-	if (cmdlist)
-		_vm->_cmdExec->run(*cmdlist);
+	_oldSelection = _selection;
+
+	if ((_mouseButtons == kMouseLeftUp) && (_selection != -1)) {
+		return _visAnswers[_selection];
+	}
 
+	return -1;
 }
 
-int16 DialogueManager::selectAnswer() {
+void DialogueManager::runQuestion() {
+	debugC(9, kDebugDialogue, "runQuestion\n");
 
-	int16 numAvailableAnswers = _numVisAnswers;
+	if (_mouseButtons == kMouseLeftUp) {
+		_vm->hideDialogueStuff();
+		_state = NEXT_ANSWER;
+	}
+
+}
+
+
+void DialogueManager::nextAnswer() {
+	debugC(9, kDebugDialogue, "nextAnswer\n");
 
-	int id = _vm->_gfx->setItem(_answerer, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y);
-	_vm->_gfx->setItemFrame(id, _q->_answers[0]->_mood & 0xF);
+	if (_q->_answers[0] == NULL) {
+		_state = DIALOGUE_OVER;
+		return;
+	}
+
+	if (!scumm_stricmp(_q->_answers[0]->_text, "NULL")) {
+		_answerId = 0;
+		_state = NEXT_QUESTION;
+		return;
+	}
+
+	_state = displayAnswers() ? RUN_ANSWER : DIALOGUE_OVER;
+}
 
-	if (numAvailableAnswers == 1) {
-		_vm->_balloonMan->setBalloonText(0, _q->_answers[0]->_text, 0);
-		_vm->_input->waitUntilLeftClick();
+void DialogueManager::runAnswer() {
+	debugC(9, kDebugDialogue, "runAnswer\n");
+
+	if (_askPassword) {
+		_answerId = askPassword();
+	} else
+	if (_numVisAnswers == 1) {
+		_answerId = selectAnswer1();
+	} else {
+		_answerId = selectAnswerN();
+	}
+
+	if (_answerId != -1) {
+		_cmdList = &_q->_answers[_answerId]->_commands;
 		_vm->hideDialogueStuff();
-		return 0;
+		_state = NEXT_QUESTION;
 	}
+}
 
-	int oldSelection = -1;
-	int selection = 0;
+void DialogueManager::nextQuestion() {
+	debugC(9, kDebugDialogue, "nextQuestion\n");
 
-	uint32 event;
-	Common::Point p;
-	while ((_engineFlags & kEngineQuit) == 0) {
+	_q = _q->_answers[_answerId]->_following._question;
+	if (_q == 0) {
+		_state = DIALOGUE_OVER;
+	} else {
+		_state = displayQuestion() ? RUN_QUESTION : NEXT_ANSWER;
+	}
+}
 
-		_vm->_input->readInput();
-		_vm->_input->getCursorPos(p);
-		event = _vm->_input->getLastButtonEvent();
-		selection = _vm->_balloonMan->hitTestDialogueBalloon(p.x, p.y);
 
-		if (selection != oldSelection) {
-			if (oldSelection != -1) {
-				_vm->_balloonMan->setBalloonText(oldSelection, _q->_answers[_visAnswers[oldSelection]]->_text, 3);
-			}
+void DialogueManager::run() {
 
-			if (selection != -1) {
-				_vm->_balloonMan->setBalloonText(selection, _q->_answers[_visAnswers[selection]]->_text, 0);
-				_vm->_gfx->setItemFrame(0, _q->_answers[_visAnswers[selection]]->_mood & 0xF);
-			}
-		}
+	// cache event data
+	_mouseButtons = _vm->_input->getLastButtonEvent();
+	_vm->_input->getCursorPos(_mousePos);
+	_isKeyDown = _vm->_input->getLastKeyDown(_downKey);
 
-		if ((selection != -1) && (event == kMouseLeftUp)) {
-			break;
+	switch (_state) {
+	case RUN_QUESTION:
+		runQuestion();
+		break;
+
+	case NEXT_ANSWER:
+		nextAnswer();
+		break;
+
+	case NEXT_QUESTION:
+		nextQuestion();
+		break;
+
+	case RUN_ANSWER:
+		runAnswer();
+		break;
+
+	case DIALOGUE_OVER:
+		if (_cmdList) {
+			_vm->_cmdExec->run(*_cmdList);
 		}
+		break;
 
-		_vm->_gfx->updateScreen();
-		g_system->delayMillis(20);
+	default:
+		error("unknown state in DialogueManager");
 
-		oldSelection = selection;
 	}
 
-	_vm->hideDialogueStuff();
+}
 
-	return _visAnswers[selection];
+void Parallaction::enterDialogueMode(ZonePtr z) {
+	debugC(1, kDebugDialogue, "Parallaction::enterDialogueMode(%s)", z->u.speak->_name);
+	_dialogueMan = new DialogueManager(this, z);
+	_input->_inputMode = Input::kInputModeDialogue;
 }
 
+void Parallaction::exitDialogueMode() {
+	debugC(1, kDebugDialogue, "Parallaction::exitDialogueMode()");
+	_input->_inputMode = Input::kInputModeGame;
 
-void Parallaction::runDialogue(SpeakData *data) {
-	debugC(1, kDebugExec, "runDialogue: starting dialogue '%s'", data->_name);
+	// The current instance of _dialogueMan must be destroyed before the zone commands
+	// are executed, because they may create another instance of _dialogueMan that
+	// overwrite the current one. This would cause headaches (and it did, actually).
+	ZonePtr z = _dialogueMan->_z;
+	delete _dialogueMan;
+	_dialogueMan = 0;
 
-	DialogueManager man(this, data);
-	man.run();
+	_cmdExec->run(z->_commands, z);
+}
+
+void Parallaction::runDialogueFrame() {
+	if (_input->_inputMode != Input::kInputModeDialogue) {
+		return;
+	}
+
+	_dialogueMan->run();
+
+	if (_dialogueMan->isOver()) {
+		exitDialogueMode();
+	}
 
 	return;
 }
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index d1cfb14557..9cde27a853 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -224,7 +224,11 @@ DECLARE_COMMAND_OPCODE(start) {
 
 
 DECLARE_COMMAND_OPCODE(speak) {
-	_vm->_activeZone = _ctxt.cmd->u._zone;
+	if ((_ctxt.cmd->u._zone->_type & 0xFFFF) == kZoneSpeak) {
+		_vm->enterDialogueMode(_ctxt.cmd->u._zone);
+	} else {
+		_vm->_activeZone = _ctxt.cmd->u._zone;
+	}
 }
 
 
@@ -321,6 +325,7 @@ DECLARE_COMMAND_OPCODE(stop) {
 
 
 void Parallaction_ns::drawAnimations() {
+	debugC(9, kDebugExec, "Parallaction_ns::drawAnimations()\n");
 
 	uint16 layer = 0;
 
@@ -361,6 +366,8 @@ void Parallaction_ns::drawAnimations() {
 		}
 	}
 
+	debugC(9, kDebugExec, "Parallaction_ns::drawAnimations done()\n");
+
 	return;
 }
 
@@ -416,7 +423,6 @@ label1:
 	return;
 }
 
-
 void CommandExec::run(CommandList& list, ZonePtr z) {
 	if (list.size() == 0) {
 		debugC(3, kDebugExec, "runCommands: nothing to do");
@@ -537,11 +543,8 @@ uint16 Parallaction::runZone(ZonePtr z) {
 		break;
 
 	case kZoneSpeak:
-		runDialogue(z->u.speak);
-		if (_engineFlags & kEngineQuit)
-			return 0;
-		break;
-
+		enterDialogueMode(z);
+		return 0;
 	}
 
 	debugC(3, kDebugExec, "runZone completed");
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index 3797158661..4d0b7085c2 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -42,12 +42,14 @@ uint16 Input::readInput() {
 	uint16 KeyDown = 0;
 
 	_mouseButtons = kMouseNone;
+	_lastKeyDownAscii = -1;
 
 	Common::EventManager *eventMan = _vm->_system->getEventManager();
 	while (eventMan->pollEvent(e)) {
 
 		switch (e.type) {
 		case Common::EVENT_KEYDOWN:
+			_lastKeyDownAscii = e.kbd.ascii;
 			if (e.kbd.flags == Common::KBD_CTRL && e.kbd.keycode == 'd')
 				_vm->_debugger->attach();
 			if (_vm->getFeatures() & GF_DEMO) break;
@@ -97,6 +99,11 @@ uint16 Input::readInput() {
 
 }
 
+bool Input::getLastKeyDown(uint16 &ascii) {
+	ascii = _lastKeyDownAscii;
+	return (_lastKeyDownAscii != -1);
+}
+
 // FIXME: see comment for readInput()
 void Input::waitForButtonEvent(uint32 buttonEventMask, int32 timeout) {
 
@@ -192,6 +199,10 @@ InputData* Input::updateInput() {
 	case kInputModeGame:
 		updateGameInput();
 		break;
+
+	case kInputModeDialogue:
+		readInput();
+		break;
 	}
 
 	return &_inputData;
diff --git a/engines/parallaction/input.h b/engines/parallaction/input.h
index e06fe96705..acc9898e90 100644
--- a/engines/parallaction/input.h
+++ b/engines/parallaction/input.h
@@ -66,6 +66,7 @@ class Input {
 
 	Common::Point	_mousePos;
 	uint16	_mouseButtons;
+	int32	_lastKeyDownAscii;
 
 	bool		_mouseHidden;
 	ZonePtr			_hoverZone;
@@ -73,7 +74,8 @@ class Input {
 public:
 	enum {
 		kInputModeGame = 0,
-		kInputModeComment = 1
+		kInputModeComment = 1,
+		kInputModeDialogue = 2
 	};
 
 
@@ -102,6 +104,7 @@ public:
 	void 	waitUntilLeftClick();
 	void	waitForButtonEvent(uint32 buttonEventMask, int32 timeout = -1);
 	uint32	getLastButtonEvent() { return _mouseButtons; }
+	bool  	getLastKeyDown(uint16 &ascii);
 
 	void stopHovering() {
 		_hoverZone = nullZonePtr;
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 3cde21b49c..bd5ff74473 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -161,6 +161,11 @@ void Parallaction::updateView() {
 }
 
 
+void Parallaction::hideDialogueStuff() {
+	_gfx->freeItems();
+	_balloonMan->freeBalloons();
+}
+
 
 void Parallaction::freeCharacter() {
 	debugC(1, kDebugExec, "freeCharacter()");
@@ -363,24 +368,28 @@ void Parallaction::processInput(InputData *data) {
 void Parallaction::runGame() {
 
 	InputData *data = _input->updateInput();
-	if (data->_event != kEvNone) {
-		processInput(data);
-	}
-
 	if (_engineFlags & kEngineQuit)
 		return;
 
-	runPendingZones();
+	if (_input->_inputMode == Input::kInputModeDialogue) {
+		runDialogueFrame();
+	} else {
+		if (data->_event != kEvNone) {
+			processInput(data);
+		}
 
-	if (_engineFlags & kEngineQuit)
-		return;
+		if (_engineFlags & kEngineQuit)
+			return;
 
-	if (_engineFlags & kEngineChangeLocation) {
-		changeLocation(_location._name);
-	}
+		runPendingZones();
 
-	if (_engineFlags & kEngineQuit)
-		return;
+		if (_engineFlags & kEngineQuit)
+			return;
+
+		if (_engineFlags & kEngineChangeLocation) {
+			changeLocation(_location._name);
+		}
+	}
 
 	_gfx->beginFrame();
 
@@ -396,7 +405,6 @@ void Parallaction::runGame() {
 
 	// change this to endFrame?
 	updateView();
-
 }
 
 
@@ -659,6 +667,7 @@ void Parallaction::beep() {
 }
 
 void Parallaction::scheduleLocationSwitch(const char *location) {
+	debugC(9, kDebugExec, "scheduleLocationSwitch(%s)\n", location);
 	strcpy(_location._name, location);
 	_engineFlags |= kEngineChangeLocation;
 }
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index ef2dad9884..409f274683 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -165,6 +165,7 @@ class Debugger;
 class Gfx;
 class SoundMan;
 class Input;
+class DialogueManager;
 
 struct Location {
 
@@ -275,8 +276,6 @@ public:
 	uint16		runZone(ZonePtr z);
 	void		freeZones();
 
-	void		runDialogue(SpeakData*);
-
 	AnimationPtr findAnimation(const char *name);
 	void		freeAnimations();
 
@@ -419,10 +418,11 @@ public:
 
 	void setupBalloonManager();
 
-	void hideDialogueStuff() {
-		_gfx->freeItems();
-		_balloonMan->freeBalloons();
-	}
+	void hideDialogueStuff();
+	DialogueManager	*_dialogueMan;
+	void enterDialogueMode(ZonePtr z);
+	void exitDialogueMode();
+	void runDialogueFrame();
 
 };
 
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index 6606550132..9e2a0f10f1 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -212,13 +212,21 @@ void Parallaction_br::runPendingZones() {
 	if (_activeZone) {
 		z = _activeZone;	// speak Zone or sound
 		_activeZone = nullZonePtr;
-		runZone(z);			// FIXME: BRA doesn't handle sound yet
+		if ((z->_type & 0xFFFF) == kZoneSpeak) {
+			enterDialogueMode(z);
+		} else {
+			runZone(z);			// FIXME: BRA doesn't handle sound yet
+		}
 	}
 
 	if (_activeZone2) {
 		z = _activeZone2;	// speak Zone or sound
 		_activeZone2 = nullZonePtr;
-		runZone(z);
+		if ((z->_type & 0xFFFF) == kZoneSpeak) {
+			enterDialogueMode(z);
+		} else {
+			runZone(z);			// FIXME: BRA doesn't handle sound yet
+		}
 	}
 }
 
-- 
cgit v1.2.3


From 5a71d764e7278fd4c9d83ba80e500e05b9b18fc7 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 21 Jul 2008 09:25:40 +0000
Subject: Some refactoring for tracking of floating labels.

svn-id: r33165
---
 engines/parallaction/input.cpp           | 44 ++++++++++++++++++++------------
 engines/parallaction/input.h             |  6 ++---
 engines/parallaction/parallaction.cpp    | 11 --------
 engines/parallaction/parallaction.h      |  2 --
 engines/parallaction/parallaction_ns.cpp |  5 ++--
 5 files changed, 31 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index 4d0b7085c2..9601ae3b36 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -208,6 +208,29 @@ InputData* Input::updateInput() {
 	return &_inputData;
 }
 
+void Input::trackMouse(ZonePtr z) {
+	if ((z != _hoverZone) && (_hoverZone)) {
+		stopHovering();
+		return;
+	}
+
+	if (!z) {
+		return;
+	}
+
+	if ((!_hoverZone) && ((z->_flags & kFlagsNoName) == 0)) {
+		_hoverZone = z;
+		_vm->_gfx->showFloatingLabel(_hoverZone->_label);
+		return;
+	}
+}
+
+void Input::stopHovering() {
+	_hoverZone = nullZonePtr;
+	_vm->_gfx->hideFloatingLabel();
+}
+
+
 bool Input::translateGameInput() {
 
 	if ((_engineFlags & kEnginePauseJobs) || (_engineFlags & kEngineInventory)) {
@@ -242,23 +265,10 @@ bool Input::translateGameInput() {
 		return true;
 	}
 
-	if ((z != _hoverZone) && (_hoverZone)) {
-		_hoverZone = nullZonePtr;
-		_inputData._event = kEvExitZone;
-		return true;
-	}
-
-	if (!z) {
-		_inputData._event = kEvNone;
-		return true;
-	}
-
-	if ((!_hoverZone) && ((z->_flags & kFlagsNoName) == 0)) {
-		_hoverZone = z;
-		_inputData._event = kEvEnterZone;
-		_inputData._label = z->_label;
-		return true;
-	}
+	trackMouse(z);
+ 	if (!z) {
+ 		return true;
+ 	}
 
 	if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || ((z->_type & 0xFFFF) == kZoneCommand))) {
 
diff --git a/engines/parallaction/input.h b/engines/parallaction/input.h
index acc9898e90..f260352dba 100644
--- a/engines/parallaction/input.h
+++ b/engines/parallaction/input.h
@@ -101,15 +101,13 @@ public:
 
 	uint16	readInput();
 	InputData* 	updateInput();
+	void	trackMouse(ZonePtr z);
 	void 	waitUntilLeftClick();
 	void	waitForButtonEvent(uint32 buttonEventMask, int32 timeout = -1);
 	uint32	getLastButtonEvent() { return _mouseButtons; }
 	bool  	getLastKeyDown(uint16 &ascii);
 
-	void stopHovering() {
-		_hoverZone = nullZonePtr;
-	}
-
+	void stopHovering();
 };
 
 } // namespace Parallaction
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index bd5ff74473..cd852f7c84 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -299,16 +299,6 @@ void Parallaction::showLocationComment(const char *text, bool end) {
 void Parallaction::processInput(InputData *data) {
 
 	switch (data->_event) {
-	case kEvEnterZone:
-		debugC(2, kDebugInput, "processInput: kEvEnterZone");
-		_gfx->showFloatingLabel(data->_label);
-		break;
-
-	case kEvExitZone:
-		debugC(2, kDebugInput, "processInput: kEvExitZone");
-		_gfx->hideFloatingLabel();
-		break;
-
 	case kEvAction:
 		debugC(2, kDebugInput, "processInput: kEvAction");
 		_input->stopHovering();
@@ -319,7 +309,6 @@ void Parallaction::processInput(InputData *data) {
 
 	case kEvOpenInventory:
 		_input->stopHovering();
-		_gfx->hideFloatingLabel();
 		if (hitZone(kZoneYou, data->_mousePos.x, data->_mousePos.y) == 0) {
 			setArrowCursor();
 		}
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 409f274683..c45d32b013 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -114,8 +114,6 @@ enum EngineFlags {
 
 enum {
 	kEvNone			= 0,
-	kEvEnterZone		= 1,
-	kEvExitZone		= 2,
 	kEvAction		= 3,
 	kEvOpenInventory	= 4,
 	kEvCloseInventory	= 5,
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index cbf9ee985d..9e925d1e1d 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -191,7 +191,7 @@ void Parallaction_ns::setArrowCursor() {
 	debugC(1, kDebugInput, "setting mouse cursor to arrow");
 
 	// this stuff is needed to avoid artifacts with labels and selected items when switching cursors
-	_gfx->hideFloatingLabel();
+	_input->stopHovering();
 	_input->_activeItem._id = 0;
 
 	_system->setMouseCursor(_mouseArrow, MOUSEARROW_WIDTH, MOUSEARROW_HEIGHT, 0, 0, 0);
@@ -302,12 +302,11 @@ void Parallaction_ns::changeLocation(char *location) {
 
 	_soundMan->playLocationMusic(location);
 
-	_gfx->hideFloatingLabel();
+	_input->stopHovering();
 	_gfx->freeLabels();
 
 	_zoneTrap = nullZonePtr;
 
-	_input->stopHovering();
 	if (_engineFlags & kEngineBlockInput) {
 		setArrowCursor();
 	}
-- 
cgit v1.2.3


From ecd44b8f90ec3f1e749f3b8787f6348e95030b0b Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Mon, 21 Jul 2008 10:13:44 +0000
Subject: Avoid branching in the inner loop of AGOS drawVertImageCompressed

svn-id: r33167
---
 engines/agos/gfx.cpp | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 6e91c5d94c..867a411962 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -8,7 +8,7 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+d
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -806,7 +806,6 @@ void AGOSEngine::drawVertImageUncompressed(VC10_state *state) {
 void AGOSEngine::drawVertImageCompressed(VC10_state *state) {
 	assert (state->flags & kDFCompressed) ;
 	uint w, h;
-	byte *src, *dst, *dstPtr;
 
 	state->x_skip *= 4;				/* reached */
 
@@ -815,7 +814,7 @@ void AGOSEngine::drawVertImageCompressed(VC10_state *state) {
 
 	vc10_skip_cols(state);
 
-	dstPtr = state->surf_addr;
+	byte *dstPtr = state->surf_addr;
 	if (!(state->flags & kDFNonTrans) && (state->flags & 0x40)) { /* reached */
 		dstPtr += vcReadVar(252);
 	}
@@ -823,20 +822,34 @@ void AGOSEngine::drawVertImageCompressed(VC10_state *state) {
 	do {
 		byte color;
 
-		src = vc10_depackColumn(state);
-		dst = dstPtr;
+		const byte *src = vc10_depackColumn(state);
+		byte *dst = dstPtr;
 
 		h = 0;
-		do {
-			color = (*src / 16);
-			if ((state->flags & kDFNonTrans) || color != 0)
+		if (state->flags & kDFNonTrans)  {
+			do {
+				byte colors = *src;
+				color = (colors / 16);
 				dst[0] = color | state->palette;
-			color = (*src & 15);
-			if ((state->flags & kDFNonTrans) || color != 0)
+				color = (colors & 15);
 				dst[1] = color | state->palette;
-			dst += state->surf_pitch;
-			src++;
-		} while (++h != state->draw_height);
+				dst += state->surf_pitch;
+				src++;
+			} while (++h != state->draw_height);
+		}
+		else {
+			do {
+				byte colors = *src;
+				color = (colors / 16);
+				if (color != 0)
+					dst[0] = color | state->palette;
+				color = (colors & 15);
+				if (color != 0)
+					dst[1] = color | state->palette;
+				dst += state->surf_pitch;
+				src++;
+			} while (++h != state->draw_height);
+		}
 		dstPtr += 2;
 	} while (++w != state->draw_width);
 }
-- 
cgit v1.2.3


From e1c71dab99c9bf60ee1cc26da09ebd797a693a3a Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 21 Jul 2008 10:32:20 +0000
Subject: Spacing.

svn-id: r33168
---
 engines/agos/gfx.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 867a411962..9a3962ea21 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -8,7 +8,7 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-d
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -836,8 +836,7 @@ void AGOSEngine::drawVertImageCompressed(VC10_state *state) {
 				dst += state->surf_pitch;
 				src++;
 			} while (++h != state->draw_height);
-		}
-		else {
+		} else {
 			do {
 				byte colors = *src;
 				color = (colors / 16);
-- 
cgit v1.2.3