[Scummvm-git-logs] scummvm master -> 32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a

[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:
32a6f0b376 CGE2: Fix Missing Default Switch Cases


Commit: 32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a
    https://github.com/scummvm/scummvm/commit/32a6f0b376dd98abd59ae8e9c61bce50f58ffa1a
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-16T22:53:54+01:00

Commit Message:
CGE2: Fix Missing Default Switch Cases

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

Changed paths:
    engines/cge2/bitmap.cpp
    engines/cge2/hero.cpp
    engines/cge2/vga13h.cpp


diff --git a/engines/cge2/bitmap.cpp b/engines/cge2/bitmap.cpp
index 590d9f0..1423992 100644
--- a/engines/cge2/bitmap.cpp
+++ b/engines/cge2/bitmap.cpp
@@ -308,6 +308,9 @@ bool Bitmap::solidAt(V2D pos) {
 		case kBmpREP:
 			w = 1;
 			break;
+		case kBmpCPY:
+		default:
+			break;
 		}
 		m += w;
 	}
@@ -325,6 +328,7 @@ bool Bitmap::solidAt(V2D pos) {
 
 		n += w;
 		switch (t) {
+		default:
 		case kBmpEOI:
 			return false;
 		case kBmpSKP:
diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp
index 42ae67c..6dbfc5e 100644
--- a/engines/cge2/hero.cpp
+++ b/engines/cge2/hero.cpp
@@ -155,6 +155,8 @@ Sprite *Hero::expand() {
 					case 0xFE:
 						s->_next = seqcnt - 1;
 						break;
+					default:
+						break;
 					}
 					if (s->_next > maxnxt)
 						maxnxt = s->_next;
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 8b8acb6..fab61b3 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -406,6 +406,8 @@ Sprite *Sprite::expand() {
 					case 0xFE:
 						s->_next = seqcnt - 1;
 						break;
+					default:
+						break;
 					}
 					if (s->_next > maxnxt)
 						maxnxt = s->_next;
@@ -1149,6 +1151,7 @@ void Bitmap::show(V2D pos) {
 			while (count-- > 0) {
 				// Transfer operation
 				switch (cmd) {
+				default:
 				case 1:
 					// SKIP
 					break;