[Scummvm-git-logs] scummvm master -> 0b0acecfe6f5e674b710b25b7f831a6863c8e783

[digitall]

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:
0b0acecfe6 HYPNO: Fix GCC Compiler Warnings


Commit: 0b0acecfe6f5e674b710b25b7f831a6863c8e783
    https://github.com/scummvm/scummvm/commit/0b0acecfe6f5e674b710b25b7f831a6863c8e783
Author: D G Turner (digitall at scummvm.org)
Date: 2021-10-31T19:30:21Z

Commit Message:
HYPNO: Fix GCC Compiler Warnings

Changed paths:
    engines/hypno/arcade.cpp
    engines/hypno/spider/arcade.cpp
    engines/hypno/wet/arcade.cpp


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 5feb0427b9..dffb769a12 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -126,7 +126,7 @@ void HypnoEngine::runArcade(ArcadeShooting &arc) {
 		_playerFrameSep++;
 	}
 
-	if (_playerFrameSep == _playerFrames.size())
+	if (_playerFrameSep == (int)_playerFrames.size())
 		error("No player separator frame found!");
 	debugC(1, kHypnoDebugArcade, "Separator frame found at %d", _playerFrameSep);
 
@@ -206,7 +206,7 @@ void HypnoEngine::runArcade(ArcadeShooting &arc) {
 			break;
 		}
 
-		if (!arc.transitionVideo.empty() && background.decoder->getCurFrame() >= arc.transitionTime) {
+		if (!arc.transitionVideo.empty() && background.decoder->getCurFrame() >= (int)arc.transitionTime) {
 			debugC(1, kHypnoDebugArcade, "Playing transition %s", arc.transitionVideo.c_str());
 			arc.transitionTime = background.decoder->getFrameCount() + 1;
 			MVideo video(arc.transitionVideo, Common::Point(0, 0), false, false, false);
@@ -227,7 +227,7 @@ void HypnoEngine::runArcade(ArcadeShooting &arc) {
 
 		if (shootSequence.size() > 0) {
 			ShootInfo si = shootSequence.front();
-			if (si.timestamp <= background.decoder->getCurFrame()) {
+			if ((int)si.timestamp <= background.decoder->getCurFrame()) {
 				shootSequence.pop_front();
 				for (Shoots::iterator it = arc.shoots.begin(); it != arc.shoots.end(); ++it) {
 					if (it->name == si.name && it->animation != "NONE") {
@@ -247,14 +247,14 @@ void HypnoEngine::runArcade(ArcadeShooting &arc) {
 		for (Shoots::iterator it = _shoots.begin(); it != _shoots.end(); ++it) {
 			if (it->video->decoder) {
 				int frame = it->video->decoder->getCurFrame();
-				if (frame > 0 && frame >= it->explosionFrame - 15 && !it->destroyed) {
+				if (frame > 0 && frame >= (int)(it->explosionFrame - 15) && !it->destroyed) {
 					hitPlayer();
 				}
 
-				if (frame > 0 && frame >= it->explosionFrame - 3 && !it->destroyed) {
+				if (frame > 0 && frame >= (int)(it->explosionFrame - 3) && !it->destroyed) {
 					skipVideo(*it->video);
 					_health = _health - it->damage;
-				} else if (frame > 0 && frame >= it->video->decoder->getFrameCount()-2) {
+				} else if (frame > 0 && frame >= (int)(it->video->decoder->getFrameCount() - 2)) {
 					skipVideo(*it->video);
 					shootsToRemove.push_back(i);
 				} else if (it->video->decoder->needsUpdate()) {
diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index ea8709a039..5d0229094e 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -51,7 +51,7 @@ void SpiderEngine::drawPlayer() {
 		_playerFrameIdx = orientationIndex[idx];
 	} else {
 		_playerFrameIdx++;
-		if (_playerFrameIdx >= _playerFrames.size())
+		if (_playerFrameIdx >= (int)_playerFrames.size())
 			_playerFrameIdx = 0;
 	}
 	drawImage(*_playerFrames[_playerFrameIdx], 60, 129, true);
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 8205d91b88..2d9701bb06 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -68,7 +68,7 @@ void WetEngine::drawPlayer() {
 		_playerFrameIdx = _playerFrameIdx % _playerFrameSep;
 	} else {
 		_playerFrameIdx++;
-		if (_playerFrameIdx >= _playerFrames.size())
+		if (_playerFrameIdx >= (int)_playerFrames.size())
 			_playerFrameIdx = 0;
 	}
 
@@ -81,7 +81,7 @@ void WetEngine::drawHealth() {
 	int s = _score;
 	if (_playerFrameIdx < _playerFrameSep) {
 		const chapterEntry *entry = _chapterTable[_levelId];
-		uint32 id = _levelId;
+		//uint32 id = _levelId;
 		_font->drawString(_compositeSurface, Common::String::format("ENERGY   %d%%", p), entry->energyPos[0], entry->energyPos[1], 65, c);
 		_font->drawString(_compositeSurface, Common::String::format("SCORE    %04d", s), entry->scorePos[0], entry->scorePos[1], 72, c);
 		// Objectives are always in the zero in the demo