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

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
99386a2b84 KINGDOM: Fix warning
353dd6ca72 JANITORIAL: Remove trailing whitespaces
a8401abea0 KINGDOM: Added missing override keywords


Commit: 99386a2b843a1a0a9abe31d516fe735b3ac8d987
    https://github.com/scummvm/scummvm/commit/99386a2b843a1a0a9abe31d516fe735b3ac8d987
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-07T00:05:11+02:00

Commit Message:
KINGDOM: Fix warning

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index 096030c479..e8bb9fc11c 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -1472,6 +1472,8 @@ int KingdomGame::getAKey() {
 				// _quit = true;
 			// }
 			break;
+		default:
+			break;
 		}
 	}
 


Commit: 353dd6ca7226ef452261751cc27c6ef3938cc44a
    https://github.com/scummvm/scummvm/commit/353dd6ca7226ef452261751cc27c6ef3938cc44a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-07T00:05:21+02:00

Commit Message:
JANITORIAL: Remove trailing whitespaces

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index e8bb9fc11c..5fd9c345fd 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -109,7 +109,7 @@ void KingdomGame::initVariables() {
 	_aTimerFlag = false;
 	_aTimer = 0;
 	_zoom = 0;
-	_wizard = false; 
+	_wizard = false;
 	_userInput = 0;
 //	_track = 0;
 //	_statMap = 0;
@@ -810,7 +810,7 @@ Common::Error KingdomGame::loadGameState(int slot) {
 	playSound(_soundNumber);
 	for (int i = 0; i < 7; i++)
 		_iconPic[i] = 89 + i;
-	
+
 	_frameStop = 0;
 	_gameMode = 0;
 	_asMode = false;
@@ -1131,7 +1131,7 @@ void KingdomGame::displayIcon(int reznum) {
 	fShowPic(reznum);
 	_bTimer = 76;
 	readMouse();
-	
+
 	while(_bTimer != 0 && _mouseButton == 0) {
 		checkTimers();
 		refreshSound();
@@ -1155,7 +1155,7 @@ void KingdomGame::setATimer() {
 
 	if (_logic->_nodeNum == 56 && _logic->_inventory[8] < 1 && _wizard)
 		wrkNodeNum = 80;
-	
+
 	for (int i = 0; i < 7; i++) {
 		int idx = _iconActTable[wrkNodeNum][i];
 		if (_logic->_inventory[idx] > 0) {
@@ -1246,7 +1246,7 @@ void KingdomGame::checkMainScreen() {
 					_iconPic[i] = 12 + idx;
 				else
 					_iconPic[i] = 89 + i;
-			} 
+			}
 		} else if (_iconSel != i && _iconPic[i] != 89 + i) {
 			if (_iconPic[i] != 12 + idx)
 				_iconPic[i] = 32;
@@ -1351,7 +1351,7 @@ void KingdomGame::checkMainScreen() {
 	}
 
 	int timer = 0;
-	int delta = 7; // CHECKME: the variable is the same than the one used for the first for(), and the value should therefore be 7  
+	int delta = 7; // CHECKME: the variable is the same than the one used for the first for(), and the value should therefore be 7
 	if (_skylarTimer != 0) {
 		delta = 772;
 		timer = _skylarTimer;
@@ -1642,7 +1642,7 @@ void KingdomGame::cursorType() {
 void KingdomGame::cursorTypeExit() {
 	if (_mouseValue >= 0x400)
 		_cursorDef = _cursorTable[_mouseValue - 0x400];
-	else 
+	else
 		_cursorDef = (_mouseValue != 0) ? 0x68 : 0x67;
 }
 


Commit: a8401abea041a700319c2dcf07790910831fe3ef
    https://github.com/scummvm/scummvm/commit/a8401abea041a700319c2dcf07790910831fe3ef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-07T00:06:25+02:00

Commit Message:
KINGDOM: Added missing override keywords

Changed paths:
    engines/kingdom/detection.cpp


diff --git a/engines/kingdom/detection.cpp b/engines/kingdom/detection.cpp
index ffce8f5f11..7aa2d4d9b9 100644
--- a/engines/kingdom/detection.cpp
+++ b/engines/kingdom/detection.cpp
@@ -80,20 +80,20 @@ public:
 		return "kingdom";
 	}
 
-	virtual const char *getName() const {
+	virtual const char *getName() const override {
 		return "Kingdom: The Far Reaches' Engine";
 	}
 
-	virtual const char *getOriginalCopyright() const {
+	virtual const char *getOriginalCopyright() const override {
 		return "Kingdom: The far Reaches (C) 1995 Virtual Image Productions";
 	}
 
-	virtual bool hasFeature(MetaEngineFeature f) const;
-	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
-	virtual int getMaximumSaveSlot() const;
-	virtual SaveStateList listSaves(const char *target) const;
-	virtual void removeSaveState(const char *target, int slot) const;
-	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+	virtual bool hasFeature(MetaEngineFeature f) const override;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+	virtual int getMaximumSaveSlot() const override;
+	virtual SaveStateList listSaves(const char *target) const override;
+	virtual void removeSaveState(const char *target, int slot) const override;
+	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
 };
 
 bool KingdomMetaEngine::hasFeature(MetaEngineFeature f) const {