[Scummvm-git-logs] scummvm master -> 95c0afa2c3f9b02e4b593f82e4d5a943aed91b16

digitall 547637+digitall at users.noreply.github.com
Mon Oct 14 04:57:38 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:
95c0afa2c3 AGI: Fix Missing Default Switch Cases


Commit: 95c0afa2c3f9b02e4b593f82e4d5a943aed91b16
    https://github.com/scummvm/scummvm/commit/95c0afa2c3f9b02e4b593f82e4d5a943aed91b16
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-14T03:54:10+01:00

Commit Message:
AGI: Fix Missing Default Switch Cases

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

Changed paths:
    engines/agi/agi.cpp
    engines/agi/checks.cpp
    engines/agi/console.cpp
    engines/agi/cycle.cpp
    engines/agi/detection.cpp
    engines/agi/global.cpp
    engines/agi/loader_v1.cpp
    engines/agi/loader_v2.cpp
    engines/agi/loader_v3.cpp
    engines/agi/motion.cpp
    engines/agi/preagi_mickey.cpp
    engines/agi/preagi_troll.cpp
    engines/agi/preagi_winnie.cpp
    engines/agi/saveload.cpp
    engines/agi/sound.cpp
    engines/agi/sound_2gs.cpp
    engines/agi/sound_pcjr.cpp
    engines/agi/sound_sarien.cpp
    engines/agi/text.cpp
    engines/agi/view.cpp


diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 73d9e09..5540331 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -138,6 +138,9 @@ int AgiEngine::agiInit() {
 		      (int)(getVersion() >> 12) & 0xF,
 		      (int)(getVersion()) & 0xFFF);
 		break;
+	default:
+		warning("Unknown AGI Emulation Version %x", (int)(getVersion() >> 12));
+		break;
 	}
 
 	if (getPlatform() == Common::kPlatformAmiga)
diff --git a/engines/agi/checks.cpp b/engines/agi/checks.cpp
index c67b6a5..35ac8cc 100644
--- a/engines/agi/checks.cpp
+++ b/engines/agi/checks.cpp
@@ -339,6 +339,8 @@ void AgiEngine::fixPosition(ScreenObjEntry *screenObj) {
 			dir = 0;
 			size++;
 			break;
+		default:
+			break;
 		}
 
 		count = size;
diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp
index 3729cd3..4e310a3 100644
--- a/engines/agi/console.cpp
+++ b/engines/agi/console.cpp
@@ -532,6 +532,9 @@ bool Console::Cmd_ScreenObj(int argc, const char **argv) {
 			}
 			debugPrintf("x: %d, y: %d, stepSize: %d, flag: %x\n", screenObj->move_x, screenObj->move_y, screenObj->move_stepSize, screenObj->move_flag);
 			break;
+		default:
+			debugPrintf("motion: UNKNOWN (%d)\n", screenObj->motionType);
+			break;
 		}
 	}
 	return true;
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index d09a950..f47d1e7 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -88,6 +88,8 @@ void AgiEngine::newRoom(int16 newRoomNr) {
 	case 4:
 		screenObjEgo->xPos = SCRIPT_WIDTH - screenObjEgo->xSize;
 		break;
+	default:
+		break;
 	}
 
 	uint16 agiVersion = getVersion();
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 39275c4..b442660 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -259,6 +259,10 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD
 		case GID_WINNIE:
 			*engine = new Agi::WinnieEngine(syst, gd);
 			break;
+		default:
+			res = false;
+			error("PreAGI engine: unknown gameID");
+			break;
 		}
 		break;
 	case Agi::GType_V1:
diff --git a/engines/agi/global.cpp b/engines/agi/global.cpp
index c44f9e6..f35bc23 100644
--- a/engines/agi/global.cpp
+++ b/engines/agi/global.cpp
@@ -62,6 +62,8 @@ void AgiEngine::setVar(int16 varNr, byte newValue) {
 	case VM_VAR_VOLUME:
 		setVolumeViaScripts(newValue);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/agi/loader_v1.cpp b/engines/agi/loader_v1.cpp
index 159e137..77e3882 100644
--- a/engines/agi/loader_v1.cpp
+++ b/engines/agi/loader_v1.cpp
@@ -156,6 +156,10 @@ int AgiLoader_v1::init() {
 		if (ec == errOK)
 			ec = loadDir_BC(_vm->_game.dirSound, BC_SNDDIR_SEC, BC_SNDDIR_MAX);
 		break;
+
+	default:
+		ec = errUnk;
+		break;
 	}
 
 	return ec;
@@ -303,6 +307,8 @@ int AgiLoader_v1::unloadResource(int16 resourceType, int16 resourceNr) {
 	case RESOURCETYPE_SOUND:
 		_vm->_sound->unloadSound(resourceNr);
 		break;
+	default:
+		break;
 	}
 
 	return errOK;
diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp
index bebde69..ddc8df3 100644
--- a/engines/agi/loader_v2.cpp
+++ b/engines/agi/loader_v2.cpp
@@ -129,6 +129,8 @@ int AgiLoader_v2::unloadResource(int16 resourceType, int16 resourceNr) {
 	case RESOURCETYPE_SOUND:
 		_vm->_sound->unloadSound(resourceNr);
 		break;
+	default:
+		break;
 	}
 
 	return errOK;
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index c21ad41..abfe650 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -186,6 +186,8 @@ int AgiLoader_v3::unloadResource(int16 resourceType, int16 resourceNr) {
 	case RESOURCETYPE_SOUND:
 		_vm->_sound->unloadSound(resourceNr);
 		break;
+	default:
+		break;
 	}
 
 	return errOK;
diff --git a/engines/agi/motion.cpp b/engines/agi/motion.cpp
index f408ba3..fd3a900 100644
--- a/engines/agi/motion.cpp
+++ b/engines/agi/motion.cpp
@@ -221,6 +221,8 @@ void AgiEngine::checkMotion(ScreenObjEntry *screenObj) {
 	case kMotionMoveObj:
 		motionMoveObj(screenObj);
 		break;
+	default:
+		break;
 	}
 
 	if ((_game.block.active && (~screenObj->flags & fIgnoreBlocks)) && screenObj->direction)
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index b55f279..52dde91 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -327,6 +327,8 @@ bool MickeyEngine::getMenuSelRow(MSA_MENU &menu, int *sel0, int *sel1, int iRow)
 	case 1:
 		sel = sel1;
 		break;
+	default:
+		break;
 	}
 	nWords = menu.row[iRow].count;
 	_clickToMove = false;
@@ -1887,6 +1889,8 @@ bool MickeyEngine::parse(int cmd, int arg) {
 			case 2:
 				getXtal(35);
 				break;
+			default:
+				break;
 			}
 		}
 		break;
@@ -2190,6 +2194,10 @@ bool MickeyEngine::parse(int cmd, int arg) {
 		_gameStateMickey.iRoom = arg;
 
 		return true;
+		break;
+
+	default:
+		break;
 	}
 
 	return false;
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index 9a6d985..37e780a 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -219,6 +219,8 @@ void TrollEngine::waitAnyKeyIntro() {
 			drawStr(22, 3, kColorDefault, IDS_TRO_INTRO_3);
 			g_system->updateScreen();
 			break;
+		default:
+			break;
 		}
 
 		iMsg++;
@@ -287,6 +289,8 @@ void TrollEngine::tutorial() {
 			case IDI_TRO_SEL_OPTION_3:
 				done = true;
 				break;
+			default:
+				break;
 			}
 		}
 
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index 8fb9dac..41ff714 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -372,6 +372,8 @@ int WinnieEngine::parser(int pc, int index, uint8 *buffer) {
 				dropObj(_room);
 				setTakeDrop(fCanSel);
 				break;
+			default:
+				break;
 			}
 		}
 
@@ -754,6 +756,8 @@ void WinnieEngine::drawMenu(char *szMenu, int iSel, int fCanSel[]) {
 		iRow = IDI_WTP_ROW_OPTION_4;
 		iCol = IDI_WTP_COL_DROP;
 		break;
+	default:
+		break;
 	}
 	drawStr(iRow, iCol - 1, IDA_DEFAULT, ">");
 	g_system->updateScreen();
@@ -788,6 +792,8 @@ void WinnieEngine::getMenuMouseSel(int *iSel, int fCanSel[], int x, int y) {
 		if (fCanSel[IDI_WTP_SEL_TAKE] && (x > IDI_WTP_COL_TAKE - 1) && (x < 33)) *iSel = IDI_WTP_SEL_TAKE;
 		if (fCanSel[IDI_WTP_SEL_DROP] && (x > IDI_WTP_COL_DROP - 1) && (x < 39)) *iSel = IDI_WTP_SEL_DROP;
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index fc4aea3..8edcf27 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -1041,6 +1041,8 @@ void AgiEngine::replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
 		agiLoadResource(RESOURCETYPE_VIEW, p1);
 		_sprites->addToPic(p1, p2, p3, p4, p5, p6, p7);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index f6d51ec..0b2eff8 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -66,6 +66,8 @@ AgiSound *AgiSound::createFromRawResource(uint8 *data, uint32 len, int resnum, i
 		} else {
 			return new PCjrSound(data, len, resnum);
 		}
+	default:
+		break;
 	}
 
 	warning("Sound resource (%d) has unknown type (0x%04x). Not using the sound", resnum, type);
diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp
index 4992b65..0f6738e 100644
--- a/engines/agi/sound_2gs.cpp
+++ b/engines/agi/sound_2gs.cpp
@@ -337,6 +337,8 @@ void SoundGen2GS::advanceMidiPlayer() {
 			case 7:
 				_channels[chn].setVolume(parm2);
 				break;
+			default:
+				break;
 			}
 			break;
 		case MIDI_PROGRAM_CHANGE:
diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 0a0c456..d859222 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -350,6 +350,8 @@ void SoundGenPCJr::writeData(uint8 val) {
 		case 3:
 			_channel[3].freqCount = _channel[2].freqCount * 2;
 			break;
+		default:
+			break;
 		}
 	} else if (val & 0x80) {
 		reg = (val >> 5) & 0x3;
diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp
index 5d93f6c..0548895 100644
--- a/engines/agi/sound_sarien.cpp
+++ b/engines/agi/sound_sarien.cpp
@@ -311,6 +311,9 @@ uint32 SoundGenSarien::mixSound() {
 			} else {
 				_chn[c].env = 0;
 			}
+			break;
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 4aa42ff..f9518b3 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -1192,6 +1192,8 @@ char *TextMgr::stringPrintf(const char *originalText) {
 				if (_vm->_game.logics[_vm->_game.curLogicNr].numTexts > i)
 					safeStrcat(resultString, stringPrintf(_vm->_game.logics[_vm->_game.curLogicNr].texts[i]));
 				break;
+			default:
+				break;
 			}
 
 			while (*originalText >= '0' && *originalText <= '9')
diff --git a/engines/agi/view.cpp b/engines/agi/view.cpp
index a13e40e..69bde84 100644
--- a/engines/agi/view.cpp
+++ b/engines/agi/view.cpp
@@ -72,6 +72,8 @@ void AgiEngine::updateView(ScreenObjEntry *screenObj) {
 			celNr--;
 		}
 		break;
+	default:
+		break;
 	}
 
 	setCel(screenObj, celNr);

More information about the Scummvm-git-logs mailing list