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

[dreammaster]

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:
aae8b17768 ULTIMA4: Fixing gcc warnings


Commit: aae8b177680209fa21b8ca283fcc0e64e5d2367b
    https://github.com/scummvm/scummvm/commit/aae8b177680209fa21b8ca283fcc0e64e5d2367b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-10T18:37:02-07:00

Commit Message:
ULTIMA4: Fixing gcc warnings

Changed paths:
    engines/ultima/ultima4/events/event_scummvm.cpp
    engines/ultima/ultima4/game/game.cpp
    engines/ultima/ultima4/game/intro.cpp
    engines/ultima/ultima4/game/stats.cpp
    engines/ultima/ultima4/game/stats.h
    engines/ultima/ultima4/map/combat.h
    engines/ultima/ultima4/map/tileanim.h


diff --git a/engines/ultima/ultima4/events/event_scummvm.cpp b/engines/ultima/ultima4/events/event_scummvm.cpp
index 20001f977d..10db18268e 100644
--- a/engines/ultima/ultima4/events/event_scummvm.cpp
+++ b/engines/ultima/ultima4/events/event_scummvm.cpp
@@ -216,8 +216,6 @@ void EventHandler::sleep(unsigned int msec) {
 }
 
 void EventHandler::run() {
-	const int FRAME_TIME = 1000 / settings._gameCyclesPerSecond;
-
 	if (_updateScreen)
 		(*_updateScreen)();
 	g_screen->update();
diff --git a/engines/ultima/ultima4/game/game.cpp b/engines/ultima/ultima4/game/game.cpp
index 20aca57937..137680c6ce 100644
--- a/engines/ultima/ultima4/game/game.cpp
+++ b/engines/ultima/ultima4/game/game.cpp
@@ -2603,12 +2603,12 @@ void wearArmor(int player) {
 
 	g_context->_stats->setView(STATS_ARMOR);
 	screenMessage("Armour: ");
-	ArmorType armor = (ArmorType) AlphaActionController::get(ARMR_MAX + 'a' - 1, "Armour: ");
+	int armor = AlphaActionController::get(ARMR_MAX + 'a' - 1, "Armour: ");
 	g_context->_stats->setView(STATS_PARTY_OVERVIEW);
 	if (armor == -1)
 		return;
 
-	const Armor *a = Armor::get(armor);
+	const Armor *a = Armor::get((ArmorType)armor);
 	PartyMember *p = g_context->_party->member(player);
 
 	if (!a) {
diff --git a/engines/ultima/ultima4/game/intro.cpp b/engines/ultima/ultima4/game/intro.cpp
index 5022e857df..c49c56d922 100644
--- a/engines/ultima/ultima4/game/intro.cpp
+++ b/engines/ultima/ultima4/game/intro.cpp
@@ -1318,7 +1318,7 @@ void IntroController::initPlayers(SaveGame *saveGame) {
 
 	saveGame->_players[0]._class = static_cast<ClassType>(_questionTree[14]);
 
-	ASSERT(saveGame->_players[0]._class < 8, "bad class: %d", saveGame->_players[0]._class);
+	ASSERT((int)saveGame->_players[0]._class < 8, "bad class: %d", saveGame->_players[0]._class);
 
 	saveGame->_players[0]._weapon = initValuesForClass[saveGame->_players[0]._class].weapon;
 	saveGame->_players[0].armor = initValuesForClass[saveGame->_players[0]._class].armor;
diff --git a/engines/ultima/ultima4/game/stats.cpp b/engines/ultima/ultima4/game/stats.cpp
index 562bff6ee7..259d6f10d0 100644
--- a/engines/ultima/ultima4/game/stats.cpp
+++ b/engines/ultima/ultima4/game/stats.cpp
@@ -136,6 +136,10 @@ void StatsArea::update(bool avatarOnly) {
 	redraw();
 }
 
+void StatsArea::update(Aura *observable, NoArg *arg) {
+	Observer<Aura *>::update(observable, arg);
+}
+
 void StatsArea::update(Aura *aura) {
 	unsigned char mask = 0xff;
 	for (int i = 0; i < VIRT_MAX; i++) {
@@ -167,6 +171,14 @@ void StatsArea::update(Aura *aura) {
 	_summary.update();
 }
 
+void StatsArea::update(Party *party, PartyEvent &event) {
+	update();	// Do a full update
+}
+
+void StatsArea::update(Menu *menu, MenuEvent &event) {
+	update();	// Do a full update
+}
+
 void StatsArea::highlightPlayer(int player) {
 	ASSERT(player < g_context->_party->size(), "player number out of range: %d", player);
 	_mainArea.highlight(0, player * CHAR_HEIGHT, STATS_AREA_WIDTH * CHAR_WIDTH, CHAR_HEIGHT);
diff --git a/engines/ultima/ultima4/game/stats.h b/engines/ultima/ultima4/game/stats.h
index 453fd8d95c..aa04c1951c 100644
--- a/engines/ultima/ultima4/game/stats.h
+++ b/engines/ultima/ultima4/game/stats.h
@@ -88,13 +88,10 @@ public:
 	 * Update the stats (ztats) box on the upper right of the screen.
 	 */
 	virtual void update(bool avatarOnly = false);
+	void update(Aura *observable, NoArg *arg) override;
 	void update(Aura *aura) override;
-	void update(Party *party, PartyEvent &event) override {
-		update(); // do a full update
-	}
-	void update(Menu *menu, MenuEvent &event) override {
-		update(); // do a full update
-	}
+	void update(Party *party, PartyEvent &event) override;
+	void update(Menu *menu, MenuEvent &event) override;
 
 	void highlightPlayer(int player);
 
diff --git a/engines/ultima/ultima4/map/combat.h b/engines/ultima/ultima4/map/combat.h
index 490857fada..700a54cca3 100644
--- a/engines/ultima/ultima4/map/combat.h
+++ b/engines/ultima/ultima4/map/combat.h
@@ -66,9 +66,10 @@ public:
 	virtual ~CombatController();
 
 	// Accessor Methods
-	bool isCombatController() const {
+	bool isCombatController() const override {
 		return true;
 	}
+
 	bool isCamping() const;
 	bool isWinOrLose() const;
 	Direction getExitDir() const;
diff --git a/engines/ultima/ultima4/map/tileanim.h b/engines/ultima/ultima4/map/tileanim.h
index 4225b0bb9a..995bd286ea 100644
--- a/engines/ultima/ultima4/map/tileanim.h
+++ b/engines/ultima/ultima4/map/tileanim.h
@@ -51,9 +51,6 @@ public:
 
 	// Properties
 	int _random;
-
-private:
-	bool _replaces;
 };
 
 /**