[Scummvm-git-logs] scummvm master -> 6412dc5f0e4b88cde6664f2a81ca094137cb98f6

dreammaster dreammaster at scummvm.org
Mon Nov 13 23:40:47 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6412dc5f0e XEEN: Fix compiler warnings


Commit: 6412dc5f0e4b88cde6664f2a81ca094137cb98f6
    https://github.com/scummvm/scummvm/commit/6412dc5f0e4b88cde6664f2a81ca094137cb98f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-13T17:40:44-05:00

Commit Message:
XEEN: Fix compiler warnings

Changed paths:
    engines/xeen/dialogs_input.cpp
    engines/xeen/dialogs_items.cpp
    engines/xeen/interface.cpp
    engines/xeen/interface_map.cpp
    engines/xeen/town.cpp
    engines/xeen/worldofxeen/darkside_cutscenes.cpp


diff --git a/engines/xeen/dialogs_input.cpp b/engines/xeen/dialogs_input.cpp
index ca41272..75654f6 100644
--- a/engines/xeen/dialogs_input.cpp
+++ b/engines/xeen/dialogs_input.cpp
@@ -283,7 +283,6 @@ int HowMuch::show(XeenEngine *vm) {
 }
 
 int HowMuch::execute() {
-	Map &map = *_vm->_map;
 	Party &party = *_vm->_party;
 	Screen &screen = *_vm->_screen;
 	Window &w = screen._windows[6];
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 227b570..4adab68 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -220,9 +220,10 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 					lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
 					lines[8].c_str()
 				));
+				break;
 
 			case ITEMMODE_BLACKSMITH: {
-				// Original uses var in this block that's never set?!
+				// TODO: Original uses var in this block that's never set?!
 				const int v1 = 0;
 				screen._windows[30].writeString(Common::String::format(Res.AVAILABLE_GOLD_COST,
 					Res.CATEGORY_NAMES[category],
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index ec27b8a..0090a58 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -295,7 +295,7 @@ void Interface::perform() {
 				scripts.openGrate(13, 1);
 				eventsFlag = _buttonValue != 0;
 			}
-
+			break;
 		case 6:
 			// Open grate being closed
 			if (!map._isOutdoors) {
diff --git a/engines/xeen/interface_map.cpp b/engines/xeen/interface_map.cpp
index dc6cec3..5d87151 100644
--- a/engines/xeen/interface_map.cpp
+++ b/engines/xeen/interface_map.cpp
@@ -965,6 +965,7 @@ void InterfaceMap::setMazeBits() {
 		break;
 	case 6:
 		++_wo[206];
+		break;
 	case 8:
 		++_wo[146];
 		break;
@@ -1208,6 +1209,7 @@ void InterfaceMap::setMazeBits() {
 		break;
 	case 10:
 		++_wo[237];
+		break;
 	case 11:
 		++_wo[157];
 		break;
@@ -1510,6 +1512,7 @@ void InterfaceMap::setMazeBits() {
 		break;
 	case 2:
 		++_wo[168];
+		break;
 	case 3:
 	case 12:
 		++_wo[88];
diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index fb5df83..f150305 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -499,6 +499,7 @@ Character *Town::doTownOptions(Character *c) {
 	case 4:
 		// Temple
 		c = doTempleOptions(c);
+		break;
 	case 5:
 		// Training
 		c = doTrainingOptions(c);
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index 9aad9b1..83d9323 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -107,6 +107,7 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 			break;
 		case 11:
 			sound.playFX(0);
+			break;
 		case 27:
 		case 30:
 			sound.playFX(3);





More information about the Scummvm-git-logs mailing list