More formatting.

svn-id: r40994

29 files changed, 172 insertions, 221 deletions

diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index 3bc6ca6c6c..a37ac7b306 100644
--- a/engines/kyra/gui_hof.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -78,7 +78,6 @@ void KyraEngine_HoF::setupLangButtonShapes() {
 	default:
 		_inventoryButtons[0].data0ShapePtr = _buttonShapes[6];
 		_inventoryButtons[0].data1ShapePtr = _inventoryButtons[0].data2ShapePtr = _buttonShapes[7];
-		break;
 	}
 }
 
@@ -437,7 +436,6 @@ void KyraEngine_HoF::loadBookBkgd() {
 		default:
 			warning("loadBookBkgd unsupported language");
 			filename[1] = 'E';
-			break;
 		}
 	} else {
 		if (!_bookCurPage)
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 0f3d398355..560bc6c2f2 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -884,7 +884,6 @@ void GUI_LoK::setupControls(Menu &menu) {
 		break;
 	default:
 		menu.item[2].itemString = "ERROR";
-		break;
 	}
 
 	int textControl = 3;
@@ -913,7 +912,6 @@ void GUI_LoK::setupControls(Menu &menu) {
 			break;
 		default:
 			menu.item[3].itemString = "ERROR";
-			break;
 		}
 	} else {
 		menu.item[4].enabled = 0;
@@ -935,7 +933,6 @@ void GUI_LoK::setupControls(Menu &menu) {
 		break;
 	default:
 		menu.item[textControl].itemString = "ERROR";
-		break;
 	}
 
 	initMenuLayout(menu);
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 332a0efeab..6681ab8e87 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -2111,7 +2111,6 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
 						buttonList->flags2 |= 2;
 					}
 					_specialProcessButton = buttonList;
-					break;
 				}
 			}
 		}
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index c20ba15fe5..ed3082c727 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -327,7 +327,6 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWh
 						buttonList->flags2 |= 2;
 					}
 					_specialProcessButton = buttonList;
-					break;
 				}
 			}
 		}
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 81db5076f9..c2c36dcc95 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -1987,7 +1987,6 @@ void KyraEngine_HoF::writeSettings() {
 	case 0:
 	default:
 		_flags.lang = Common::EN_ANY;
-		break;
 	}
 
 	if (_flags.lang == _flags.replacedLang && _flags.fanLang != Common::UNK_LANG)
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 2f5d11f257..fcd35e7282 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -940,7 +940,6 @@ void KyraEngine_LoK::writeSettings() {
 		break;
 	default:	// Clickable
 		talkspeed = 0;
-		break;
 	}
 
 	ConfMan.setInt("talkspeed", talkspeed);
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 87a5672bee..f2ea0c91df 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -317,7 +317,6 @@ Common::Error KyraEngine_MR::go() {
 			uninitMainMenu();
 			quitGame();
 			running = false;
-			break;
 		}
 	}
 
@@ -1496,7 +1495,6 @@ void KyraEngine_MR::writeSettings() {
 	case 0:
 	default:
 		_flags.lang = Common::EN_ANY;
-		break;
 	}
 
 	if (_flags.lang == _flags.replacedLang && _flags.fanLang != Common::UNK_LANG)
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 30da35787e..2d8f6955a5 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -330,7 +330,6 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 					break;
 				default:
 					keys = 0;
-					break;
 				}
 
 				// When we got an keypress, which we might need to handle,
@@ -557,7 +556,6 @@ void KyraEngine_v1::writeSettings() {
 	default:	// Voice & Text
 		speechMute = false;
 		subtitles = true;
-		break;
 	}
 
 	if (_sound) {
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index b1e3a5a5de..9ffd796afd 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -100,7 +100,6 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi
 	default:
 		warning("unsupported language, switching back to English");
 		_lang = 0;
-		break;
 	}
 }
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index bf9e522fab..6a2ab1b571 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -68,7 +68,6 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 	default:
 		warning("unsupported language, switching back to English");
 		_lang = 0;
-		break;
 	}
 
 	_chargenFrameTable = _flags.isTalkie ? _chargenFrameTableTalkie : _chargenFrameTableFloppy;
diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp
index 1d75648621..fed7877c0b 100644
--- a/engines/kyra/scene_hof.cpp
+++ b/engines/kyra/scene_hof.cpp
@@ -175,7 +175,6 @@ void KyraEngine_HoF::enterNewSceneUnk1(int facing, int unk1, int unk2) {
 
 		default:
 			x2 = y2 = -1;
-			break;
 		}
 
 		if (x2 >= 316)
@@ -380,7 +379,6 @@ int KyraEngine_HoF::checkSceneChange() {
 
 	default:
 		newScene = _mainCharacter.sceneId;
-		break;
 	}
 
 	if (newScene == 0xFFFF)
diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp
index 4eda28bc3c..345998e40e 100644
--- a/engines/kyra/scene_lok.cpp
+++ b/engines/kyra/scene_lok.cpp
@@ -924,7 +924,6 @@ int KyraEngine_LoK::processSceneChange(int *table, int unk1, int frameReset) {
 		default:
 			++table;
 			forceContinue = true;
-			break;
 		}
 
 		returnValue = changeScene(_currentCharacter->facing);
@@ -1084,7 +1083,6 @@ int KyraEngine_LoK::changeScene(int facing) {
 
 	default:
 		sceneId = _roomTable[_currentCharacter->sceneId].westExit;
-		break;
 	}
 
 	if (sceneId == 0xFFFF)
diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp
index d823af2ca6..07a7aa0d07 100644
--- a/engines/kyra/scene_mr.cpp
+++ b/engines/kyra/scene_mr.cpp
@@ -223,7 +223,6 @@ void KyraEngine_MR::enterNewSceneUnk1(int facing, int unk1, int unk2) {
 
 		default:
 			x2 = y2 = -1;
-			break;
 		}
 
 		if (x2 >= 316)
@@ -740,7 +739,6 @@ int KyraEngine_MR::checkSceneChange() {
 
 	default:
 		newScene = _mainCharacter.sceneId;
-		break;
 	}
 
 	if (newScene == 0xFFFF)
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 97ad4b5a83..78dd4fd020 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2746,7 +2746,6 @@ void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, uint8 *
 		break;
 	default:
 		error("Unhandled bitmap compression %d", compType);
-		break;
 	}
 
 	if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
@@ -2983,7 +2982,6 @@ int SJIStoFMTChunk(int f, int s) { // copied from scumm\charset.cpp
 		break;
 	default:
 		debug(4, "Invalid Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
-		return 0;
 	}
 
 	debug(6, "Kanji: %c%c f 0x%x s 0x%x base 0x%x c %d p %d chunk %d cr %d index %d", f, s, f, s, base, c, p, chunk, cr, ((chunk_f + chunk) * 32 + (s - base)) + cr);
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 02b1874605..9035708f5e 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -109,7 +109,6 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo
 
 		default:
 			warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::ID2string(chunk->id), chunk->size, filename);
-			break;
 		}
 	}
 
@@ -237,7 +236,6 @@ void EMCInterpreter::op_pushRetOrPos(EMCState *script) {
 
 	default:
 		script->ip = 0;
-		break;
 	}
 }
 
@@ -274,7 +272,6 @@ void EMCInterpreter::op_popRetOrPos(EMCState *script) {
 
 	default:
 		script->ip = 0;
-		break;
 	}
 }
 
@@ -340,7 +337,6 @@ void EMCInterpreter::op_negate(EMCState *script) {
 	default:
 		warning("Unknown negation func: %d", _parameter);
 		script->ip = 0;
-		break;
 	}
 }
 
@@ -427,7 +423,6 @@ void EMCInterpreter::op_eval(EMCState *script) {
 	default:
 		warning("Unknown evaluate func: %d", _parameter);
 		error = true;
-		break;
 	}
 
 	if (error)
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index e6dbbd27b9..03a5d4efc1 100644
--- a/engines/kyra/script_lok.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -1042,7 +1042,6 @@ int KyraEngine_LoK::o1_walkCharacterToPoint(EMCState *script) {
 		default:
 			++curPos;
 			forceContinue = true;
-			break;
 		}
 
 		if (forceContinue || !running)
@@ -1236,7 +1235,6 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 
 	default:
 		palIndex = 8;
-		break;
 	}
 	if (_brandonStatusBit & 2) {
 		if (_currentCharacter->sceneId != 133 && _currentCharacter->sceneId != 137 &&
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index e2ec4ea830..dab3e365f3 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -158,7 +158,6 @@ TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpc
 
 		default:
 			warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::ID2string(chunk->id), chunk->size, filename);
-			break;
 		}
 	}
 
@@ -1124,42 +1123,41 @@ uint16 TIMInterpreter_LoL::processDialogue() {
 			_vm->gui_notifyButtonListChanged();
 
 		switch (e) {
-			case 43:
-			case 61:
-				_vm->snd_stopSpeech(true);
-				//_dlgTimer = 0;
-				res = _dialogueHighlightedButton + 1;
-				break;
-
-			case 92:
-			case 97:
-				if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
-					_dialogueHighlightedButton--;
-				break;
-
-			case 96:
-			case 102:
-				if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
-					_dialogueHighlightedButton++;
-				break;
-
-			case 200:
-			case 202:
-				x = _dialogueButtonPosX;
-
-				for (int i = 0; i < _dialogueNumButtons; i++) {
-					if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, _dialogueButtonPosY, x + 74, _dialogueButtonPosY + 9)) {
-						_dialogueHighlightedButton = i;
-						res = _dialogueHighlightedButton + 1;
-						break;
-					}
-					x += _dialogueButtonXoffs;
-				}
+		case 43:
+		case 61:
+			_vm->snd_stopSpeech(true);
+			//_dlgTimer = 0;
+			res = _dialogueHighlightedButton + 1;
+			break;
+
+		case 92:
+		case 97:
+			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
+				_dialogueHighlightedButton--;
+			break;
+
+		case 96:
+		case 102:
+			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
+				_dialogueHighlightedButton++;
+			break;
+
+		case 200:
+		case 202:
+			x = _dialogueButtonPosX;
 
-				break;
+			for (int i = 0; i < _dialogueNumButtons; i++) {
+				if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, _dialogueButtonPosY, x + 74, _dialogueButtonPosY + 9)) {
+					_dialogueHighlightedButton = i;
+					res = _dialogueHighlightedButton + 1;
+					break;
+				}
+				x += _dialogueButtonXoffs;
+			}
+			break;
 
-			default:
-				break;
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 5b0a8ef37d..54d6f2cbe3 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -405,7 +405,6 @@ void SeqPlayer::s1_copyRegionSpecial() {
 		break;
 	default:
 		error("Invalid subopcode %d for s1_copyRegionSpecial", so);
-		break;
 	}
 }
 
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 3d5c348af7..4e53399fbf 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -1811,22 +1811,22 @@ int KyraEngine_HoF::seq_lolDemoScene1(WSAMovie_v2 *wsaObj, int x, int y, int frm
 
 int KyraEngine_HoF::seq_lolDemoScene2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	switch (_seqFrameCounter - 17) {
-		case 0:
-			_seqFrameDelay = 8;
-			break;
-		case 3:
-		case 6:
-		case 9:
-			seq_playTalkText(8);
-			break;
-		case 15:
-			seq_playTalkText(9);
-			break;
-		case 18:
-			seq_playTalkText(2);
-			break;
-		default:
-			break;
+	case 0:
+		_seqFrameDelay = 8;
+		break;
+	case 3:
+	case 6:
+	case 9:
+		seq_playTalkText(8);
+		break;
+	case 15:
+		seq_playTalkText(9);
+		break;
+	case 18:
+		seq_playTalkText(2);
+		break;
+	default:
+		break;
 	}
 	_seqFrameCounter++;
 	return frm;
@@ -1844,32 +1844,32 @@ int KyraEngine_HoF::seq_lolDemoScene3(WSAMovie_v2 *wsaObj, int x, int y, int frm
 
 int KyraEngine_HoF::seq_lolDemoScene4(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	switch (_seqFrameCounter) {
-		case 11:
-		case 14:
-		case 17:
-		case 20:
-			seq_playTalkText(8);
-			break;
-		case 22:
-			seq_playTalkText(11);
-			break;
-		case 24:
-			seq_playTalkText(8);
-			break;
-		case 30:
-			seq_playTalkText(15);
-			break;
-		case 34:
-			seq_playTalkText(14);
-			break;
-		case 38:
-			seq_playTalkText(13);
-			break;
-		case 42:
-			seq_playTalkText(12);
-			break;
-		default:
-			break;
+	case 11:
+	case 14:
+	case 17:
+	case 20:
+		seq_playTalkText(8);
+		break;
+	case 22:
+		seq_playTalkText(11);
+		break;
+	case 24:
+		seq_playTalkText(8);
+		break;
+	case 30:
+		seq_playTalkText(15);
+		break;
+	case 34:
+		seq_playTalkText(14);
+		break;
+	case 38:
+		seq_playTalkText(13);
+		break;
+	case 42:
+		seq_playTalkText(12);
+		break;
+	default:
+		break;
 	}
 
 	_seqFrameCounter++;
@@ -1878,30 +1878,30 @@ int KyraEngine_HoF::seq_lolDemoScene4(WSAMovie_v2 *wsaObj, int x, int y, int frm
 
 int KyraEngine_HoF::seq_lolDemoScene5(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	switch (_seqFrameCounter++) {
-		case 0:
-		case 4:
-		case 6:
-		case 8:
-		case 10:
-		case 14:
-		case 16:
-		case 18:
-		case 20:
-		case 22:
-		case 24:
-		case 26:
-		case 28:
-		case 30:
-			seq_playTalkText(15);
-			break;
-		case 32:
-			seq_playTalkText(16);
-			break;
-		case 42:
-			seq_playTalkText(6);
-			break;
-		default:
-			break;
+	case 0:
+	case 4:
+	case 6:
+	case 8:
+	case 10:
+	case 14:
+	case 16:
+	case 18:
+	case 20:
+	case 22:
+	case 24:
+	case 26:
+	case 28:
+	case 30:
+		seq_playTalkText(15);
+		break;
+	case 32:
+		seq_playTalkText(16);
+		break;
+	case 42:
+		seq_playTalkText(6);
+		break;
+	default:
+		break;
 	}
 	return frm;
 }
@@ -2054,28 +2054,28 @@ void KyraEngine_HoF::seq_sequenceCommand(int command) {
 	case 0:
 		memset(pal, 0, 0x300);
 		_screen->fadePalette(pal, 36);
-		memcpy (_screen->getPalette(0), pal, 0x300);
-		memcpy (_screen->getPalette(1), pal, 0x300);
+		memcpy(_screen->getPalette(0), pal, 0x300);
+		memcpy(_screen->getPalette(1), pal, 0x300);
 		break;
 
 	case 1:
 		memset(pal, 0x3F, 0x300);
 		seq_playTalkText(_rnd.getRandomBit());
 		_screen->fadePalette(pal, 16);
-		memcpy (_screen->getPalette(0), pal, 0x300);
-		memcpy (_screen->getPalette(1), pal, 0x300);
+		memcpy(_screen->getPalette(0), pal, 0x300);
+		memcpy(_screen->getPalette(1), pal, 0x300);
 		break;
 
 	case 3:
 		_screen->copyPage(2, 0);
 		_screen->fadePalette(_screen->getPalette(0), 16);
-		memcpy (_screen->getPalette(1), _screen->getPalette(0), 0x300);
+		memcpy(_screen->getPalette(1), _screen->getPalette(0), 0x300);
 		break;
 
 	case 4:
 		_screen->copyPage(2, 0);
 		_screen->fadePalette(_screen->getPalette(0), 36);
-		memcpy (_screen->getPalette(1), _screen->getPalette(0), 0x300);
+		memcpy(_screen->getPalette(1), _screen->getPalette(0), 0x300);
 		break;
 
 	case 5:
@@ -2095,8 +2095,8 @@ void KyraEngine_HoF::seq_sequenceCommand(int command) {
 	case 8:
 		memset(pal, 0, 0x300);
 		_screen->fadePalette(pal, 16);
-		memcpy (_screen->getPalette(0), pal, 0x300);
-		memcpy (_screen->getPalette(1), pal, 0x300);
+		memcpy(_screen->getPalette(0), pal, 0x300);
+		memcpy(_screen->getPalette(1), pal, 0x300);
 
 		delay(120 * _tickLength);
 		break;
@@ -2112,8 +2112,8 @@ void KyraEngine_HoF::seq_sequenceCommand(int command) {
 		//pal[3 * i] = pal[3 * i + 1] = pal[3 * i + 2] = 0x3f;
 
 		_screen->fadePalette(pal, 64);
-		memcpy (_screen->getPalette(0), pal, 0x300);
-		memcpy (_screen->getPalette(1), pal, 0x300);
+		memcpy(_screen->getPalette(0), pal, 0x300);
+		memcpy(_screen->getPalette(1), pal, 0x300);
 		break;
 
 	default:
@@ -2404,7 +2404,6 @@ bool KyraEngine_HoF::seq_processNextSubFrame(int wsaNum) {
 		default:
 			currentFrame = _activeWSA[wsaNum].endFrame - 1;
 			res = true;
-			break;
 		}
 	}
 
@@ -2590,7 +2589,6 @@ void KyraEngine_HoF::seq_displayScrollText(uint8 *data, const ScreenDim *d, int
 				break;
 			default:
 				textData[cnt + 1].x = (((d->w << 3) - _screen->getTextWidth(str)) >> 1) + 1;
-				break;
 			}
 
 			if (textData[cnt].unk1 == 5)
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 2093b34ec3..7e5f4fc517 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -845,7 +845,6 @@ void KyraEngine_LoK::seq_playDrinkPotionAnim(int item, int unk2, int flags) {
 		red = 33;
 		green = 66;
 		blue = 100;
-		break;
 	}
 	red   = (uint8)((double)red   * 0.63);
 	green = (uint8)((double)green * 0.63);
@@ -1793,7 +1792,6 @@ void KyraEngine_LoK::drawJewelsFadeOutEnd(int jewel) {
 
 	default:
 		newDelay = 3600;
-		break;
 	}
 
 	setGameFlag(0xF1);
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index f76bc5105a..95d218ab10 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -98,7 +98,6 @@ int LoLEngine::processPrologue() {
 		default:
 			quitGame();
 			updateInput();
-			break;
 		}
 	}
 
diff --git a/engines/kyra/sequences_mr.cpp b/engines/kyra/sequences_mr.cpp
index 8de0138100..4d1117f3c9 100644
--- a/engines/kyra/sequences_mr.cpp
+++ b/engines/kyra/sequences_mr.cpp
@@ -216,7 +216,6 @@ void KyraEngine_MR::eelScript() {
 	default:
 		resetGameFlag(0x171);
 		runAnimationScript("EELS00.EMC", 0, 0, 1, 1);
-		break;
 	}
 
 	changeChapter(2, 29, 0, 4);
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 5be783d255..1980f62d7c 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -381,8 +381,8 @@ void Towns_EuphonyPcmChannel::sysEx_customInstrument(uint32 type, const byte *fm
 				if (_voice->id[i] == *(pos[ii] + 8)) {
 					if (!_voice->_snd[i])
 						_voice->_snd[i] = new Voice::Snd;
-					memset (_voice->_snd[i]->name, 0, 9);
-					memcpy (_voice->_snd[i]->name, (const char *)pos[ii], 8);
+					memset(_voice->_snd[i]->name, 0, 9);
+					memcpy(_voice->_snd[i]->name, (const char *)pos[ii], 8);
 					_voice->_snd[i]->id = READ_LE_UINT32(pos[ii] + 8);
 					_voice->_snd[i]->numSamples = READ_LE_UINT32(pos[ii] + 12);
 					_voice->_snd[i]->loopStart = READ_LE_UINT32(pos[ii] + 16);
@@ -395,8 +395,8 @@ void Towns_EuphonyPcmChannel::sysEx_customInstrument(uint32 type, const byte *fm
 			}
 		}
 	} else {
-		memset (_voice->name, 0, 9);
-		memcpy (_voice->name, (const char *)fmInst, 8);
+		memset(_voice->name, 0, 9);
+		memcpy(_voice->name, (const char *)fmInst, 8);
 
 		for (uint8 i = 0; i < 8; i++) {
 			_voice->split[i] = READ_LE_UINT16(fmInst + 16 + 2 * i);
@@ -3173,7 +3173,6 @@ void TownsPC98_OpnCore::writeReg(uint8 part, uint8 regAddress, uint8 value) {
 
 	default:
 		warning("TownsPC98_OpnDriver: UNKNOWN ADDRESS %d", regAddress);
-		break;
 	}
 }
 
diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp
index 99a67cac28..147ded3cfd 100644
--- a/engines/kyra/sprites.cpp
+++ b/engines/kyra/sprites.cpp
@@ -387,7 +387,6 @@ void Sprites::updateSceneAnims() {
 		default:
 			warning("Unsupported anim command %X in script %i", READ_LE_UINT16(data), i);
 			data += 2;
-			break;
 		}
 
 		if (update)
@@ -488,7 +487,6 @@ void Sprites::loadDat(const char *filename, SceneExits &exits) {
 			default:
 				warning("Unknown code in DAT file '%s' offset %d: %x", filename, int(data - _dat), READ_LE_UINT16(data));
 				data += 2;
-				break;
 			}
 		}
 	} else {
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 8d6afe3c9b..a68fc003e7 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -79,8 +79,8 @@ void LoLEngine::loadMonsterShapes(const char *file, int monsterIndex, int animTy
 	uint8 *tmpPal1 = new uint8[64];
 	uint8 *tmpPal2 = new uint8[256];
 	uint16 *tmpPal3 = new uint16[256];
-	memset (tmpPal1, 0, 64);
-	memset (tmpPal2, 0, 256);
+	memset(tmpPal1, 0, 64);
+	memset(tmpPal2, 0, 256);
 
 	for (int i = 0; i < 64; i++) {
 		tmpPal1[i] = *p;
@@ -92,7 +92,7 @@ void LoLEngine::loadMonsterShapes(const char *file, int monsterIndex, int animTy
 	for (int i = 0; i < 16; i++) {
 		int pos = (monsterIndex << 4) + i;
 		memcpy(tmpPal2, _monsterShapes[pos] + 10, 256);
-		memset (tmpPal3, 0xff, 512);
+		memset(tmpPal3, 0xff, 512);
 		uint8 numCol = *tmpPal2;
 
 		for (int ii = 0; ii < numCol; ii++) {
@@ -960,7 +960,7 @@ uint8 *LoLEngine::drawItemOrMonster(uint8 *shape, uint8 *table, int x, int y, in
 		r = CLIP(r, 0, 7);
 		ovl = _screen->getLevelOverlay(r);
 	} else {
-		memset (tmpOvl + 1, tblValue, 15);
+		memset(tmpOvl + 1, tblValue, 15);
 		tmpOvl[0] = 0;
 		table = tmpOvl;
 		ovl = _screen->getLevelOverlay(7);
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 9c8b06d0b5..b30b3b70f1 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1887,7 +1887,7 @@ void LoLEngine::initStaticResource() {
 
 	tmp = _staticres->loadRawData(lolMapCursorOvl, tmpSize);
 	_mapCursorOverlay = new uint8[tmpSize];
-	memcpy (_mapCursorOverlay, tmp, tmpSize);
+	memcpy(_mapCursorOverlay, tmp, tmpSize);
 	_staticres->unloadId(lolMapCursorOvl);
 
 	_updateSpellBookCoords = _staticres->loadRawData(lolSpellbookCoords, _updateSpellBookCoordsSize);
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index b9a8282de5..97ff06816f 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -269,7 +269,6 @@ void TextDisplayer_LoL::preprocessString(char *str, EMCState *script, const uint
 				break;
 			default:
 				eos = true;
-				break;
 			}
 			break;
 		case ' ':
@@ -434,8 +433,6 @@ void TextDisplayer_LoL::displayText(char *str, ...) {
 
 			if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
 				printLine(_currentLine);
-
-			break;
 		}
 
 		c = parseCommand();
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index eb0ecb5537..4a66557465 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -123,60 +123,60 @@ void LoLEngine::timerSpecialCharacterUpdate(int timerNum) {
 			}
 
 			switch (_characters[i].characterUpdateEvents[ii] - 1) {
-				case 0:
-					if (_characters[i].weaponHit) {
-						_characters[i].weaponHit = 0;
-						_characters[i].characterUpdateDelay[ii] = calcMonsterSkillLevel(i, 6);
-						if (_characters[i].characterUpdateDelay[ii] > v)
-							v = _characters[i].characterUpdateDelay[ii];
-					} else {
-						_characters[i].flags &= 0xfffb;
-					}
-
-					gui_drawCharPortraitWithStats(i);
-					break;
-
-				case 1:
-					_characters[i].damageSuffered = 0;
-					gui_drawCharPortraitWithStats(i);
-					break;
-
-				case 2:
-					_characters[i].flags &= 0xffbf;
-					gui_drawCharPortraitWithStats(i);
-					break;
-
-				case 3:
-					v = _rnd.getRandomNumberRng(1, 2);
-					if (inflictDamage(i, v, 0x8000, 0, 0x80)) {
-						_txt->printMessage(2, getLangString(0x4022), _characters[i].name);
-						_characters[i].characterUpdateDelay[ii] = 10;
-						if (_characters[i].characterUpdateDelay[ii] > v)
-							v = _characters[i].characterUpdateDelay[ii];
-					}
-					break;
-
-				case 4:
-					_characters[i].flags &= 0xfeff;
-					_txt->printMessage(0, getLangString(0x4027), _characters[i].name);
-					gui_drawCharPortraitWithStats(i);
-					break;
-
-				case 5:
-					setTemporaryFaceFrame(i, 0, 0, 1);
-					break;
-
-				case 6:
-					_characters[i].flags &= 0xefff;
-					gui_drawCharPortraitWithStats(i);
-					break;
-
-				case 7:
-					restoreSwampPalette();
-					break;
-
-				default:
-					break;
+			case 0:
+				if (_characters[i].weaponHit) {
+					_characters[i].weaponHit = 0;
+					_characters[i].characterUpdateDelay[ii] = calcMonsterSkillLevel(i, 6);
+					if (_characters[i].characterUpdateDelay[ii] > v)
+						v = _characters[i].characterUpdateDelay[ii];
+				} else {
+					_characters[i].flags &= 0xfffb;
+				}
+
+				gui_drawCharPortraitWithStats(i);
+				break;
+
+			case 1:
+				_characters[i].damageSuffered = 0;
+				gui_drawCharPortraitWithStats(i);
+				break;
+
+			case 2:
+				_characters[i].flags &= 0xffbf;
+				gui_drawCharPortraitWithStats(i);
+				break;
+
+			case 3:
+				v = _rnd.getRandomNumberRng(1, 2);
+				if (inflictDamage(i, v, 0x8000, 0, 0x80)) {
+					_txt->printMessage(2, getLangString(0x4022), _characters[i].name);
+					_characters[i].characterUpdateDelay[ii] = 10;
+					if (_characters[i].characterUpdateDelay[ii] > v)
+						v = _characters[i].characterUpdateDelay[ii];
+				}
+				break;
+
+			case 4:
+				_characters[i].flags &= 0xfeff;
+				_txt->printMessage(0, getLangString(0x4027), _characters[i].name);
+				gui_drawCharPortraitWithStats(i);
+				break;
+
+			case 5:
+				setTemporaryFaceFrame(i, 0, 0, 1);
+				break;
+
+			case 6:
+				_characters[i].flags &= 0xefff;
+				gui_drawCharPortraitWithStats(i);
+				break;
+
+			case 7:
+				restoreSwampPalette();
+				break;
+
+			default:
+				break;
 			}
 
 			if (_characters[i].characterUpdateDelay[ii] <= 0)
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index c0d93e6528..0b8f9c99a2 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -343,7 +343,6 @@ bool VQAMovie::open(const char *filename) {
 		default:
 			warning("VQAMovie::open: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 			_file->seek(size, SEEK_CUR);
-			break;
 		}
 	}
 
@@ -507,7 +506,6 @@ void VQAMovie::displayFrame(uint frameNum) {
 				default:
 					warning("VQAMovie::displayFrame: Unknown `VQFR' sub-tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 					_file->seek(size, SEEK_CUR);
-					break;
 				}
 
 			}
@@ -517,7 +515,6 @@ void VQAMovie::displayFrame(uint frameNum) {
 		default:
 			warning("VQAMovie::displayFrame: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 			_file->seek(size, SEEK_CUR);
-			break;
 		}
 	}
 
@@ -636,7 +633,6 @@ void VQAMovie::play() {
 			default:
 				warning("VQAMovie::play: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 				_file->seek(size, SEEK_CUR);
-				break;
 			}
 		}
 	}