Merge remote branch 'upstream/master' into pegasus

Conflicts:
	video/qt_decoder.cpp

9 files changed, 63 insertions, 68 deletions

diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index 5d972f5658..90708163f5 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -63,7 +63,7 @@ static const HugoGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			Common::GUIO_NONE
+			GUIO0()
 		},
 		kGameTypeHugo1
 	},
@@ -75,7 +75,7 @@ static const HugoGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			GF_PACKED,
-			Common::GUIO_NONE
+			GUIO0()
 		},
 		kGameTypeHugo1
 	},
@@ -87,7 +87,7 @@ static const HugoGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			GF_PACKED,
-			Common::GUIO_NONE
+			GUIO0()
 		},
 		kGameTypeHugo2
 	},
@@ -99,7 +99,7 @@ static const HugoGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			GF_PACKED,
-			Common::GUIO_NONE
+			GUIO0()
 		},
 		kGameTypeHugo2
 	},
@@ -111,7 +111,7 @@ static const HugoGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			GF_PACKED,
-			Common::GUIO_NONE
+			GUIO0()
 		},
 		kGameTypeHugo3
 	},
@@ -123,7 +123,7 @@ static const HugoGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			GF_PACKED,
-			Common::GUIO_NONE
+			GUIO0()
 		},
 		kGameTypeHugo3
 	},
diff --git a/engines/hugo/game.h b/engines/hugo/game.h
index 5db57789dc..b1c5f407b3 100644
--- a/engines/hugo/game.h
+++ b/engines/hugo/game.h
@@ -66,7 +66,7 @@ enum cycle_t {kCycleInvisible, kCycleAlmostInvisible, kCycleNotCycling, kCycleFo
 /**
  * Enumerate sequence index matching direction of travel
  */
-enum {RIGHT, LEFT, DOWN, _UP};
+enum {SEQ_RIGHT, SEQ_LEFT, SEQ_DOWN, SEQ_UP};
 
 enum font_t {LARGE_ROMAN, MED_ROMAN, NUM_GDI_FONTS, INIT_FONTS, DEL_FONTS};
 
diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp
index ecdbb3b4c6..831dc88dea 100644
--- a/engines/hugo/object_v1d.cpp
+++ b/engines/hugo/object_v1d.cpp
@@ -205,15 +205,15 @@ void ObjectHandler_v1d::moveObjects() {
 					if (!obj->vx) {                 // Got 4 directions
 						if (obj->vx != obj->oldvx) {// vx just stopped
 							if (dy > 0)
-								obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[_UP].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 						}
 					} else if (obj->vx != obj->oldvx) {
 						if (dx > 0)
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 				}
 
@@ -239,15 +239,15 @@ void ObjectHandler_v1d::moveObjects() {
 						if (!obj->vx && (obj->seqNumb > 2)) {
 							if (obj->vx != obj->oldvx) { // vx just stopped
 								if (obj->vy > 0)
-									obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 								else
-									obj->currImagePtr = obj->seqList[_UP].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 							}
 						} else if (obj->vx != obj->oldvx) {
 							if (obj->vx > 0)
-								obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 						}
 
 						if (obj->vx || obj->vy)
diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp
index 11c09176e5..4388ef5520 100644
--- a/engines/hugo/object_v1w.cpp
+++ b/engines/hugo/object_v1w.cpp
@@ -208,24 +208,24 @@ void ObjectHandler_v1w::moveObjects() {
 					if (!obj->vx) {                 // Got 4 directions
 						if (obj->vx != obj->oldvx) { // vx just stopped
 							if (dy >= 0)
-								obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[_UP].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 						}
 					} else if (obj->vx != obj->oldvx) {
 						if (dx > 0)
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 					break;
 				case 3:
 				case 2:
 					if (obj->vx != obj->oldvx) {    // vx just stopped
 						if (dx > 0)                 // Left & right only
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 					break;
 				}
@@ -252,15 +252,15 @@ void ObjectHandler_v1w::moveObjects() {
 						if (!obj->vx && (obj->seqNumb >= 4)) {
 							if (obj->vx != obj->oldvx) { // vx just stopped
 								if (obj->vy > 0)
-									obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 								else
-									obj->currImagePtr = obj->seqList[_UP].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 							}
 						} else if (obj->vx != obj->oldvx) {
 							if (obj->vx > 0)
-								obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 						}
 					}
 					obj->oldvx = obj->vx;
diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp
index c9e5104972..4a22fab2c0 100644
--- a/engines/hugo/object_v2d.cpp
+++ b/engines/hugo/object_v2d.cpp
@@ -211,24 +211,24 @@ void ObjectHandler_v2d::moveObjects() {
 					if (!obj->vx) {                 // Got 4 directions
 						if (obj->vx != obj->oldvx) { // vx just stopped
 							if (dy > 0)
-								obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[_UP].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 						}
 					} else if (obj->vx != obj->oldvx) {
 						if (dx > 0)
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 					break;
 				case 3:
 				case 2:
 					if (obj->vx != obj->oldvx) {    // vx just stopped
 						if (dx > 0)                 // Left & right only
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 					break;
 				}
@@ -255,15 +255,15 @@ void ObjectHandler_v2d::moveObjects() {
 						if (!obj->vx && (obj->seqNumb >= 4)) {
 							if (obj->vx != obj->oldvx) { // vx just stopped
 								if (obj->vy > 0)
-									obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 								else
-									obj->currImagePtr = obj->seqList[_UP].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 							}
 						} else if (obj->vx != obj->oldvx) {
 							if (obj->vx > 0)
-								obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 						}
 					}
 					obj->oldvx = obj->vx;
diff --git a/engines/hugo/object_v3d.cpp b/engines/hugo/object_v3d.cpp
index 07bd5e0c7f..cde7f5fd62 100644
--- a/engines/hugo/object_v3d.cpp
+++ b/engines/hugo/object_v3d.cpp
@@ -92,24 +92,24 @@ void ObjectHandler_v3d::moveObjects() {
 					if (!obj->vx) {                 // Got 4 directions
 						if (obj->vx != obj->oldvx) { // vx just stopped
 							if (dy >= 0)
-								obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[_UP].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 						}
 					} else if (obj->vx != obj->oldvx) {
 						if (dx > 0)
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 					break;
 				case 3:
 				case 2:
 					if (obj->vx != obj->oldvx) {    // vx just stopped
 						if (dx > 0)                 // Left & right only
-							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 						else
-							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+							obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 					}
 					break;
 				}
@@ -136,15 +136,15 @@ void ObjectHandler_v3d::moveObjects() {
 						if (!obj->vx && (obj->seqNumb >= 4)) {
 							if (obj->vx != obj->oldvx) { // vx just stopped
 								if (obj->vy > 0)
-									obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 								else
-									obj->currImagePtr = obj->seqList[_UP].seqPtr;
+									obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 							}
 						} else if (obj->vx != obj->oldvx) {
 							if (obj->vx > 0)
-								obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 							else
-								obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+								obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 						}
 					}
 					obj->oldvx = obj->vx;
diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp
index bbf6c39f13..a0ad4c0986 100644
--- a/engines/hugo/parser.cpp
+++ b/engines/hugo/parser.cpp
@@ -391,8 +391,6 @@ void Parser::command(const char *format, ...) {
 
 	va_list marker;
 	va_start(marker, format);
-//	TODO:
-//	_vm->_line = Common::String::vformat(format, marker);
 	vsprintf(_vm->_line, format, marker);
 	va_end(marker);
 
diff --git a/engines/hugo/route.cpp b/engines/hugo/route.cpp
index af8ec3427d..281aacf031 100644
--- a/engines/hugo/route.cpp
+++ b/engines/hugo/route.cpp
@@ -67,35 +67,35 @@ void Route::setDirection(const uint16 keyCode) {
 	switch (keyCode) {
 	case Common::KEYCODE_UP:
 	case Common::KEYCODE_KP8:
-		obj->currImagePtr = obj->seqList[_UP].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
 		break;
 	case Common::KEYCODE_DOWN:
 	case Common::KEYCODE_KP2:
-		obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
 		break;
 	case Common::KEYCODE_LEFT:
 	case Common::KEYCODE_KP4:
-		obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 		break;
 	case Common::KEYCODE_RIGHT:
 	case Common::KEYCODE_KP6:
-		obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 		break;
 	case Common::KEYCODE_HOME:
 	case Common::KEYCODE_KP7:
-		obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 		break;
 	case Common::KEYCODE_END:
 	case Common::KEYCODE_KP1:
-		obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
 		break;
 	case Common::KEYCODE_PAGEUP:
 	case Common::KEYCODE_KP9:
-		obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 		break;
 	case Common::KEYCODE_PAGEDOWN:
 	case Common::KEYCODE_KP3:
-		obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+		obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
 		break;
 	}
 }
@@ -231,48 +231,48 @@ void Route::segment(int16 x, int16 y) {
 	if (_vm->_hero->x < x1) {
 		// Hero x not in segment, search x1..x2
 		// Find all segments above current
-		for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) {
+		for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) {
 			if (_boundaryMap[y - 1][x] == 0)
 				segment(x, y - 1);
 		}
 
 		// Find all segments below current
-		for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) {
+		for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) {
 			if (_boundaryMap[y + 1][x] == 0)
 				segment(x, y + 1);
 		}
 	} else if (_vm->_hero->x + kHeroMaxWidth > x2) {
 		// Hero x not in segment, search x1..x2
 		// Find all segments above current
-		for (x = x2; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x >= x1; x--) {
+		for (x = x2; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x >= x1; x--) {
 			if (_boundaryMap[y - 1][x] == 0)
 				segment(x, y - 1);
 		}
 
 		// Find all segments below current
-		for (x = x2; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x >= x1; x--) {
+		for (x = x2; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x >= x1; x--) {
 			if (_boundaryMap[y + 1][x] == 0)
 				segment(x, y + 1);
 		}
 	} else {
 		// Organize search around hero x position - this gives
 		// better chance for more direct route.
-		for (x = _vm->_hero->x; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) {
+		for (x = _vm->_hero->x; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) {
 			if (_boundaryMap[y - 1][x] == 0)
 				segment(x, y - 1);
 		}
 
-		for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x < _vm->_hero->x; x++) {
+		for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x < _vm->_hero->x; x++) {
 			if (_boundaryMap[y - 1][x] == 0)
 				segment(x, y - 1);
 		}
 
-		for (x = _vm->_hero->x; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) {
+		for (x = _vm->_hero->x; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) {
 			if (_boundaryMap[y + 1][x] == 0)
 				segment(x, y + 1);
 		}
 
-		for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x < _vm->_hero->x; x++) {
+		for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x < _vm->_hero->x; x++) {
 			if (_boundaryMap[y + 1][x] == 0)
 				segment(x, y + 1);
 		}
diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp
index 384b3ace8f..892c144393 100644
--- a/engines/hugo/schedule.cpp
+++ b/engines/hugo/schedule.cpp
@@ -1539,7 +1539,7 @@ void Scheduler_v1d::promptAction(act *action) {
 	response.toLowercase();
 
 	char resp[256];
-	strncpy(resp, response.c_str(), 256);
+	Common::strlcpy(resp, response.c_str(), 256);
 
 	if (action->a3.encodedFl)
 		decodeString(resp);
@@ -1585,12 +1585,9 @@ void Scheduler_v2d::promptAction(act *action) {
 	bool  found = false;
 	const char *tmpStr;                                   // General purpose string ptr
 
-	char resp[256];
-	strncpy(resp, response.c_str(), 256);
-
 	for (int dx = 0; !found && (action->a3.responsePtr[dx] != -1); dx++) {
 		tmpStr = _vm->_file->fetchString(action->a3.responsePtr[dx]);
-		if (strstr(Utils::strlwr(resp), tmpStr))
+		if (response.contains(tmpStr))
 			found = true;
 	}