[Scummvm-git-logs] scummvm master -> 3544fe355ab8247101325264d92029e872ddc54c

[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:
3544fe355a TUCKER: Fix Missing Default Switch Cases


Commit: 3544fe355ab8247101325264d92029e872ddc54c
    https://github.com/scummvm/scummvm/commit/3544fe355ab8247101325264d92029e872ddc54c
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-09T17:54:34Z

Commit Message:
TUCKER: Fix Missing Default Switch Cases

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

Changed paths:
    engines/tucker/graphics.cpp
    engines/tucker/resource.cpp
    engines/tucker/sequences.cpp
    engines/tucker/tucker.cpp


diff --git a/engines/tucker/graphics.cpp b/engines/tucker/graphics.cpp
index 3a6bd22..9ab672c 100644
--- a/engines/tucker/graphics.cpp
+++ b/engines/tucker/graphics.cpp
@@ -188,6 +188,7 @@ void Graphics::drawStringChar(uint8 *dst, int xDst, int yDst, int pitch, uint8 c
 void Graphics::setCharset(CharsetType type) {
 	_charsetType = type;
 	switch (type) {
+	default:
 	case kCharsetTypeDefault:
 		_charset._charW = 10;
 		_charset._charH = 10;
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 59b1ca1..46932b1 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -120,6 +120,8 @@ public:
 					state = 2;
 				}
 				break;
+			default:
+				break;
 			}
 			++_pos;
 		}
@@ -135,6 +137,8 @@ public:
 		case kDataTokenEx:
 			token = "!!";
 			break;
+		default:
+			break;
 		}
 		int tokenLen = strlen(token);
 		while (_pos < _dataSize - tokenLen) {
@@ -252,6 +256,8 @@ Audio::RewindableAudioStream *CompressedSound::load(CompressedSoundType type, in
 			offset = kCompressedSoundDataFileHeaderSize + 24;
 		}
 		break;
+	default:
+		break;
 	}
 	if (offset == 0) {
 		return nullptr;
@@ -295,6 +301,8 @@ void TuckerEngine::loadImage(const char *fname, uint8 *dst, int type) {
 				*p = '-';
 				tryOpen = true;
 				break;
+			default:
+				break;
 			}
 		}
 		if (!tryOpen || !f.open(filename)) {
@@ -890,6 +898,8 @@ void TuckerEngine::loadFx() {
 					s->_flagValueStopFx = t.getNextInteger();
 				}
 				break;
+			default:
+				break;
 			}
 			if (s->_type == 8) {
 				// type 8 is basically a pointer to another type 6 sample
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 557b2c8..a923481 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -142,6 +142,8 @@ void TuckerEngine::handleCreditsSequence() {
 				case 5:
 					filename = "loc78.pcx";
 					break;
+				default:
+					break;
 				}
 				if (!filename.empty())
 					loadImage(filename.c_str(), _quadBackgroundGfxBuf, 2);
@@ -534,6 +536,8 @@ void AnimationSequencePlayer::mainLoop() {
 	case kFirstAnimationSequenceGame:
 		_updateFunc = _gameSeqUpdateFuncs;
 		break;
+	default:
+		break;
 	}
 	_updateFuncIndex = 0;
 	_changeToNextSequence = true;
@@ -623,6 +627,8 @@ Audio::RewindableAudioStream *AnimationSequencePlayer::loadSound(int index, Anim
 		case kAnimationSoundTypeWAV:
 			stream = Audio::makeWAVStream(&f, DisposeAfterUse::NO);
 			break;
+		default:
+			break;
 		}
 
 	}
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 607a81a..29ce41c 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -655,6 +655,8 @@ void TuckerEngine::parseEvents() {
 			case '.':
 				_inputKeys[kInputKeySkipSpeech] = true;
 				break;
+			default:
+				break;
 			}
 			switch (ev.kbd.keycode) {
 			case Common::KEYCODE_f:
@@ -908,6 +910,8 @@ void TuckerEngine::updateCharPosition() {
 					}
 					_speechSoundNum = 281 + _flagsTable[200];
 					break;
+				default:
+					break;
 				}
 			}
 			_speechSoundNum += 1865;
@@ -933,6 +937,8 @@ void TuckerEngine::updateCharPosition() {
 				return;
 			}
 			break;
+		default:
+			break;
 		}
 	}
 	int actionKey = _currentActionObj2Num * 1000000 + _currentInfoString2SourceType * 100000 + _currentActionVerb * 10000 + _currentInfoString1SourceType * 1000 + _currentActionObj1Num;
@@ -1628,6 +1634,8 @@ void TuckerEngine::updateSoundsTypes3_4() {
 				return;
 			}
 			break;
+		default:
+			break;
 		}
 	}
 }
@@ -2087,6 +2095,8 @@ const uint8 *TuckerEngine::getStringBuf(int type) const {
 	case 3:
 		p = _objTxtBuf;
 		break;
+	default:
+		break;
 	}
 	return p;
 }
@@ -2357,6 +2367,8 @@ void TuckerEngine::updateCharacterAnimation() {
 			case 4:
 				num = 2;
 				break;
+			default:
+				break;
 			}
 		}
 		_currentSpriteAnimationLength = _spriteAnimationsTable[num]._numParts;
@@ -3513,6 +3525,8 @@ int TuckerEngine::executeTableInstruction() {
 		// opcodes mapped here are treated as NOOPs
 		readTableInstructionParam(3);
 		return 0;
+	default:
+		break;
 	}
 	return 2;
 }
@@ -3633,6 +3647,8 @@ void TuckerEngine::setSelectedObjectKey() {
 			_selectedObject._xPos = _xPosCurrent;
 			_selectedObject._yPos = _yPosCurrent;
 			break;
+		default:
+			break;
 		}
 	}
 	if (_selectedObject._yPos == 0) {
@@ -3768,6 +3784,8 @@ void TuckerEngine::handleMouseClickOnInventoryObject() {
 			}
 		}
 		break;
+	default:
+		break;
 	}
 }