XEEN: gcc compilation fixes

7 files changed, 17 insertions, 9 deletions

diff --git a/engines/xeen/dialogs_input.cpp b/engines/xeen/dialogs_input.cpp
index 5833733353..40b8847d14 100644
--- a/engines/xeen/dialogs_input.cpp
+++ b/engines/xeen/dialogs_input.cpp
@@ -37,7 +37,7 @@ int Input::show(XeenEngine *vm, Window *window, Common::String &line,
 
 int Input::getString(Common::String &line, uint maxLen, int maxWidth, bool isNumeric) {
 	_vm->_noDirectionSense = true;
-	Common::String msg = Common::String::format("\x3""l\t000\x4%03d\x0""c", maxWidth);
+	Common::String msg = Common::String::format("\x3""l\t000\x4%03d\x3""c", maxWidth);
 	_window->writeString(msg);
 	_window->update();
 
diff --git a/engines/xeen/dialogs_options.cpp b/engines/xeen/dialogs_options.cpp
index 4b4974b9aa..757634a2ad 100644
--- a/engines/xeen/dialogs_options.cpp
+++ b/engines/xeen/dialogs_options.cpp
@@ -110,7 +110,7 @@ void OptionsMenu::showTitles1(SpriteResource &sprites) {
 	while (!_vm->shouldQuit() && !events.isKeyMousePressed()) {
 		events.updateGameCounter();
 
-		frameNum = ++frameNum % (_vm->getGameID() == GType_WorldOfXeen ? 5 : 10);
+		frameNum = (frameNum + 1) % (_vm->getGameID() == GType_WorldOfXeen ? 5 : 10);
 		screen.restoreBackground();
 		sprites.draw(screen, frameNum);
 
@@ -211,7 +211,7 @@ void WorldOptionsMenu::showContents(SpriteResource &title1, bool waitFlag) {
 	events.updateGameCounter();
 	
 	// Draw the background frame in a continous cycle
-	_bgFrame = ++_bgFrame % 5;
+	_bgFrame = (_bgFrame + 1) % 5;
 	title1.draw(screen._windows[0], _bgFrame);
 
 	// Draw the basic frame for the optitons menu and title text
diff --git a/engines/xeen/dialogs_query.cpp b/engines/xeen/dialogs_query.cpp
index c982b8acd2..abaddafe69 100644
--- a/engines/xeen/dialogs_query.cpp
+++ b/engines/xeen/dialogs_query.cpp
@@ -105,7 +105,7 @@ bool YesNo::execute(bool type, bool townFlag) {
 	Screen &screen = *_vm->_screen;
 	Town &town = *_vm->_town;
 	SpriteResource confirmSprites;
-	int numFrames;
+	//int numFrames;
 	bool result = false;
 
 	Mode oldMode = _vm->_mode;
@@ -130,10 +130,10 @@ bool YesNo::execute(bool type, bool townFlag) {
 		
 		if (town.isActive()) {
 			town.drawTownAnim(townFlag);
-			numFrames = 3;
+			//numFrames = 3;
 		} else {
 			intf.draw3d(true);
-			numFrames = 1;
+			//numFrames = 1;
 		}
 
 		events.wait(3, true);
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs_spells.cpp
index 7cde5f37ef..b17555260d 100644
--- a/engines/xeen/dialogs_spells.cpp
+++ b/engines/xeen/dialogs_spells.cpp
@@ -912,6 +912,8 @@ int Teleport::execute() {
 	case DIR_WEST:
 		pt.x -= numSquares;
 		break;
+	default:
+		break;
 	}
 
 	v = map.mazeLookup(pt, map._isOutdoors ? 0xF : 0xFFFF, 0);
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 3225831879..9f9df190f7 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -513,6 +513,8 @@ void Interface::perform() {
 			case DIR_WEST:
 				--party._mazePosition.x;
 				break;
+			default:
+				break;
 			}
 			chargeStep();
 			stepTime();
@@ -1230,6 +1232,8 @@ void Interface::bash(const Common::Point &pt, Direction direction) {
 				case DIR_WEST:
 					map.setWall(Common::Point(pt.x - 1, pt.y), DIR_EAST, 3);
 					break;
+				default:
+					break;
 				}
 			}
 		}
diff --git a/engines/xeen/interface_map.cpp b/engines/xeen/interface_map.cpp
index f5bf2af187..6dd98efefd 100644
--- a/engines/xeen/interface_map.cpp
+++ b/engines/xeen/interface_map.cpp
@@ -27,8 +27,6 @@
 
 namespace Xeen {
 
-static bool debugFlag = false;
-
 OutdoorDrawList::OutdoorDrawList() : _sky1(_data[0]), _sky2(_data[1]), 
 	_groundSprite(_data[2]), _attackImgs1(&_data[124]), _attackImgs2(&_data[95]),
 	_attackImgs3(&_data[76]), _attackImgs4(&_data[53]), _groundTiles(&_data[3]) {
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 177bb5d146..03a24b434a 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -304,6 +304,8 @@ void Scripts::openGrate(int wallVal, int action) {
 		case DIR_WEST:
 			pt.x--;
 			break;
+		default:
+			break;
 		}
 
 		map.setCellSurfaceFlags(pt, 0x80);
@@ -1084,7 +1086,7 @@ void Scripts::cmdSeatTextSml(Common::Array<byte> &params) {
 	Interface &intf = *_vm->_interface;
 
 	intf._screenText = Common::String::format("\x2\f08\x3""c\t116\v090%s\x3l\fd\x1",
-		_message);
+		_message.c_str());
 	intf._upDoorText = true;
 	intf.draw3d(true);
 
@@ -1227,7 +1229,9 @@ void Scripts::cmdDisplayBottomTwoLines(Common::Array<byte> &params) {
 	Map &map = *_vm->_map;
 	Window &w = _vm->_screen->_windows[12];
 
+	warning("TODO: cmdDisplayBottomTwoLines");
 	Common::String msg = Common::String::format("\r\x03c\t000\v007%s\n\n%s",
+		"",
 		map._events._text[params[1]].c_str());
 	w.close();
 	w.open();