Merge remote branch 'upstream/master' into pegasus

7 files changed, 152 insertions, 153 deletions

diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index 00a0372e99..172ec0a565 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -118,7 +118,7 @@ void MenuSystem::handleEvents() {
 	Common::Event event;
 	Common::EventManager *eventMan = _vm->_system->getEventManager();
 	while (eventMan->pollEvent(event)) {
-	switch (event.type) {
+		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			handleKeyDown(event.kbd);
 			break;
@@ -406,7 +406,7 @@ void MenuSystem::clickItem(ItemID id) {
 }
 
 void MenuSystem::restoreRect(int x, int y, int w, int h) {
-	byte *src = (byte*)_background->getBasePtr(x, y);
+	byte *src = (byte *)_background->getBasePtr(x, y);
 	byte *dst = _vm->_screen->_frontScreen + x + y * 640;
 	while (h--) {
 		memcpy(dst, src, w);
@@ -416,7 +416,7 @@ void MenuSystem::restoreRect(int x, int y, int w, int h) {
 }
 
 void MenuSystem::shadeRect(int x, int y, int w, int h, byte color1, byte color2) {
-	byte *src = (byte*)_background->getBasePtr(x, y);
+	byte *src = (byte *)_background->getBasePtr(x, y);
 	for (int xc = 0; xc < w; xc++) {
 		src[xc] = color2;
 		src[xc + h * 640] = color1;
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 054683b63e..76d42ebf0a 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -215,7 +215,7 @@ void MoviePlayer::fetchAudioChunks() {
 		byte chunkType = _vm->_arc->readByte();
 		uint32 chunkSize = _vm->_arc->readUint32LE();
 		if (chunkType == 4) {
-			byte *chunkBuffer = (byte*)malloc(chunkSize);
+			byte *chunkBuffer = (byte *)malloc(chunkSize);
 			_vm->_arc->read(chunkBuffer, chunkSize);
 			_audioStream->queueBuffer(chunkBuffer, chunkSize, DisposeAfterUse::YES, Audio::FLAG_UNSIGNED);
 			chunkBuffer = NULL;
@@ -268,7 +268,7 @@ bool MoviePlayer::handleInput() {
 	Common::Event event;
 	Common::EventManager *eventMan = g_system->getEventManager();
 	while (eventMan->pollEvent(event)) {
-	switch (event.type) {
+		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
 				return false;
@@ -279,7 +279,6 @@ bool MoviePlayer::handleInput() {
 		case Common::EVENT_QUIT:
 			_vm->quitGame();
 			return false;
-			break;
 		default:
 			break;
 		}
diff --git a/engines/toltecs/resource.h b/engines/toltecs/resource.h
index 7f4694f0f6..3fed2e11ca 100644
--- a/engines/toltecs/resource.h
+++ b/engines/toltecs/resource.h
@@ -71,7 +71,7 @@ public:
 	void purgeCache();
 
 protected:
-	typedef Common::HashMap<uint, Resource*> ResourceMap;
+	typedef Common::HashMap<uint, Resource *> ResourceMap;
 
 	ToltecsEngine *_vm;
 
diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp
index d66ed18d8c..b781490b69 100644
--- a/engines/toltecs/screen.cpp
+++ b/engines/toltecs/screen.cpp
@@ -658,7 +658,7 @@ void Screen::drawSurface(int16 x, int16 y, Graphics::Surface *surface) {
 	int16 skipX = 0;
 	int16 width = surface->w;
 	int16 height = surface->h;
-	byte *surfacePixels = (byte*)surface->getBasePtr(0, 0);
+	byte *surfacePixels = (byte *)surface->getBasePtr(0, 0);
 	byte *frontScreen;
 
 	// Not on screen, skip
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp
index e5fc865f5b..9683831980 100644
--- a/engines/toltecs/script.cpp
+++ b/engines/toltecs/script.cpp
@@ -490,57 +490,57 @@ void ScriptInterpreter::execScriptFunction(uint16 index) {
 
 VarType ScriptInterpreter::getGameVarType(uint variable) {
 	switch (variable) {
-		case 0:	 return vtByte;
-		case 1:	 return vtWord;
-		case 2:	 return vtWord;
-		case 3:	 return vtByte;
-		case 4:	 return vtWord;
-		case 5:	 return vtWord;
-		case 6:	 return vtWord;
-		case 7:	 return vtWord;
-		case 8:	 return vtWord;
-		case 9:	 return vtWord;
-		case 10:	 return vtWord;
-		case 11:	 return vtWord;
-		case 12:	 return vtByte;
-		case 13:	 return vtWord;
-		case 14:	 return vtWord;
-		case 15:	 return vtWord;
-		case 16:	 return vtWord;
-		case 17:	 return vtWord;
-		case 18:	 return vtWord;
-		case 19:	 return vtWord;
-		case 20:	 return vtWord;
-		case 21:	 return vtWord;
-		default:
-			error("Invalid game variable");
+	case 0:	 return vtByte;
+	case 1:	 return vtWord;
+	case 2:	 return vtWord;
+	case 3:	 return vtByte;
+	case 4:	 return vtWord;
+	case 5:	 return vtWord;
+	case 6:	 return vtWord;
+	case 7:	 return vtWord;
+	case 8:	 return vtWord;
+	case 9:	 return vtWord;
+	case 10:	 return vtWord;
+	case 11:	 return vtWord;
+	case 12:	 return vtByte;
+	case 13:	 return vtWord;
+	case 14:	 return vtWord;
+	case 15:	 return vtWord;
+	case 16:	 return vtWord;
+	case 17:	 return vtWord;
+	case 18:	 return vtWord;
+	case 19:	 return vtWord;
+	case 20:	 return vtWord;
+	case 21:	 return vtWord;
+	default:
+		error("Invalid game variable");
 	}
 }
 
 const char *getVarName(uint variable) {
 	switch (variable) {
-		case 0: return "mouseDisabled";
-		case 1: return "mouseY";
-		case 2: return "mouseX";
-		case 3: return "mouseButton";
-		case 4: return "verbLineY";
-		case 5: return "verbLineX";
-		case 6: return "verbLineWidth";
-		case 7: return "verbLineCount";
-		case 8: return "verbLineNum";
-		case 9: return "talkTextItemNum";
-		case 10: return "talkTextY";
-		case 11: return "talkTextX";
-		case 12: return "talkTextFontColor";
-		case 13: return "cameraY";
-		case 14: return "cameraX";
-		case 15: return "walkSpeedY";
-		case 16: return "walkSpeedX";
-		case 17: return "flag01";
-		case 18: return "sceneResIndex";
-		case 19: return "guiHeight";
-		case 20: return "sceneHeight";
-		case 21: return "sceneWidth";
+	case 0: return "mouseDisabled";
+	case 1: return "mouseY";
+	case 2: return "mouseX";
+	case 3: return "mouseButton";
+	case 4: return "verbLineY";
+	case 5: return "verbLineX";
+	case 6: return "verbLineWidth";
+	case 7: return "verbLineCount";
+	case 8: return "verbLineNum";
+	case 9: return "talkTextItemNum";
+	case 10: return "talkTextY";
+	case 11: return "talkTextX";
+	case 12: return "talkTextFontColor";
+	case 13: return "cameraY";
+	case 14: return "cameraX";
+	case 15: return "walkSpeedY";
+	case 16: return "walkSpeedX";
+	case 17: return "flag01";
+	case 18: return "sceneResIndex";
+	case 19: return "guiHeight";
+	case 20: return "sceneHeight";
+	case 21: return "sceneWidth";
 	}
 	return "(invalid)";
 }
@@ -549,31 +549,31 @@ int16 ScriptInterpreter::getGameVar(uint variable) {
 	debug(0, "ScriptInterpreter::getGameVar(%d{%s})", variable, getVarName(variable));
 	
 	switch (variable) {
-		case  0: return _vm->_mouseDisabled;
-		case  1: return _vm->_mouseY;
-		case  2: return _vm->_mouseX;
-		case  3: return _vm->_mouseButton;
-		case  4: return _vm->_screen->_verbLineY;
-		case  5: return _vm->_screen->_verbLineX;
-		case  6: return _vm->_screen->_verbLineWidth;
-		case  7: return _vm->_screen->_verbLineCount;
-		case  8: return _vm->_screen->_verbLineNum;
-		case  9: return _vm->_screen->_talkTextItemNum;
-		case 10: return _vm->_screen->_talkTextY;
-		case 11: return _vm->_screen->_talkTextX;
-		case 12: return _vm->_screen->_talkTextFontColor;
-		case 13: return _vm->_cameraY;
-		case 14: return _vm->_cameraX;
-		case 15: return _vm->_walkSpeedY;
-		case 16: return _vm->_walkSpeedX;
-		case 17: return _vm->_flag01;
-		case 18: return _vm->_sceneResIndex;
-		case 19: return _vm->_guiHeight;
-		case 20: return _vm->_sceneHeight;
-		case 21: return _vm->_sceneWidth;
-		default:
-			warning("Getting unimplemented game variable %s (%d)", getVarName(variable), variable);
-			return 0;
+	case  0: return _vm->_mouseDisabled;
+	case  1: return _vm->_mouseY;
+	case  2: return _vm->_mouseX;
+	case  3: return _vm->_mouseButton;
+	case  4: return _vm->_screen->_verbLineY;
+	case  5: return _vm->_screen->_verbLineX;
+	case  6: return _vm->_screen->_verbLineWidth;
+	case  7: return _vm->_screen->_verbLineCount;
+	case  8: return _vm->_screen->_verbLineNum;
+	case  9: return _vm->_screen->_talkTextItemNum;
+	case 10: return _vm->_screen->_talkTextY;
+	case 11: return _vm->_screen->_talkTextX;
+	case 12: return _vm->_screen->_talkTextFontColor;
+	case 13: return _vm->_cameraY;
+	case 14: return _vm->_cameraX;
+	case 15: return _vm->_walkSpeedY;
+	case 16: return _vm->_walkSpeedX;
+	case 17: return _vm->_flag01;
+	case 18: return _vm->_sceneResIndex;
+	case 19: return _vm->_guiHeight;
+	case 20: return _vm->_sceneHeight;
+	case 21: return _vm->_sceneWidth;
+	default:
+		warning("Getting unimplemented game variable %s (%d)", getVarName(variable), variable);
+		return 0;
 	}
 }
 
@@ -581,72 +581,72 @@ void ScriptInterpreter::setGameVar(uint variable, int16 value) {
 	debug(0, "ScriptInterpreter::setGameVar(%d{%s}, %d)", variable, getVarName(variable), value);
 	
 	switch (variable) {
-		case 0:
-			_vm->_mouseDisabled = value;
-			CursorMan.showMouse(value == 0);
-			break;
-		case 3:
-			_vm->_mouseButton = value;
-			break;
-		case 4:
-			_vm->_screen->_verbLineY = value;
-			break;
-		case 5:
-			_vm->_screen->_verbLineX = value;
-			break;
-		case 6:
-			_vm->_screen->_verbLineWidth = value;
-			break;
-		case 7:
-			_vm->_screen->_verbLineCount = value;
-			break;
-		case 8:
-			_vm->_screen->_verbLineNum = value;
-			break;
-		case 9:
-			_vm->_screen->_talkTextItemNum = value;
-			break;
-		case 10:
-			_vm->_screen->_talkTextY = value;
-			break;
-		case 11:
-			_vm->_screen->_talkTextX = value;
-			break;
-		case 12:
-			_vm->_screen->_talkTextFontColor = value;
-			break;
-		case 13:
-			_vm->_cameraY = value;
-			break;
-		case 14:
-			_vm->_cameraX = value;
-			break;
-		case 15:
-			_vm->_walkSpeedY = value;
-			break;
-		case 16:
-			_vm->_walkSpeedX = value;
-			break;
-		case 17:
-			_vm->_flag01 = value != 0;
-			break;
-		case 18:
-			_vm->_sceneResIndex = value;
-			break;
-		case 19:
-			_vm->_guiHeight = value;
-			break;
-		case 20:
-			_vm->_sceneHeight = value;
-			break;
-		case 21:
-			_vm->_sceneWidth = value;
-			break;
-		case 1:
-		case 2:
-		default:
-			warning("Setting unimplemented game variable %s (%d) to %d", getVarName(variable), variable, value);
-			break;
+	case 0:
+		_vm->_mouseDisabled = value;
+		CursorMan.showMouse(value == 0);
+		break;
+	case 3:
+		_vm->_mouseButton = value;
+		break;
+	case 4:
+		_vm->_screen->_verbLineY = value;
+		break;
+	case 5:
+		_vm->_screen->_verbLineX = value;
+		break;
+	case 6:
+		_vm->_screen->_verbLineWidth = value;
+		break;
+	case 7:
+		_vm->_screen->_verbLineCount = value;
+		break;
+	case 8:
+		_vm->_screen->_verbLineNum = value;
+		break;
+	case 9:
+		_vm->_screen->_talkTextItemNum = value;
+		break;
+	case 10:
+		_vm->_screen->_talkTextY = value;
+		break;
+	case 11:
+		_vm->_screen->_talkTextX = value;
+		break;
+	case 12:
+		_vm->_screen->_talkTextFontColor = value;
+		break;
+	case 13:
+		_vm->_cameraY = value;
+		break;
+	case 14:
+		_vm->_cameraX = value;
+		break;
+	case 15:
+		_vm->_walkSpeedY = value;
+		break;
+	case 16:
+		_vm->_walkSpeedX = value;
+		break;
+	case 17:
+		_vm->_flag01 = value != 0;
+		break;
+	case 18:
+		_vm->_sceneResIndex = value;
+		break;
+	case 19:
+		_vm->_guiHeight = value;
+		break;
+	case 20:
+		_vm->_sceneHeight = value;
+		break;
+	case 21:
+		_vm->_sceneWidth = value;
+		break;
+	case 1:
+	case 2:
+	default:
+		warning("Setting unimplemented game variable %s (%d) to %d", getVarName(variable), variable, value);
+		break;
 	}
 
 }
@@ -786,7 +786,7 @@ void ScriptInterpreter::sfGetRandomNumber() {
 }
 
 void ScriptInterpreter::sfDrawGuiTextMulti() {
-	_vm->_screen->drawGuiTextMulti((byte*)localPtr(arg16(3)));
+	_vm->_screen->drawGuiTextMulti((byte *)localPtr(arg16(3)));
 }
 
 void ScriptInterpreter::sfUpdateVerbLine() {
@@ -907,11 +907,11 @@ void ScriptInterpreter::sfDrawGuiImage() {
 }
 
 void ScriptInterpreter::sfAddAnimatedSpriteNoLoop() {
-	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte*)localPtr(0), (int16*)localPtr(arg16(9)), false, 2);
+	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte *)localPtr(0), (int16 *)localPtr(arg16(9)), false, 2);
 }
 
 void ScriptInterpreter::sfAddAnimatedSprite() {
-	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte*)localPtr(0), (int16*)localPtr(arg16(9)), true, 2);
+	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte *)localPtr(0), (int16 *)localPtr(arg16(9)), true, 2);
 }
 
 void ScriptInterpreter::sfAddStaticSprite() {
@@ -919,11 +919,11 @@ void ScriptInterpreter::sfAddStaticSprite() {
 }
 
 void ScriptInterpreter::sfAddAnimatedSpriteScaled() {
-	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte*)localPtr(0), (int16*)localPtr(arg16(9)), true, 1);
+	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte *)localPtr(0), (int16 *)localPtr(arg16(9)), true, 1);
 }
 
 void ScriptInterpreter::sfFindPath() {
-	_vm->_segmap->findPath((int16*)(getSlotData(arg16(13)) + arg16(11)), arg16(9), arg16(7), arg16(5), arg16(3));
+	_vm->_segmap->findPath((int16 *)(getSlotData(arg16(13)) + arg16(11)), arg16(9), arg16(7), arg16(5), arg16(3));
 }
 
 void ScriptInterpreter::sfWalk() {
diff --git a/engines/toltecs/script.h b/engines/toltecs/script.h
index 1a5a9c90ad..0c1898c525 100644
--- a/engines/toltecs/script.h
+++ b/engines/toltecs/script.h
@@ -77,7 +77,7 @@ protected:
 	};
 
 	ToltecsEngine *_vm;
-	Common::Array<const ScriptFunction*> _scriptFuncs;
+	Common::Array<const ScriptFunction *> _scriptFuncs;
 	Common::Array<const char *> _scriptFuncNames;
 
 	byte *_stack;
diff --git a/engines/toltecs/segmap.cpp b/engines/toltecs/segmap.cpp
index 10e5f56096..f7d806c67b 100644
--- a/engines/toltecs/segmap.cpp
+++ b/engines/toltecs/segmap.cpp
@@ -269,7 +269,7 @@ struct LineData {
 };
 
 void plotProc(int x, int y, int color, void *data) {
-	LineData *ld = (LineData*)data;
+	LineData *ld = (LineData *)data;
 	ld->surf[x + y * ld->pitch] = color;
 }
 
@@ -373,7 +373,7 @@ void SegmentMap::loadSegmapMaskRectSurface(byte *maskData, SegmapMaskRect &maskR
 	maskRect.surface->create(maskRect.width, maskRect.height, Graphics::PixelFormat::createFormatCLUT8());
 
 	byte *backScreen = _vm->_screen->_backScreen + maskRect.x + (maskRect.y * _vm->_sceneWidth);
-	byte *dest = (byte*)maskRect.surface->getBasePtr(0, 0);
+	byte *dest = (byte *)maskRect.surface->getBasePtr(0, 0);
 
 	for (int16 h = 0; h < maskRect.height; h++) {
 		int16 w = maskRect.width;