[Scummvm-cvs-logs] scummvm master -> 243bb0dea766e30f52826d523d5f40146b3c5bc3

[eriktorbjorn]

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:
243bb0dea7 AVALANCHE: Silence GCC warnings


Commit: 243bb0dea766e30f52826d523d5f40146b3c5bc3
    https://github.com/scummvm/scummvm/commit/243bb0dea766e30f52826d523d5f40146b3c5bc3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-02-12T13:15:28-08:00

Commit Message:
AVALANCHE: Silence GCC warnings

Mainly, GCC complained about case labels having a value less than
the minimum value for the type. Probably because character literals
may be signed or unsigned, while _trigger is always unsigned.

Changed paths:
    engines/avalanche/help.cpp



diff --git a/engines/avalanche/help.cpp b/engines/avalanche/help.cpp
index 12ea31e..c8b71e0 100644
--- a/engines/avalanche/help.cpp
+++ b/engines/avalanche/help.cpp
@@ -93,7 +93,7 @@ void Help::switchPage(byte which) {
 		_buttons[y]._trigger = file.readByte();
 		if (_buttons[y]._trigger == 177)
 			break;
-		byte index = file.readByte();
+		index = file.readByte();
 		if (_buttons[y]._trigger != 0)
 			_vm->_graphics->helpDrawButton(13 + (y + 1) * 27, index);
 		_buttons[y]._whither = file.readByte(); // This is the position to jump to.
@@ -103,10 +103,10 @@ void Help::switchPage(byte which) {
 		case 254:
 			text = Common::String("Esc");
 			break;
-		case 'Ö':
+		case 214: // 'Ö'
 			text = Common::String(24);
 			break;
-		case 'Ø':
+		case 216: // 'Ø'
 			text = Common::String(25);
 			break;
 		default: