[Scummvm-git-logs] scummvm master -> d618cc983a4fb561969c7a2cbf40c214e7358bb1

digitall 547637+digitall at users.noreply.github.com
Thu Oct 3 02:42:36 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:
d618cc983a MACVENTURE: Add Missing Switch Default Cases


Commit: d618cc983a4fb561969c7a2cbf40c214e7358bb1
    https://github.com/scummvm/scummvm/commit/d618cc983a4fb561969c7a2cbf40c214e7358bb1
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-03T01:39:23+01:00

Commit Message:
MACVENTURE: Add Missing Switch Default Cases

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

Changed paths:
    engines/macventure/image.cpp
    engines/macventure/macventure.cpp
    engines/macventure/text.cpp


diff --git a/engines/macventure/image.cpp b/engines/macventure/image.cpp
index a899341..2fc884a 100644
--- a/engines/macventure/image.cpp
+++ b/engines/macventure/image.cpp
@@ -150,6 +150,9 @@ void ImageAsset::decodePPIC(ObjID id, Common::Array<byte> &data, uint &bitHeight
 	case MacVenture::kPPIC3:
 		decodePPIC3(stream, data, bitHeight, bitWidth, rowBytes);
 		break;
+	default:
+		warning("decodePPIC(): Unknown mode!");
+		break;
 	}
 
 	delete baseStream;
diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index fb1ddc1..4de266a 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -313,9 +313,11 @@ void MacVentureEngine::refreshReady() {
 		_cmdReady = _currentSelection.size() != 0;
 		break;
 	case 2:
-		if (_destObject > 0) // We have a destination seleted
+		if (_destObject > 0) // We have a destination selected
 			_cmdReady = true;
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/macventure/text.cpp b/engines/macventure/text.cpp
index 60d7ea1..8e3223e 100644
--- a/engines/macventure/text.cpp
+++ b/engines/macventure/text.cpp
@@ -195,6 +195,8 @@ Common::String TextAsset::getNoun(ObjID subval) {
 		case 3:
 			name = _engine->getPrefixString(2, obj) + name;
 			break;
+		default:
+			break;
 		}
 	}
 	if (name.size() && (subval & 4)) {





More information about the Scummvm-git-logs mailing list