[Scummvm-git-logs] scummvm master -> 9ac4df52a1964b4a9883d4fe176a1591c536a8a5

digitall 547637+digitall at users.noreply.github.com
Sat Oct 19 20:57:02 CEST 2019


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:
9ac4df52a1 GROOVIE: Fix Missing Default Switch Cases


Commit: 9ac4df52a1964b4a9883d4fe176a1591c536a8a5
    https://github.com/scummvm/scummvm/commit/9ac4df52a1964b4a9883d4fe176a1591c536a8a5
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-19T19:53:15+01:00

Commit Message:
GROOVIE: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

Changed paths:
    engines/groovie/cell.cpp
    engines/groovie/groovie.cpp
    engines/groovie/roq.cpp
    engines/groovie/script.cpp


diff --git a/engines/groovie/cell.cpp b/engines/groovie/cell.cpp
index 5fceb8f..3177963 100644
--- a/engines/groovie/cell.cpp
+++ b/engines/groovie/cell.cpp
@@ -297,6 +297,8 @@ void CellGame::countAllCells() {
 		case 4:
 			_board[52]++;
 			break;
+		default:
+			break;
 		}
 	}
 }
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 8edbb29..3b21dd5 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -119,6 +119,8 @@ Common::Error GroovieEngine::run() {
 		initGraphics(640, 480);
 		_pixelFormat = Graphics::PixelFormat::createFormatCLUT8();
 		break;
+	default:
+		break;
 	}
 
 	// Create debugger. It requires GFX to be initialized
@@ -162,6 +164,8 @@ Common::Error GroovieEngine::run() {
 		_videoPlayer = new ROQPlayer(this);
 #endif
 		break;
+	default:
+		break;
 	}
 
 	// Detect ScummVM Music Enhancement Project presence (T7G only)
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 2e9a394..a26d90a 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -437,6 +437,8 @@ void ROQPlayer::processBlockQuadVectorBlock(int baseX, int baseY, int8 Mx, int8
 			}
 		}
 		break;
+	default:
+		break;
 	}
 }
 
@@ -463,6 +465,8 @@ void ROQPlayer::processBlockQuadVectorBlockSub(int baseX, int baseY, int8 Mx, in
 		paint2(_file->readByte(), baseX    , baseY + 2);
 		paint2(_file->readByte(), baseX + 2, baseY + 2);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index c66f0f5..376519c 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -58,6 +58,9 @@ Script::Script(GroovieEngine *vm, EngineVersion version) :
 	case kGroovieV2:
 		_opcodes = _opcodesV2;
 		break;
+	default:
+		_opcodes = nullptr;
+		break;
 	}
 
 	// Prepare the variables
@@ -566,6 +569,9 @@ void Script::o_videofromref() {			// 0x09
 			debugCN(1, kDebugScript, " (This video is special somehow!)");
 			warning("(This video (0x%04X) is special somehow!)", fileref);
 		}
+
+	default:
+		break;
 	}
 	if (fileref != _videoRef) {
 		debugCN(1, kDebugScript, "\n");





More information about the Scummvm-git-logs mailing list