[Scummvm-git-logs] scummvm master -> bfb4e4e22f10713c4ad27d0fcd34fc662cc1ef26
dreammaster
noreply at scummvm.org
Fri Nov 13 01:35:03 UTC 2026
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
d6be8bac89 ULTIMA: ULTIMA3: Fix global constructors for DungeonView::Picture
2e756fc395 ULTIMA: Added default break to switch statements
ff3968904b ULTIMA: Resolving unused parameter warnings
8572889242 ULTIMA: Fix unused local warnings
384d1caf31 GRAPHICS: VIEWS: Fix ManagedSurface deprecated declaration in getSurface() calls
e3d8368f1d ULTIMA: ULTIMA1: Fix ManagedSurface copy warning
bfb4e4e22f ULTIMA: Miscellaneous gcc warning fixes
Commit: d6be8bac8980679bc983800ea53adcabcc81fa64
https://github.com/scummvm/scummvm/commit/d6be8bac8980679bc983800ea53adcabcc81fa64
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:02:13+11:00
Commit Message:
ULTIMA: ULTIMA3: Fix global constructors for DungeonView::Picture
Changed paths:
engines/ultima/ultima3/gfx/dungeon_view.cpp
engines/ultima/ultima3/gfx/dungeon_view.h
diff --git a/engines/ultima/ultima3/gfx/dungeon_view.cpp b/engines/ultima/ultima3/gfx/dungeon_view.cpp
index 1613905a468..4ea984f4028 100644
--- a/engines/ultima/ultima3/gfx/dungeon_view.cpp
+++ b/engines/ultima/ultima3/gfx/dungeon_view.cpp
@@ -187,6 +187,15 @@ DungeonView::Picture DungeonView::_chests[PLACES];
bool DungeonView::_loaded = false;
bool DungeonView::_enabled = true;
+void DungeonView::resetPictures() {
+ for (int i = 0; i < FACES; ++i)
+ _faces[i]._present = false;
+ for (int i = 0; i < PLACES; ++i)
+ _ladders[i]._present = _chests[i]._present = false;
+
+ _loaded = false;
+}
+
bool DungeonView::loadPicture(Picture &picture, const Common::String &name) {
Common::File f;
Image::PNGDecoder decoder;
diff --git a/engines/ultima/ultima3/gfx/dungeon_view.h b/engines/ultima/ultima3/gfx/dungeon_view.h
index e53c4bdc330..733ed0e312f 100644
--- a/engines/ultima/ultima3/gfx/dungeon_view.h
+++ b/engines/ultima/ultima3/gfx/dungeon_view.h
@@ -50,7 +50,7 @@ private:
static const int PLACES = 21;
struct Picture {
- bool _present = false;
+ bool _present;
byte _pixels[PICTURE_SIZE * PICTURE_SIZE];
};
@@ -74,6 +74,12 @@ private:
static bool loadPicture(Picture &picture, const Common::String &name);
+ /**
+ * Forgets any pictures, which are kept in plain static arrays so that they don't
+ * need constructing
+ */
+ static void resetPictures();
+
void drawPicture(const Picture &picture, bool flip, bool erase);
/**
@@ -108,6 +114,7 @@ private:
public:
DungeonView() {
memset(_pixels, 0, sizeof(_pixels));
+ resetPictures();
}
/**
Commit: 2e756fc395e2ea6edab9a0e2f88aff0c35429fe3
https://github.com/scummvm/scummvm/commit/2e756fc395e2ea6edab9a0e2f88aff0c35429fe3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:06:16+11:00
Commit Message:
ULTIMA: Added default break to switch statements
Changed paths:
engines/ultima/ultima1/logic/dungeon_logic.cpp
engines/ultima/ultima1/logic/overworld_logic.cpp
engines/ultima/ultima1/views/create_character.cpp
engines/ultima/ultima1/views/interactions/dead.cpp
engines/ultima/ultima1/views/interactions/king.cpp
engines/ultima/ultima1/views/interactions/merchant.cpp
engines/ultima/ultima1/views/title.cpp
engines/ultima/ultima2/logic/logic.cpp
engines/ultima/ultima2/ultima2.cpp
engines/ultima/ultima2/views/create_character.cpp
engines/ultima/ultima2/views/interactions/shop.cpp
engines/ultima/ultima2/views/title.cpp
engines/ultima/ultima3/views/combat_map.cpp
engines/ultima/ultima3/views/create_character.cpp
engines/ultima/ultima3/views/title.cpp
diff --git a/engines/ultima/ultima1/logic/dungeon_logic.cpp b/engines/ultima/ultima1/logic/dungeon_logic.cpp
index 2ed692325f3..237adeffce9 100644
--- a/engines/ultima/ultima1/logic/dungeon_logic.cpp
+++ b/engines/ultima/ultima1/logic/dungeon_logic.cpp
@@ -103,6 +103,8 @@ void DungeonLogic::turnLeft() {
case Data::DIR_DOWN:
_G(savegame)._dungeonDirection = Data::DIR_RIGHT;
break;
+ default:
+ break;
}
}
@@ -122,6 +124,8 @@ void DungeonLogic::turnRight() {
case Data::DIR_DOWN:
_G(savegame)._dungeonDirection = Data::DIR_LEFT;
break;
+ default:
+ break;
}
}
@@ -141,6 +145,8 @@ void DungeonLogic::turnAround() {
case Data::DIR_DOWN:
_G(savegame)._dungeonDirection = Data::DIR_UP;
break;
+ default:
+ break;
}
}
@@ -208,6 +214,8 @@ bool DungeonLogic::move(Data::Direction dir) {
case Data::DIR_DOWN:
turnAround();
break;
+ default:
+ break;
}
return true;
diff --git a/engines/ultima/ultima1/logic/overworld_logic.cpp b/engines/ultima/ultima1/logic/overworld_logic.cpp
index cf3ac9d3465..55d6564378c 100644
--- a/engines/ultima/ultima1/logic/overworld_logic.cpp
+++ b/engines/ultima/ultima1/logic/overworld_logic.cpp
@@ -266,6 +266,8 @@ bool OverworldLogic::move(Data::Direction dir) {
case Data::DIR_DOWN:
moveDown();
break;
+ default:
+ break;
}
if (_G(map).getContinentAt(_G(savegame)._overworldPos) != continentNum)
diff --git a/engines/ultima/ultima1/views/create_character.cpp b/engines/ultima/ultima1/views/create_character.cpp
index 08b3c8c82b5..1837b00d7af 100644
--- a/engines/ultima/ultima1/views/create_character.cpp
+++ b/engines/ultima/ultima1/views/create_character.cpp
@@ -139,6 +139,8 @@ void CreateCharacter::draw() {
s.writeString(Common::Point(12, 4), _G(savegame)._name);
s.writeString(Common::Point(3, 22), "Use this character? (Y-N) ");
break;
+ default:
+ break;
}
}
@@ -196,6 +198,8 @@ bool CreateCharacter::msgKeypress(const KeypressMessage &msg) {
return View::msgKeypress(msg);
case SAVE:
return msgSaveKey(msg);
+ default:
+ break;
}
return false;
diff --git a/engines/ultima/ultima1/views/interactions/dead.cpp b/engines/ultima/ultima1/views/interactions/dead.cpp
index 9cde1f27497..08fb3f901b7 100644
--- a/engines/ultima/ultima1/views/interactions/dead.cpp
+++ b/engines/ultima/ultima1/views/interactions/dead.cpp
@@ -190,6 +190,8 @@ bool Dead::tick() {
else
_delayCtr = COUNT_DELAY;
break;
+ default:
+ break;
}
}
diff --git a/engines/ultima/ultima1/views/interactions/king.cpp b/engines/ultima/ultima1/views/interactions/king.cpp
index 07a403714af..71b80d845f6 100644
--- a/engines/ultima/ultima1/views/interactions/king.cpp
+++ b/engines/ultima/ultima1/views/interactions/king.cpp
@@ -121,6 +121,8 @@ bool King::msgKeypress(const KeypressMessage &msg) {
case KING_PENCE:
penceKeypress(msg);
break;
+ default:
+ break;
}
return true;
diff --git a/engines/ultima/ultima1/views/interactions/merchant.cpp b/engines/ultima/ultima1/views/interactions/merchant.cpp
index 5308f652afa..d4b01348d0d 100644
--- a/engines/ultima/ultima1/views/interactions/merchant.cpp
+++ b/engines/ultima/ultima1/views/interactions/merchant.cpp
@@ -195,6 +195,8 @@ bool Merchant::msgKeypress(const KeypressMessage &msg) {
case SHOP_QTY:
groceryKeypress(msg);
break;
+ default:
+ break;
}
return true;
@@ -508,6 +510,8 @@ void Merchant::chooseSell() {
case SHOP_TRANSPORT:
showText(true, false, { { 9, listY() + 2, "Sorry, we don't deal in" }, { 15, listY() + 3, "used stuff." } });
break;
+ default:
+ break;
}
}
diff --git a/engines/ultima/ultima1/views/title.cpp b/engines/ultima/ultima1/views/title.cpp
index 63ec1135132..fff3ca161cf 100644
--- a/engines/ultima/ultima1/views/title.cpp
+++ b/engines/ultima/ultima1/views/title.cpp
@@ -346,6 +346,8 @@ void Title::draw() {
s.writeString(Common::Point(6, 23), "Conversion by: John Fachini");
}
break;
+ default:
+ break;
}
}
@@ -437,6 +439,8 @@ void Title::timeout() {
return;
}
break;
+ default:
+ break;
}
redraw();
diff --git a/engines/ultima/ultima2/logic/logic.cpp b/engines/ultima/ultima2/logic/logic.cpp
index 3e84c81c65a..9e3559eb3c5 100644
--- a/engines/ultima/ultima2/logic/logic.cpp
+++ b/engines/ultima/ultima2/logic/logic.cpp
@@ -260,6 +260,8 @@ void Logic::resolveDirection(Data::Direction dir) {
case DirectionPurpose::TRANSACT:
doEndOfTurn = transact(dir);
break;
+ default:
+ break;
}
if (doEndOfTurn)
diff --git a/engines/ultima/ultima2/ultima2.cpp b/engines/ultima/ultima2/ultima2.cpp
index 6a20d1eb17c..6e4d209f858 100644
--- a/engines/ultima/ultima2/ultima2.cpp
+++ b/engines/ultima/ultima2/ultima2.cpp
@@ -282,6 +282,8 @@ void Ultima2Engine::playFX(Data::SoundEffect fx) {
queueTone(1216, 60);
queueTone(1170, 60);
break;
+ default:
+ break;
}
}
diff --git a/engines/ultima/ultima2/views/create_character.cpp b/engines/ultima/ultima2/views/create_character.cpp
index e0d8dade6b1..649295b0f9e 100644
--- a/engines/ultima/ultima2/views/create_character.cpp
+++ b/engines/ultima/ultima2/views/create_character.cpp
@@ -119,6 +119,8 @@ void CreateCharacter::positionCursor() {
case CONFIRM:
_cursor.setPosition(Common::Point(29, 16));
break;
+ default:
+ break;
}
_cursor.show();
@@ -289,6 +291,8 @@ bool CreateCharacter::msgKeypress(const KeypressMessage &msg) {
_G(map).load(sg._mapEra, sg._mapType);
}
break;
+ default:
+ break;
}
return true;
diff --git a/engines/ultima/ultima2/views/interactions/shop.cpp b/engines/ultima/ultima2/views/interactions/shop.cpp
index 108b02e1e3e..7247882af6c 100644
--- a/engines/ultima/ultima2/views/interactions/shop.cpp
+++ b/engines/ultima/ultima2/views/interactions/shop.cpp
@@ -59,6 +59,8 @@ bool Shop::msgFocus(const FocusMessage &msg) {
case SPELL_WIZARD:
writeString("%s Muserref Oldum!\n1-Light, 2-L.D., 3-L.U.,\n4-M.M., 5-Blink, 6-Kill,\nBir iki uc...? ", sg._name);
break;
+ default:
+ break;
}
return Interaction::msgFocus(msg);
@@ -86,6 +88,8 @@ void Shop::chooseItem(int digit) {
case SPELL_WIZARD:
finish("\nUgurla olsun!");
break;
+ default:
+ break;
}
return;
}
@@ -109,6 +113,8 @@ void Shop::chooseItem(int digit) {
writeString("Five %ss for %.4d\n%s ", Data::SPELL_NAMES[_item], _price,
_kind == SPELL_CLERIC ? "Yes, friend?" : "Lutfen evet?");
break;
+ default:
+ break;
}
_state = CONFIRM;
@@ -159,6 +165,8 @@ void Shop::confirm(char key) {
}
}
break;
+ default:
+ break;
}
_G(logic)->resumeTurn();
diff --git a/engines/ultima/ultima2/views/title.cpp b/engines/ultima/ultima2/views/title.cpp
index 5fcac53a4a2..936aac177eb 100644
--- a/engines/ultima/ultima2/views/title.cpp
+++ b/engines/ultima/ultima2/views/title.cpp
@@ -112,6 +112,8 @@ void Title::showState(State state) {
// No timeout; this state waits indefinitely for a keypress
_cursor.show();
break;
+ default:
+ break;
}
redraw();
@@ -196,6 +198,8 @@ void Title::draw() {
Data::RENDER_MODE_NAMES[g_engine->getRenderMode()]));
s.writeString(Common::Point(5, 19), "Choice:");
break;
+ default:
+ break;
}
}
@@ -232,6 +236,8 @@ void Title::timeout() {
break;
case MENU:
break;
+ default:
+ break;
}
}
diff --git a/engines/ultima/ultima3/views/combat_map.cpp b/engines/ultima/ultima3/views/combat_map.cpp
index 14dd51e67f2..1e2ed1efd25 100644
--- a/engines/ultima/ultima3/views/combat_map.cpp
+++ b/engines/ultima/ultima3/views/combat_map.cpp
@@ -156,6 +156,8 @@ void CombatMap::processFrame() {
case CombatEvent::SHOW:
_G(combat).syncShown();
return;
+ default:
+ break;
}
}
diff --git a/engines/ultima/ultima3/views/create_character.cpp b/engines/ultima/ultima3/views/create_character.cpp
index 216c7218e55..e944dcc96a5 100644
--- a/engines/ultima/ultima3/views/create_character.cpp
+++ b/engines/ultima/ultima3/views/create_character.cpp
@@ -225,6 +225,8 @@ bool CreateCharacter::msgKeypress(const KeypressMessage &msg) {
if (isSpaceKey(msg))
close();
break;
+ default:
+ break;
}
redraw();
diff --git a/engines/ultima/ultima3/views/title.cpp b/engines/ultima/ultima3/views/title.cpp
index 4211d08aecf..956369da7a2 100644
--- a/engines/ultima/ultima3/views/title.cpp
+++ b/engines/ultima/ultima3/views/title.cpp
@@ -436,6 +436,8 @@ void Title::timeout() {
draw();
showLogoScreen();
break;
+ default:
+ break;
}
}
Commit: ff3968904b5bcf9728881ef72802617d63a60039
https://github.com/scummvm/scummvm/commit/ff3968904b5bcf9728881ef72802617d63a60039
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:12:38+11:00
Commit Message:
ULTIMA: Resolving unused parameter warnings
Changed paths:
engines/ultima/shared/engine/events.h
engines/ultima/ultima1/console.cpp
engines/ultima/ultima1/gfx/text_input.cpp
engines/ultima/ultima1/logic/city_castle_logic.cpp
engines/ultima/ultima1/logic/dungeon_logic.cpp
engines/ultima/ultima1/logic/logic.cpp
engines/ultima/ultima1/logic/logic.h
engines/ultima/ultima1/logic/mondain_logic.cpp
engines/ultima/ultima1/logic/space_logic.cpp
engines/ultima/ultima1/logic/space_map_logic.cpp
engines/ultima/ultima1/ultima1.cpp
engines/ultima/ultima1/ultima1.h
engines/ultima/ultima1/views/interactions/dead.cpp
engines/ultima/ultima1/views/interactions/dead.h
engines/ultima/ultima1/views/interactions/direction.cpp
engines/ultima/ultima1/views/interactions/drop.cpp
engines/ultima/ultima1/views/interactions/entering_craft.cpp
engines/ultima/ultima1/views/interactions/king.cpp
engines/ultima/ultima1/views/interactions/liftoff.cpp
engines/ultima/ultima1/views/interactions/lose.cpp
engines/ultima/ultima1/views/interactions/merchant.cpp
engines/ultima/ultima1/views/interactions/operate_craft.cpp
engines/ultima/ultima1/views/interactions/pillar.cpp
engines/ultima/ultima1/views/interactions/princess_saved.cpp
engines/ultima/ultima1/views/interactions/ready.cpp
engines/ultima/ultima1/views/interactions/sector_scan.cpp
engines/ultima/ultima1/views/interactions/space_station.cpp
engines/ultima/ultima1/views/interactions/win.cpp
engines/ultima/ultima1/views/space_cockpit.cpp
engines/ultima/ultima1/views/startup.h
engines/ultima/ultima1/views/title.cpp
engines/ultima/ultima1/views/zstats.cpp
engines/ultima/ultima2/console.cpp
engines/ultima/ultima2/data/secret_archive.h
engines/ultima/ultima2/logic/dungeon_logic.cpp
engines/ultima/ultima2/logic/logic.cpp
engines/ultima/ultima2/logic/logic.h
engines/ultima/ultima2/logic/space_logic.cpp
engines/ultima/ultima2/ultima2.cpp
engines/ultima/ultima2/ultima2.h
engines/ultima/ultima2/views/dungeon_map.cpp
engines/ultima/ultima2/views/helm_map.cpp
engines/ultima/ultima2/views/interactions/dead.cpp
engines/ultima/ultima2/views/interactions/rocket_landing.cpp
engines/ultima/ultima2/views/title.cpp
engines/ultima/ultima2/views/zstats.cpp
engines/ultima/ultima3/console.cpp
engines/ultima/ultima3/gfx/charset.cpp
engines/ultima/ultima3/gfx/charset.h
engines/ultima/ultima3/ultima3.cpp
engines/ultima/ultima3/ultima3.h
engines/ultima/ultima3/views/interactions/interaction.h
engines/ultima/ultima3/views/title.cpp
diff --git a/engines/ultima/shared/engine/events.h b/engines/ultima/shared/engine/events.h
index af93fbfdc06..962c1afee43 100644
--- a/engines/ultima/shared/engine/events.h
+++ b/engines/ultima/shared/engine/events.h
@@ -36,7 +36,7 @@ namespace Shared {
*/
#define ULTIMA_CUSTOM_MESSAGES(BASE) \
protected: \
- virtual bool msgAttackTile(const AttackTileMessage &msg) { \
+ virtual bool msgAttackTile(const AttackTileMessage &) { \
return false; \
} \
bool msgCustom(const Graphics::Views::Message &msg) override { \
diff --git a/engines/ultima/ultima1/console.cpp b/engines/ultima/ultima1/console.cpp
index 1a295173c79..ac48d798670 100644
--- a/engines/ultima/ultima1/console.cpp
+++ b/engines/ultima/ultima1/console.cpp
@@ -115,7 +115,7 @@ bool Console::cmdCoins(int argc, const char **argv) {
return false;
}
-bool Console::cmdFuel(int argc, const char **argv) {
+bool Console::cmdFuel(int, const char **) {
if (_G(map)._mapType == Data::MAPTYPE_SPACE) {
Data::SpaceMapShip &ship = _G(savegame)._starmap
._sectors[_G(savegame)._sectorX][_G(savegame)._sectorY]
@@ -131,7 +131,7 @@ bool Console::cmdFuel(int argc, const char **argv) {
return false;
}
-bool Console::cmdSpace(int argc, const char **argv) {
+bool Console::cmdSpace(int, const char **) {
_G(savegame)._shipFuel = 9999;
_G(savegame)._shipShield = 9999;
@@ -146,7 +146,7 @@ bool Console::cmdSpace(int argc, const char **argv) {
return false;
}
-bool Console::cmdStats(int argc, const char **argv) {
+bool Console::cmdStats(int, const char **) {
Data::Savegame &sg = _G(savegame);
sg._strength = sg._agility = sg._stamina = sg._charisma = sg._wisdom = sg._intelligence = MAX_ATTRIBUTE;
@@ -156,7 +156,7 @@ bool Console::cmdStats(int argc, const char **argv) {
return true;
}
-bool Console::cmdInventory(int argc, const char **argv) {
+bool Console::cmdInventory(int, const char **) {
Data::Savegame &sg = _G(savegame);
for (int i = 1; i < Data::ARMOR_COUNT; ++i)
diff --git a/engines/ultima/ultima1/gfx/text_input.cpp b/engines/ultima/ultima1/gfx/text_input.cpp
index 87a4a66a631..e734dac6941 100644
--- a/engines/ultima/ultima1/gfx/text_input.cpp
+++ b/engines/ultima/ultima1/gfx/text_input.cpp
@@ -61,7 +61,7 @@ void TextInput::draw() {
s.writeString(_text);
}
-bool TextInput::msgUnfocus(const UnfocusMessage &msg) {
+bool TextInput::msgUnfocus(const UnfocusMessage &) {
hide();
return true;
}
diff --git a/engines/ultima/ultima1/logic/city_castle_logic.cpp b/engines/ultima/ultima1/logic/city_castle_logic.cpp
index eaf1076589c..465f3101a18 100644
--- a/engines/ultima/ultima1/logic/city_castle_logic.cpp
+++ b/engines/ultima/ultima1/logic/city_castle_logic.cpp
@@ -203,7 +203,7 @@ void CityCastleLogic::updateCreatures() {
}
}
-void CityCastleLogic::damage(Data::Direction dir, int effectNum, int maxDistance, int strike, int hitChance, int tileId) {
+void CityCastleLogic::damage(Data::Direction dir, int, int maxDistance, int strike, int hitChance, int) {
attackPerson(dir, maxDistance, strike, hitChance);
}
diff --git a/engines/ultima/ultima1/logic/dungeon_logic.cpp b/engines/ultima/ultima1/logic/dungeon_logic.cpp
index 237adeffce9..f8bcdb40633 100644
--- a/engines/ultima/ultima1/logic/dungeon_logic.cpp
+++ b/engines/ultima/ultima1/logic/dungeon_logic.cpp
@@ -221,7 +221,7 @@ bool DungeonLogic::move(Data::Direction dir) {
return true;
}
-bool DungeonLogic::attack(Data::Direction dir) {
+bool DungeonLogic::attack(Data::Direction) {
writeString("Attack with %s", Data::WEAPON_NAMES_LOWER[_G(savegame)._equippedWeapon]);
int maxDistance = Data::WEAPONS_DISTANCE[_G(savegame)._equippedWeapon];
diff --git a/engines/ultima/ultima1/logic/logic.cpp b/engines/ultima/ultima1/logic/logic.cpp
index 76f20ff5271..260dceb719b 100644
--- a/engines/ultima/ultima1/logic/logic.cpp
+++ b/engines/ultima/ultima1/logic/logic.cpp
@@ -250,7 +250,7 @@ void Logic::action(int action) {
}
}
-void Logic::keypress(Common::KeyCode keycode) {
+void Logic::keypress(Common::KeyCode) {
writeString("Huh?\n");
endOfTurn();
prompt();
diff --git a/engines/ultima/ultima1/logic/logic.h b/engines/ultima/ultima1/logic/logic.h
index 039b1d99610..f54def0e872 100644
--- a/engines/ultima/ultima1/logic/logic.h
+++ b/engines/ultima/ultima1/logic/logic.h
@@ -126,7 +126,7 @@ protected:
/**
* Cast spell direction chosen for overworld spells
*/
- virtual void castSpellAttack(Data::Direction dir) {
+ virtual void castSpellAttack(Data::Direction) {
}
/**
@@ -142,7 +142,7 @@ protected:
* @param hitChance 1-100 threshold a to-hit roll must be under
* @param tileId Tile Id shown for the weapon/projectile effect
*/
- virtual void damage(Data::Direction dir, int effectNum, int maxDistance, int strike, int hitChance, int tileId) {
+ virtual void damage(Data::Direction /* dir */, int /* effectNum */, int /* maxDistance */, int /* strike */, int /* hitChance */, int /* tileId */) {
}
/*--- Fallback player action handlers. Each returns true if end of
@@ -169,7 +169,7 @@ protected:
virtual bool view();
virtual bool xit();
virtual bool zstats();
- virtual bool move(Data::Direction dir) {
+ virtual bool move(Data::Direction) {
return false;
}
virtual bool pass();
diff --git a/engines/ultima/ultima1/logic/mondain_logic.cpp b/engines/ultima/ultima1/logic/mondain_logic.cpp
index 147dce4a239..62e379dd5fa 100644
--- a/engines/ultima/ultima1/logic/mondain_logic.cpp
+++ b/engines/ultima/ultima1/logic/mondain_logic.cpp
@@ -131,7 +131,7 @@ bool MondainLogic::move(Data::Direction dir) {
return true;
}
-void MondainLogic::damage(Data::Direction dir, int effectNum, int maxDistance, int strike, int hitChance, int tileId) {
+void MondainLogic::damage(Data::Direction dir, int effectNum, int maxDistance, int strike, int hitChance, int) {
playFX(effectNum);
Data::Savegame &sg = _G(savegame);
diff --git a/engines/ultima/ultima1/logic/space_logic.cpp b/engines/ultima/ultima1/logic/space_logic.cpp
index 62bbabfdaf6..9fd068278b3 100644
--- a/engines/ultima/ultima1/logic/space_logic.cpp
+++ b/engines/ultima/ultima1/logic/space_logic.cpp
@@ -90,7 +90,7 @@ void SpaceLogic::death() {
g_engine->addView("SpaceDead");
}
-void SpaceLogic::keypress(Common::KeyCode keycode) {
+void SpaceLogic::keypress(Common::KeyCode) {
writeString("Huh?\n");
playFX(1);
prompt();
@@ -102,7 +102,7 @@ bool SpaceLogic::inform() {
return false;
}
-bool SpaceLogic::attack(Data::Direction dir) {
+bool SpaceLogic::attack(Data::Direction) {
writeString("Attack?\n");
playFX(1);
return true;
diff --git a/engines/ultima/ultima1/logic/space_map_logic.cpp b/engines/ultima/ultima1/logic/space_map_logic.cpp
index 29fdf2163b5..bd9bfb23bfc 100644
--- a/engines/ultima/ultima1/logic/space_map_logic.cpp
+++ b/engines/ultima/ultima1/logic/space_map_logic.cpp
@@ -181,7 +181,7 @@ bool SpaceMapLogic::move(Data::Direction dir) {
return true;
}
-bool SpaceMapLogic::attack(Data::Direction dir) {
+bool SpaceMapLogic::attack(Data::Direction) {
if (_G(savegame)._sectorX != Data::SPACE_STATION_X || _G(savegame)._sectorY != Data::SPACE_STATION_Y) {
writeString("Autopilot: only in home sector.\n");
return true;
diff --git a/engines/ultima/ultima1/ultima1.cpp b/engines/ultima/ultima1/ultima1.cpp
index a5919a0e84d..c6e1600354d 100644
--- a/engines/ultima/ultima1/ultima1.cpp
+++ b/engines/ultima/ultima1/ultima1.cpp
@@ -96,12 +96,12 @@ void Ultima1Engine::returnToMainMenu() {
replaceView("MainMenu", true);
}
-bool Ultima1Engine::canSaveGameStateCurrently(Common::U32String *msg) {
+bool Ultima1Engine::canSaveGameStateCurrently(Common::U32String *) {
// Only allow saving when any of the different map views are active
return dynamic_cast<Views::Map *>(focusedView()) != nullptr;
}
-bool Ultima1Engine::canLoadGameStateCurrently(Common::U32String *msg) {
+bool Ultima1Engine::canLoadGameStateCurrently(Common::U32String *) {
// Allow loading savegames anywhere
return true;
}
diff --git a/engines/ultima/ultima1/ultima1.h b/engines/ultima/ultima1/ultima1.h
index cb70aa1b3d4..5af8583e2c0 100644
--- a/engines/ultima/ultima1/ultima1.h
+++ b/engines/ultima/ultima1/ultima1.h
@@ -140,7 +140,7 @@ public:
*/
Common::Error syncGame(Common::Serializer &s);
- Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override {
+ Common::Error saveGameStream(Common::WriteStream *stream, bool = false) override {
Common::Serializer s(nullptr, stream);
return syncGame(s);
}
diff --git a/engines/ultima/ultima1/views/interactions/dead.cpp b/engines/ultima/ultima1/views/interactions/dead.cpp
index 08fb3f901b7..0a170ee81d1 100644
--- a/engines/ultima/ultima1/views/interactions/dead.cpp
+++ b/engines/ultima/ultima1/views/interactions/dead.cpp
@@ -123,7 +123,7 @@ static void drawSkullGraphic(Graphics::Views::GfxSurface &s) {
}
}
-bool Dead::msgFocus(const FocusMessage &msg) {
+bool Dead::msgFocus(const FocusMessage &) {
// Claim the map viewport area (inside the game border, which is left
// drawn by whatever view was showing underneath)
setBounds(Common::Rect(8, 8, 312, 152));
@@ -263,7 +263,7 @@ void Dead::finish() {
_G(map).load(Data::MAP_OVERWORLD);
}
-bool SpaceDead::msgFocus(const FocusMessage &msg) {
+bool SpaceDead::msgFocus(const FocusMessage &) {
setBounds(Common::Rect(8, 8, 312, 152));
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/dead.h b/engines/ultima/ultima1/views/interactions/dead.h
index d3da18b2b46..ecf935ccb4b 100644
--- a/engines/ultima/ultima1/views/interactions/dead.h
+++ b/engines/ultima/ultima1/views/interactions/dead.h
@@ -88,10 +88,10 @@ public:
// The death sequence is automatic - swallow input rather than letting
// it reach the (soon to be replaced) logic/view underneath
- bool msgAction(const ActionMessage &msg) override {
+ bool msgAction(const ActionMessage &) override {
return true;
}
- bool msgKeypress(const KeypressMessage &msg) override {
+ bool msgKeypress(const KeypressMessage &) override {
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/direction.cpp b/engines/ultima/ultima1/views/interactions/direction.cpp
index 593947e90e2..52ec84025a2 100644
--- a/engines/ultima/ultima1/views/interactions/direction.cpp
+++ b/engines/ultima/ultima1/views/interactions/direction.cpp
@@ -29,7 +29,7 @@ namespace Ultima1 {
namespace Views {
namespace Interactions {
-bool Direction::msgFocus(const FocusMessage &msg) {
+bool Direction::msgFocus(const FocusMessage &) {
MetaEngine::setKeybindingMode(KBMODE_GAMEPLAY); // Need for direction keybindings
showCursor();
return true;
@@ -68,7 +68,7 @@ bool Direction::msgAction(const ActionMessage &msg) {
return true;
}
-bool Direction::msgKeypress(const KeypressMessage &msg) {
+bool Direction::msgKeypress(const KeypressMessage &) {
close();
_G(logic)->action(KEYBIND_PASS);
return true;
diff --git a/engines/ultima/ultima1/views/interactions/drop.cpp b/engines/ultima/ultima1/views/interactions/drop.cpp
index aa062f568de..69ba246f178 100644
--- a/engines/ultima/ultima1/views/interactions/drop.cpp
+++ b/engines/ultima/ultima1/views/interactions/drop.cpp
@@ -43,7 +43,7 @@ static int countOwned(const int16 *items, int maxIndex) {
Drop::Drop() : Interaction("Drop") {
}
-bool Drop::msgFocus(const FocusMessage &msg) {
+bool Drop::msgFocus(const FocusMessage &) {
_mode = DROP_AREA;
setBounds(Common::Rect(0, 0, 0, 0));
writeString("Drop Pence,Weapon,Armour:");
@@ -51,7 +51,7 @@ bool Drop::msgFocus(const FocusMessage &msg) {
return true;
}
-bool Drop::msgAction(const ActionMessage &msg) {
+bool Drop::msgAction(const ActionMessage &) {
none();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/entering_craft.cpp b/engines/ultima/ultima1/views/interactions/entering_craft.cpp
index d65bd1137c8..877dcddd18a 100644
--- a/engines/ultima/ultima1/views/interactions/entering_craft.cpp
+++ b/engines/ultima/ultima1/views/interactions/entering_craft.cpp
@@ -96,7 +96,7 @@ static const byte CGA_GEM_COLORS[4] = { 2, 1, 1, 3 };
// by the Mondain executable's own startup code, which isn't ported)
static const byte GEM_DIAMOND_HALF_WIDTH[8] = { 0, 1, 2, 3, 3, 2, 1, 0 };
-bool EnteringCraft::msgFocus(const FocusMessage &msg) {
+bool EnteringCraft::msgFocus(const FocusMessage &) {
setBounds(Common::Rect(DIALOG_X1, DIALOG_Y1, DIALOG_X2, DIALOG_Y2));
_page = 1;
@@ -168,12 +168,12 @@ void EnteringCraft::drawGem(int cellX, int cellY, byte color) {
}
}
-bool EnteringCraft::msgAction(const ActionMessage &msg) {
+bool EnteringCraft::msgAction(const ActionMessage &) {
nextPage();
return true;
}
-bool EnteringCraft::msgKeypress(const KeypressMessage &msg) {
+bool EnteringCraft::msgKeypress(const KeypressMessage &) {
nextPage();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/king.cpp b/engines/ultima/ultima1/views/interactions/king.cpp
index 71b80d845f6..d706c78be33 100644
--- a/engines/ultima/ultima1/views/interactions/king.cpp
+++ b/engines/ultima/ultima1/views/interactions/king.cpp
@@ -59,7 +59,7 @@ static const char *const GEM_REWARD_LINES[4][4] = {
King::King() : Interaction("King") {
}
-bool King::msgFocus(const FocusMessage &msg) {
+bool King::msgFocus(const FocusMessage &) {
_mode = KING_PROMPT;
setBounds(Common::Rect(0, 0, 0, 0));
@@ -72,7 +72,7 @@ bool King::msgFocus(const FocusMessage &msg) {
return true;
}
-bool King::msgAction(const ActionMessage &msg) {
+bool King::msgAction(const ActionMessage &) {
if (_mode == KING_QUEST || _mode == KING_REWARD)
return true;
diff --git a/engines/ultima/ultima1/views/interactions/liftoff.cpp b/engines/ultima/ultima1/views/interactions/liftoff.cpp
index 25a26656bed..80f9d485f9a 100644
--- a/engines/ultima/ultima1/views/interactions/liftoff.cpp
+++ b/engines/ultima/ultima1/views/interactions/liftoff.cpp
@@ -28,7 +28,7 @@ namespace Ultima1 {
namespace Views {
namespace Interactions {
-bool LiftOff::msgFocus(const FocusMessage &msg) {
+bool LiftOff::msgFocus(const FocusMessage &) {
setBounds(Common::Rect(0, 0, 0, 0));
_counter = 10;
@@ -52,12 +52,12 @@ void LiftOff::timeout() {
}
}
-bool LiftOff::msgAction(const ActionMessage &msg) {
+bool LiftOff::msgAction(const ActionMessage &) {
skip();
return true;
}
-bool LiftOff::msgKeypress(const KeypressMessage &msg) {
+bool LiftOff::msgKeypress(const KeypressMessage &) {
skip();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/lose.cpp b/engines/ultima/ultima1/views/interactions/lose.cpp
index f634e06716c..438eab15e1f 100644
--- a/engines/ultima/ultima1/views/interactions/lose.cpp
+++ b/engines/ultima/ultima1/views/interactions/lose.cpp
@@ -32,7 +32,7 @@ namespace Interactions {
constexpr int DIALOG_X1 = 31, DIALOG_Y1 = 23, DIALOG_X2 = 287, DIALOG_Y2 = 127;
constexpr int BORDER_X1 = 34, BORDER_Y1 = 26, BORDER_X2 = 284, BORDER_Y2 = 124;
-bool Lose::msgFocus(const FocusMessage &msg) {
+bool Lose::msgFocus(const FocusMessage &) {
setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
g_engine->send("Commands", GameMessage("TEXT", "THOU ART DEAD!"));
@@ -58,13 +58,13 @@ void Lose::drawDialog() {
s.writeString(Common::Point(5, 12), " THE UNIVERSE IS DOOMED!");
}
-bool Lose::msgAction(const ActionMessage &msg) {
+bool Lose::msgAction(const ActionMessage &) {
// No resurrection from this one - straight back to the main menu
g_engine->replaceView("MainMenu", true);
return true;
}
-bool Lose::msgKeypress(const KeypressMessage &msg) {
+bool Lose::msgKeypress(const KeypressMessage &) {
g_engine->replaceView("MainMenu", true);
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/merchant.cpp b/engines/ultima/ultima1/views/interactions/merchant.cpp
index d4b01348d0d..f6ad51f2275 100644
--- a/engines/ultima/ultima1/views/interactions/merchant.cpp
+++ b/engines/ultima/ultima1/views/interactions/merchant.cpp
@@ -103,7 +103,7 @@ static const ShopName &shopNameFor(int shopType, int variant) {
Merchant::Merchant() : Interaction("Merchant") {
}
-bool Merchant::msgFocus(const FocusMessage &msg) {
+bool Merchant::msgFocus(const FocusMessage &) {
_mode = SHOP_PROMPT;
setBounds(Common::Rect(0, 0, 0, 0));
@@ -137,7 +137,7 @@ bool Merchant::msgFocus(const FocusMessage &msg) {
return true;
}
-bool Merchant::msgAction(const ActionMessage &msg) {
+bool Merchant::msgAction(const ActionMessage &) {
if (_mode == SHOP_MESSAGE)
nextScreen();
else
diff --git a/engines/ultima/ultima1/views/interactions/operate_craft.cpp b/engines/ultima/ultima1/views/interactions/operate_craft.cpp
index b3fb32dc059..5d9c84df257 100644
--- a/engines/ultima/ultima1/views/interactions/operate_craft.cpp
+++ b/engines/ultima/ultima1/views/interactions/operate_craft.cpp
@@ -31,7 +31,7 @@ namespace Interactions {
constexpr int DIALOG_X1 = 31, DIALOG_Y1 = 23, DIALOG_X2 = 287, DIALOG_Y2 = 127;
constexpr int BORDER_X1 = 34, BORDER_Y1 = 26, BORDER_X2 = 284, BORDER_Y2 = 124;
-bool OperateCraft::msgFocus(const FocusMessage &msg) {
+bool OperateCraft::msgFocus(const FocusMessage &) {
setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
showCursor();
return true;
@@ -48,12 +48,12 @@ void OperateCraft::draw() {
s.writeString(Common::Point(6, 9), " time.");
}
-bool OperateCraft::msgAction(const ActionMessage &msg) {
+bool OperateCraft::msgAction(const ActionMessage &) {
finish();
return true;
}
-bool OperateCraft::msgKeypress(const KeypressMessage &msg) {
+bool OperateCraft::msgKeypress(const KeypressMessage &) {
finish();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/pillar.cpp b/engines/ultima/ultima1/views/interactions/pillar.cpp
index 3372ecf5e2a..60d5d9a25df 100644
--- a/engines/ultima/ultima1/views/interactions/pillar.cpp
+++ b/engines/ultima/ultima1/views/interactions/pillar.cpp
@@ -72,7 +72,7 @@ bool Pillar::msgGame(const GameMessage &msg) {
return false;
}
-bool Pillar::msgFocus(const FocusMessage &msg) {
+bool Pillar::msgFocus(const FocusMessage &) {
setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
_borderColor = _G(colors)._border;
@@ -220,12 +220,12 @@ bool Pillar::gainAttribute(int attrIndex) {
return true;
}
-bool Pillar::msgAction(const ActionMessage &msg) {
+bool Pillar::msgAction(const ActionMessage &) {
finish();
return true;
}
-bool Pillar::msgKeypress(const KeypressMessage &msg) {
+bool Pillar::msgKeypress(const KeypressMessage &) {
finish();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/princess_saved.cpp b/engines/ultima/ultima1/views/interactions/princess_saved.cpp
index b03c31c83e1..fee32160311 100644
--- a/engines/ultima/ultima1/views/interactions/princess_saved.cpp
+++ b/engines/ultima/ultima1/views/interactions/princess_saved.cpp
@@ -40,7 +40,7 @@ static const char *const PRINCESS_NAMES[8] = {
PrincessSaved::PrincessSaved() : Interaction("PrincessSaved") {
}
-bool PrincessSaved::msgFocus(const FocusMessage &msg) {
+bool PrincessSaved::msgFocus(const FocusMessage &) {
setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
auto &sg = _G(savegame);
@@ -84,12 +84,12 @@ void PrincessSaved::draw() {
}
}
-bool PrincessSaved::msgAction(const ActionMessage &msg) {
+bool PrincessSaved::msgAction(const ActionMessage &) {
finish();
return true;
}
-bool PrincessSaved::msgKeypress(const KeypressMessage &msg) {
+bool PrincessSaved::msgKeypress(const KeypressMessage &) {
finish();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/ready.cpp b/engines/ultima/ultima1/views/interactions/ready.cpp
index 2be6ae8ce51..bc744241ed0 100644
--- a/engines/ultima/ultima1/views/interactions/ready.cpp
+++ b/engines/ultima/ultima1/views/interactions/ready.cpp
@@ -31,7 +31,7 @@ namespace Interactions {
Ready::Ready() : Interaction("Ready") {
}
-bool Ready::msgFocus(const FocusMessage &msg) {
+bool Ready::msgFocus(const FocusMessage &) {
// Start by getting them to select the area
_mode = READY_AREA;
setBounds(Common::Rect(0, 0, 0, 0));
@@ -40,7 +40,7 @@ bool Ready::msgFocus(const FocusMessage &msg) {
return true;
}
-bool Ready::msgAction(const ActionMessage &msg) {
+bool Ready::msgAction(const ActionMessage &) {
nothing();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/sector_scan.cpp b/engines/ultima/ultima1/views/interactions/sector_scan.cpp
index 1a48394bed0..00c1e3473e9 100644
--- a/engines/ultima/ultima1/views/interactions/sector_scan.cpp
+++ b/engines/ultima/ultima1/views/interactions/sector_scan.cpp
@@ -43,7 +43,7 @@ static int cellY(int sy) { return sy * 10 + 46; }
// blinks
constexpr int BLINK_TICKS = 8;
-bool SectorScan::msgFocus(const FocusMessage &msg) {
+bool SectorScan::msgFocus(const FocusMessage &) {
setBounds(Common::Rect(0, 0, 320, 200));
_blinkCtr = 0;
_blipVisible = true;
@@ -137,12 +137,12 @@ bool SectorScan::tick() {
return Interaction::tick();
}
-bool SectorScan::msgAction(const ActionMessage &msg) {
+bool SectorScan::msgAction(const ActionMessage &) {
close();
return true;
}
-bool SectorScan::msgKeypress(const KeypressMessage &msg) {
+bool SectorScan::msgKeypress(const KeypressMessage &) {
close();
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/space_station.cpp b/engines/ultima/ultima1/views/interactions/space_station.cpp
index 6a46ec79e21..5345ef236c5 100644
--- a/engines/ultima/ultima1/views/interactions/space_station.cpp
+++ b/engines/ultima/ultima1/views/interactions/space_station.cpp
@@ -30,7 +30,7 @@ namespace Interactions {
constexpr int DOCKING_FEE = 500;
-bool SpaceStation::msgFocus(const FocusMessage &msg) {
+bool SpaceStation::msgFocus(const FocusMessage &) {
setBounds(Common::Rect(0, 0, 0, 0));
// The ship is now docked - stop drifting and drop the exhaust trail
@@ -82,7 +82,7 @@ bool SpaceStation::msgFocus(const FocusMessage &msg) {
return true;
}
-bool SpaceStation::msgAction(const ActionMessage &msg) {
+bool SpaceStation::msgAction(const ActionMessage &) {
// Only a docking-port digit (handled in msgKeypress) does anything here
return true;
}
diff --git a/engines/ultima/ultima1/views/interactions/win.cpp b/engines/ultima/ultima1/views/interactions/win.cpp
index 27f5b2edc53..154d39a39df 100644
--- a/engines/ultima/ultima1/views/interactions/win.cpp
+++ b/engines/ultima/ultima1/views/interactions/win.cpp
@@ -68,7 +68,7 @@ static const char *const ENDING_TEXT[] = {
"forth. So let it be done.\""
};
-bool Win::msgFocus(const FocusMessage &msg) {
+bool Win::msgFocus(const FocusMessage &) {
setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
_phase = PHASE_DIALOG;
_revealedRows = 0;
@@ -126,12 +126,12 @@ bool Win::tick() {
return Interaction::tick();
}
-bool Win::msgAction(const ActionMessage &msg) {
+bool Win::msgAction(const ActionMessage &) {
advancePhase();
return true;
}
-bool Win::msgKeypress(const KeypressMessage &msg) {
+bool Win::msgKeypress(const KeypressMessage &) {
advancePhase();
return true;
}
diff --git a/engines/ultima/ultima1/views/space_cockpit.cpp b/engines/ultima/ultima1/views/space_cockpit.cpp
index a4ee7a53a8c..0a405a4b2f2 100644
--- a/engines/ultima/ultima1/views/space_cockpit.cpp
+++ b/engines/ultima/ultima1/views/space_cockpit.cpp
@@ -113,7 +113,7 @@ bool SpaceCockpit::msgMouseMove(const MouseMoveMessage &msg) {
return true;
}
-bool SpaceCockpit::msgMouseDown(const MouseDownMessage &msg) {
+bool SpaceCockpit::msgMouseDown(const MouseDownMessage &) {
if (!cancelHyperjump())
_G(logic)->action(KEYBIND_FIRE);
return true;
diff --git a/engines/ultima/ultima1/views/startup.h b/engines/ultima/ultima1/views/startup.h
index 6811c95cae7..a5b8af48548 100644
--- a/engines/ultima/ultima1/views/startup.h
+++ b/engines/ultima/ultima1/views/startup.h
@@ -46,15 +46,15 @@ public:
bool msgFocus(const FocusMessage &msg) override;
void timeout() override;
- bool msgKeypress(const KeypressMessage &msg) override {
+ bool msgKeypress(const KeypressMessage &) override {
showTitle();
return true;
}
- bool msgMouseDown(const MouseDownMessage &msg) override {
+ bool msgMouseDown(const MouseDownMessage &) override {
showTitle();
return true;
}
- bool msgAction(const ActionMessage &msg) override {
+ bool msgAction(const ActionMessage &) override {
showTitle();
return true;
}
diff --git a/engines/ultima/ultima1/views/title.cpp b/engines/ultima/ultima1/views/title.cpp
index fff3ca161cf..21739a3a084 100644
--- a/engines/ultima/ultima1/views/title.cpp
+++ b/engines/ultima/ultima1/views/title.cpp
@@ -462,7 +462,7 @@ void Title::showMainMenu() {
replaceView("MainMenu");
}
-bool Title::msgKeypress(const KeypressMessage &msg) {
+bool Title::msgKeypress(const KeypressMessage &) {
if (_state == CREDITS)
showMainMenu();
else
@@ -470,7 +470,7 @@ bool Title::msgKeypress(const KeypressMessage &msg) {
return true;
}
-bool Title::msgMouseDown(const MouseDownMessage &msg) {
+bool Title::msgMouseDown(const MouseDownMessage &) {
if (_state == CREDITS)
showMainMenu();
else
@@ -478,7 +478,7 @@ bool Title::msgMouseDown(const MouseDownMessage &msg) {
return true;
}
-bool Title::msgAction(const ActionMessage &msg) {
+bool Title::msgAction(const ActionMessage &) {
if (_state == CREDITS)
showMainMenu();
else
diff --git a/engines/ultima/ultima1/views/zstats.cpp b/engines/ultima/ultima1/views/zstats.cpp
index 4d714ea968e..3d2243dee3b 100644
--- a/engines/ultima/ultima1/views/zstats.cpp
+++ b/engines/ultima/ultima1/views/zstats.cpp
@@ -134,12 +134,12 @@ Common::String ZStats::getLine(const char *name, int value) {
return result + numStr;
}
-bool ZStats::msgAction(const ActionMessage &msg) {
+bool ZStats::msgAction(const ActionMessage &) {
keyPressed();
return true;
}
-bool ZStats::msgKeypress(const KeypressMessage &msg) {
+bool ZStats::msgKeypress(const KeypressMessage &) {
keyPressed();
return true;
}
diff --git a/engines/ultima/ultima2/console.cpp b/engines/ultima/ultima2/console.cpp
index 54545cc9849..cac89fca953 100644
--- a/engines/ultima/ultima2/console.cpp
+++ b/engines/ultima/ultima2/console.cpp
@@ -90,7 +90,7 @@ bool Console::cmdMap(int argc, const char **argv) {
return false;
}
-bool Console::cmdTiles(int argc, const char **argv) {
+bool Console::cmdTiles(int, const char **) {
Graphics::Surface tiles[Data::TILE_COUNT];
Data::loadTiles(tiles, g_engine->getRenderMode());
@@ -189,7 +189,7 @@ bool Console::cmdLocations(int argc, const char **argv) {
return true;
}
-bool Console::cmdEnemy(int argc, const char **argv) {
+bool Console::cmdEnemy(int, const char **) {
Data::Savegame &sg = _G(savegame);
if (sg._mapType != 0) {
debugPrintf("Only supported on the overworld map\n");
@@ -261,7 +261,7 @@ bool Console::cmdEnemy(int argc, const char **argv) {
return true;
}
-bool Console::cmdIntangible(int argc, const char **argv) {
+bool Console::cmdIntangible(int, const char **) {
_G(intangible) = !_G(intangible);
debugPrintf("Intangible mode %s\n", _G(intangible) ? "ON" : "OFF");
return true;
@@ -275,7 +275,7 @@ bool Console::cmdHP(int argc, const char **argv) {
return true;
}
-bool Console::cmdFood(int argc, const char **argv) {
+bool Console::cmdFood(int, const char **) {
_G(savegame)._food = 9999;
_G(savegame)._foodTurnCtr = 0;
g_engine->baseView()->findView("Stats")->draw();
@@ -283,7 +283,7 @@ bool Console::cmdFood(int argc, const char **argv) {
return true;
}
-bool Console::cmdGold(int argc, const char **argv) {
+bool Console::cmdGold(int, const char **) {
_G(savegame)._gold = 9999;
g_engine->baseView()->findView("Stats")->draw();
debugPrintf("Gold set to 9999\n");
@@ -380,7 +380,7 @@ bool Console::cmdTransport(int argc, const char **argv) {
return true;
}
-bool Console::cmdStats(int argc, const char **argv) {
+bool Console::cmdStats(int, const char **) {
Data::Savegame &sg = _G(savegame);
sg._strength = sg._agility = sg._stamina = Data::MAX_BCD_BYTE;
@@ -389,7 +389,7 @@ bool Console::cmdStats(int argc, const char **argv) {
return true;
}
-bool Console::cmdInventory(int argc, const char **argv) {
+bool Console::cmdInventory(int, const char **) {
Data::Savegame &sg = _G(savegame);
for (int i = 1; i < Data::ARMOR_COUNT; ++i)
@@ -432,7 +432,7 @@ bool Console::cmdInventory(int argc, const char **argv) {
return true;
}
-bool Console::cmdSpace(int argc, const char **argv) {
+bool Console::cmdSpace(int, const char **) {
// The first launch from Earth remembers where to come back to
Data::Savegame &sg = _G(savegame);
if (sg._orbitTarget == 0 && sg._mapType == 0) {
diff --git a/engines/ultima/ultima2/data/secret_archive.h b/engines/ultima/ultima2/data/secret_archive.h
index a8f2d70469e..51273d21ab3 100644
--- a/engines/ultima/ultima2/data/secret_archive.h
+++ b/engines/ultima/ultima2/data/secret_archive.h
@@ -50,8 +50,8 @@ public:
*
* @return the number of members added to list
*/
- int listMatchingMembers(Common::ArchiveMemberList &list,
- const Common::Path &pattern, bool matchPathComponents = false) const override {
+ int listMatchingMembers(Common::ArchiveMemberList &,
+ const Common::Path &, bool = false) const override {
return 0;
}
@@ -61,7 +61,7 @@ public:
*
* @return the number of names added to list
*/
- int listMembers(Common::ArchiveMemberList &list) const override {
+ int listMembers(Common::ArchiveMemberList &) const override {
return 0;
}
diff --git a/engines/ultima/ultima2/logic/dungeon_logic.cpp b/engines/ultima/ultima2/logic/dungeon_logic.cpp
index 26747660081..343091cf333 100644
--- a/engines/ultima/ultima2/logic/dungeon_logic.cpp
+++ b/engines/ultima/ultima2/logic/dungeon_logic.cpp
@@ -271,7 +271,7 @@ void DungeonLogic::killMonster(int slot) {
sg._experience = MIN(sg._experience + exp, Data::MAX_BCD_WORD);
}
-bool DungeonLogic::attack(Data::Direction dir) {
+bool DungeonLogic::attack(Data::Direction) {
Data::Savegame &sg = _G(savegame);
Data::MapMonsters &monsters = _G(map)._monsters;
playFX(Data::SFX_ATTACK);
diff --git a/engines/ultima/ultima2/logic/logic.cpp b/engines/ultima/ultima2/logic/logic.cpp
index 9e3559eb3c5..c58fbae8e8f 100644
--- a/engines/ultima/ultima2/logic/logic.cpp
+++ b/engines/ultima/ultima2/logic/logic.cpp
@@ -279,13 +279,13 @@ bool Logic::trySpendGold(int amount) {
return true;
}
-void Logic::keypress(const Graphics::Views::KeypressMessage &msg) {
+void Logic::keypress(const Graphics::Views::KeypressMessage &) {
writeString("-Illegal Command!\n");
endOfTurn();
prompt();
}
-bool Logic::attack(Data::Direction dir) {
+bool Logic::attack(Data::Direction) {
writeString("Attack?\n");
return true;
}
@@ -389,7 +389,7 @@ bool Logic::enter() {
return true;
}
-bool Logic::fire(Data::Direction dir) {
+bool Logic::fire(Data::Direction) {
writeString("Fire what?\n");
return true;
}
diff --git a/engines/ultima/ultima2/logic/logic.h b/engines/ultima/ultima2/logic/logic.h
index 219862fec8e..1fa6846ff5e 100644
--- a/engines/ultima/ultima2/logic/logic.h
+++ b/engines/ultima/ultima2/logic/logic.h
@@ -112,7 +112,7 @@ protected:
* that's being deferred - typically because a sub-dialog was opened
* that will only complete the action once it closes ---*/
- virtual bool move(Data::Direction dir) {
+ virtual bool move(Data::Direction) {
return false;
}
virtual bool board();
@@ -175,14 +175,14 @@ public:
/**
* Called once a digit has been chosen by the OfferGold interaction
*/
- virtual void completeOffer(int goldHundreds) {
+ virtual void completeOffer(int) {
}
/**
* Called once an attribute has been chosen by the StatBoost interaction
* (1 to 6, anything else being none of them)
*/
- virtual void completeStatBoost(int choice) {
+ virtual void completeStatBoost(int) {
}
/**
diff --git a/engines/ultima/ultima2/logic/space_logic.cpp b/engines/ultima/ultima2/logic/space_logic.cpp
index 0ddb78938ae..57391b394fb 100644
--- a/engines/ultima/ultima2/logic/space_logic.cpp
+++ b/engines/ultima/ultima2/logic/space_logic.cpp
@@ -229,7 +229,7 @@ void SpaceLogic::action(int action) {
}
}
-void SpaceLogic::keypress(const Graphics::Views::KeypressMessage &msg) {
+void SpaceLogic::keypress(const Graphics::Views::KeypressMessage &) {
static_cast<Views::SpaceMap *>(g_engine->findView("SpaceMap"))->setShip(CENTER_X, CENTER_Y);
}
diff --git a/engines/ultima/ultima2/ultima2.cpp b/engines/ultima/ultima2/ultima2.cpp
index 6e4d209f858..1400d4f7a2f 100644
--- a/engines/ultima/ultima2/ultima2.cpp
+++ b/engines/ultima/ultima2/ultima2.cpp
@@ -147,7 +147,7 @@ byte Ultima2Engine::randByte() {
return newVal;
}
-bool Ultima2Engine::canSaveGameStateCurrently(Common::U32String *msg) {
+bool Ultima2Engine::canSaveGameStateCurrently(Common::U32String *) {
// Only allow saving when any of the different map views are active, or
// flying in space and not in the middle of a hyperwarp animation
if (dynamic_cast<Views::Map *>(focusedView()) != nullptr)
@@ -157,7 +157,7 @@ bool Ultima2Engine::canSaveGameStateCurrently(Common::U32String *msg) {
return spaceMap != nullptr && !spaceMap->busy();
}
-bool Ultima2Engine::canLoadGameStateCurrently(Common::U32String *msg) {
+bool Ultima2Engine::canLoadGameStateCurrently(Common::U32String *) {
Views::UIElement *view = focusedView();
return canSaveGameStateCurrently() ||
dynamic_cast<Views::Interactions::Dead *>(view) != nullptr ||
diff --git a/engines/ultima/ultima2/ultima2.h b/engines/ultima/ultima2/ultima2.h
index fe204bb04d4..b70f5414d1c 100644
--- a/engines/ultima/ultima2/ultima2.h
+++ b/engines/ultima/ultima2/ultima2.h
@@ -151,7 +151,7 @@ public:
*/
Common::Error syncGame(Common::Serializer &s);
- Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override {
+ Common::Error saveGameStream(Common::WriteStream *stream, bool = false) override {
Common::Serializer s(nullptr, stream);
return syncGame(s);
}
diff --git a/engines/ultima/ultima2/views/dungeon_map.cpp b/engines/ultima/ultima2/views/dungeon_map.cpp
index 7c129a677ae..f19a8d23732 100644
--- a/engines/ultima/ultima2/views/dungeon_map.cpp
+++ b/engines/ultima/ultima2/views/dungeon_map.cpp
@@ -403,7 +403,7 @@ bool DungeonMap::msgUnfocus(const UnfocusMessage &msg) {
return Map::msgUnfocus(msg);
}
-bool DungeonMap::msgAttackTile(const Shared::AttackTileMessage &msg) {
+bool DungeonMap::msgAttackTile(const Shared::AttackTileMessage &) {
// Being hit inverts the whole view, briefly. It's done by redrawing the
// view, rather than inverting the screen, since in the composite
// renderer the screen doesn't hold the CGA pixels
diff --git a/engines/ultima/ultima2/views/helm_map.cpp b/engines/ultima/ultima2/views/helm_map.cpp
index a6220da58f1..453e8c8eab6 100644
--- a/engines/ultima/ultima2/views/helm_map.cpp
+++ b/engines/ultima/ultima2/views/helm_map.cpp
@@ -100,7 +100,7 @@ void HelmMap::draw() {
Gfx::compositeFinish(s);
}
-bool HelmMap::msgKeypress(const KeypressMessage &msg) {
+bool HelmMap::msgKeypress(const KeypressMessage &) {
close();
_G(logic)->resumeTurn();
return true;
diff --git a/engines/ultima/ultima2/views/interactions/dead.cpp b/engines/ultima/ultima2/views/interactions/dead.cpp
index ef57173cf3a..2410aabaf56 100644
--- a/engines/ultima/ultima2/views/interactions/dead.cpp
+++ b/engines/ultima/ultima2/views/interactions/dead.cpp
@@ -27,7 +27,7 @@ namespace Ultima2 {
namespace Views {
namespace Interactions {
-bool Dead::msgFocus(const FocusMessage &msg) {
+bool Dead::msgFocus(const FocusMessage &) {
auto &sg = _G(savegame);
sg._hp = 0;
sg._food = 0;
diff --git a/engines/ultima/ultima2/views/interactions/rocket_landing.cpp b/engines/ultima/ultima2/views/interactions/rocket_landing.cpp
index b419799b941..17647ca6e40 100644
--- a/engines/ultima/ultima2/views/interactions/rocket_landing.cpp
+++ b/engines/ultima/ultima2/views/interactions/rocket_landing.cpp
@@ -65,7 +65,7 @@ bool RocketLanding::tick() {
return Interaction::tick();
}
-bool RocketLanding::msgKeypress(const KeypressMessage &msg) {
+bool RocketLanding::msgKeypress(const KeypressMessage &) {
Data::Savegame &sg = _G(savegame);
close();
writeString("\n");
diff --git a/engines/ultima/ultima2/views/title.cpp b/engines/ultima/ultima2/views/title.cpp
index 936aac177eb..93909180a0f 100644
--- a/engines/ultima/ultima2/views/title.cpp
+++ b/engines/ultima/ultima2/views/title.cpp
@@ -270,7 +270,7 @@ bool Title::msgKeypress(const KeypressMessage &msg) {
return true;
}
-bool Title::msgAction(const ActionMessage &msg) {
+bool Title::msgAction(const ActionMessage &) {
if (_state != MENU)
showMenu();
diff --git a/engines/ultima/ultima2/views/zstats.cpp b/engines/ultima/ultima2/views/zstats.cpp
index a6923f5fb1d..0fd2f51e7c4 100644
--- a/engines/ultima/ultima2/views/zstats.cpp
+++ b/engines/ultima/ultima2/views/zstats.cpp
@@ -138,7 +138,7 @@ void ZStats::draw() {
_textCursor.show();
}
-bool ZStats::msgKeypress(const KeypressMessage &msg) {
+bool ZStats::msgKeypress(const KeypressMessage &) {
close();
_G(logic)->resumeTurn();
return true;
diff --git a/engines/ultima/ultima3/console.cpp b/engines/ultima/ultima3/console.cpp
index 326cb642c8c..54923a7ac62 100644
--- a/engines/ultima/ultima3/console.cpp
+++ b/engines/ultima/ultima3/console.cpp
@@ -151,7 +151,7 @@ bool Console::cmdMap(int argc, const char **argv) {
return false;
}
-bool Console::cmdExodus(int argc, const char **argv) {
+bool Console::cmdExodus(int, const char **) {
constexpr byte ALL_CARDS = 0x0F;
constexpr int START_X = 30, START_Y = 12;
@@ -230,7 +230,7 @@ bool Console::cmdMusic(int argc, const char **argv) {
return true;
}
-bool Console::cmdTiles(int argc, const char **argv) {
+bool Console::cmdTiles(int, const char **) {
Graphics::ManagedSurface surface(Gfx::SHAPE_SIZE, Gfx::SHAPE_SIZE, Graphics::PixelFormat::createFormatCLUT8());
_G(shapes).load();
@@ -327,7 +327,7 @@ bool Console::cmdLocations(int argc, const char **argv) {
return true;
}
-bool Console::cmdIntangible(int argc, const char **argv) {
+bool Console::cmdIntangible(int, const char **) {
_G(intangible) = !_G(intangible);
debugPrintf("Intangible mode %s\n", _G(intangible) ? "ON" : "OFF");
return true;
@@ -538,7 +538,7 @@ bool Console::cmdTransport(int argc, const char **argv) {
return true;
}
-bool Console::cmdEnemies(int argc, const char **argv) {
+bool Console::cmdEnemies(int, const char **) {
const Data::Savegame &sg = _G(savegame);
int count = 0;
@@ -571,7 +571,7 @@ bool Console::cmdEnemies(int argc, const char **argv) {
return true;
}
-bool Console::cmdWin(int argc, const char **argv) {
+bool Console::cmdWin(int, const char **) {
Views::CombatMap *combat = dynamic_cast<Views::CombatMap *>(g_engine->focusedView());
if (!combat) {
debugPrintf("Only works in a fight\n");
diff --git a/engines/ultima/ultima3/gfx/charset.cpp b/engines/ultima/ultima3/gfx/charset.cpp
index d32cb4202c6..f02d3f28364 100644
--- a/engines/ultima/ultima3/gfx/charset.cpp
+++ b/engines/ultima/ultima3/gfx/charset.cpp
@@ -91,7 +91,7 @@ void CharSet::load() {
loadGlyphs(moons, &_data[CHARSET_TEXT_GLYPHS * CHARSET_GLYPH_PIXELS], CHARSET_MOON_GLYPHS);
}
-void CharSet::drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const {
+void CharSet::drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32) const {
if (chr >= CHARSET_GLYPHS)
return;
diff --git a/engines/ultima/ultima3/gfx/charset.h b/engines/ultima/ultima3/gfx/charset.h
index 4b354d8be0d..a7ba9311e3c 100644
--- a/engines/ultima/ultima3/gfx/charset.h
+++ b/engines/ultima/ultima3/gfx/charset.h
@@ -80,7 +80,7 @@ public:
*
* @return The width of the character in pixels.
*/
- int getCharWidth(uint32 chr) const override {
+ int getCharWidth(uint32) const override {
return 8;
}
diff --git a/engines/ultima/ultima3/ultima3.cpp b/engines/ultima/ultima3/ultima3.cpp
index 17e92c70231..d5d62b64259 100644
--- a/engines/ultima/ultima3/ultima3.cpp
+++ b/engines/ultima/ultima3/ultima3.cpp
@@ -147,7 +147,7 @@ void Ultima3Engine::applyGameSettings() {
focusedView()->redraw();
}
-bool Ultima3Engine::canSaveGameStateCurrently(Common::U32String *msg) {
+bool Ultima3Engine::canSaveGameStateCurrently(Common::U32String *) {
// Anything but the title sequence, which isn't a state worth keeping
UIElement *view = focusedView();
@@ -158,7 +158,7 @@ bool Ultima3Engine::canSaveGameStateCurrently(Common::U32String *msg) {
return dynamic_cast<Views::WindowView *>(view) != nullptr;
}
-bool Ultima3Engine::canLoadGameStateCurrently(Common::U32String *msg) {
+bool Ultima3Engine::canLoadGameStateCurrently(Common::U32String *) {
return true;
}
diff --git a/engines/ultima/ultima3/ultima3.h b/engines/ultima/ultima3/ultima3.h
index d05c4feec69..95d82fa5869 100644
--- a/engines/ultima/ultima3/ultima3.h
+++ b/engines/ultima/ultima3/ultima3.h
@@ -187,7 +187,7 @@ public:
*/
Common::Error syncGame(Common::Serializer &s);
- Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override {
+ Common::Error saveGameStream(Common::WriteStream *stream, bool = false) override {
Common::Serializer s(nullptr, stream);
return syncGame(s);
}
diff --git a/engines/ultima/ultima3/views/interactions/interaction.h b/engines/ultima/ultima3/views/interactions/interaction.h
index 1195d846f14..f59cd3da34d 100644
--- a/engines/ultima/ultima3/views/interactions/interaction.h
+++ b/engines/ultima/ultima3/views/interactions/interaction.h
@@ -73,7 +73,7 @@ public:
/**
* Draws over the game view
*/
- virtual void draw(GfxSurface &s) {}
+ virtual void draw(GfxSurface &) {}
};
/**
diff --git a/engines/ultima/ultima3/views/title.cpp b/engines/ultima/ultima3/views/title.cpp
index 956369da7a2..81655ae6030 100644
--- a/engines/ultima/ultima3/views/title.cpp
+++ b/engines/ultima/ultima3/views/title.cpp
@@ -445,17 +445,17 @@ void Title::showLogoScreen() {
replaceView("LogoScreen");
}
-bool Title::msgKeypress(const KeypressMessage &msg) {
+bool Title::msgKeypress(const KeypressMessage &) {
_keyPending = true;
return true;
}
-bool Title::msgMouseDown(const MouseDownMessage &msg) {
+bool Title::msgMouseDown(const MouseDownMessage &) {
_keyPending = true;
return true;
}
-bool Title::msgAction(const ActionMessage &msg) {
+bool Title::msgAction(const ActionMessage &) {
_keyPending = true;
return true;
}
Commit: 85728892423c9a83a8161fe8e93c7225a40a82d8
https://github.com/scummvm/scummvm/commit/85728892423c9a83a8161fe8e93c7225a40a82d8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:19:31+11:00
Commit Message:
ULTIMA: Fix unused local warnings
Changed paths:
engines/ultima/shared/conf/xml_node.cpp
diff --git a/engines/ultima/shared/conf/xml_node.cpp b/engines/ultima/shared/conf/xml_node.cpp
index fffde4aa389..939ba1d3a71 100644
--- a/engines/ultima/shared/conf/xml_node.cpp
+++ b/engines/ultima/shared/conf/xml_node.cpp
@@ -236,6 +236,8 @@ XMLNode *XMLNode::xmlParseDoc(XMLTree *tree, const Common::String &s) {
Common::String sbuf(s);
size_t nn = 0;
bool parsedXmlElement = false, parsedDocType = false;
+ (void)parsedXmlElement; // Only checked by asserts
+ (void)parsedDocType;
XMLNode *node = nullptr, *child = nullptr;
for (;;) {
Commit: 384d1caf31a5a94b64d6cda5fe3a9ab4455033f6
https://github.com/scummvm/scummvm/commit/384d1caf31a5a94b64d6cda5fe3a9ab4455033f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:26:40+11:00
Commit Message:
GRAPHICS: VIEWS: Fix ManagedSurface deprecated declaration in getSurface() calls
Changed paths:
graphics/views/gfx_surface.cpp
graphics/views/gfx_surface.h
diff --git a/graphics/views/gfx_surface.cpp b/graphics/views/gfx_surface.cpp
index 0e95edc6c3e..8643603c761 100644
--- a/graphics/views/gfx_surface.cpp
+++ b/graphics/views/gfx_surface.cpp
@@ -33,10 +33,6 @@ GfxSurface::GfxSurface(Graphics::ManagedSurface &surf, const Common::Rect &bound
_font = Common::SharedPtr<Graphics::Font>(g_events->createFont());
}
-GfxSurface::~GfxSurface() {
- _font.reset();
-}
-
void GfxSurface::writeString(const Common::Point &pt, const Common::String &str,
Graphics::TextAlign align) {
_textPos = pt;
diff --git a/graphics/views/gfx_surface.h b/graphics/views/gfx_surface.h
index 34e8949624a..2a641fc6828 100644
--- a/graphics/views/gfx_surface.h
+++ b/graphics/views/gfx_surface.h
@@ -44,7 +44,6 @@ private:
public:
GfxSurface();
GfxSurface(Graphics::ManagedSurface &surf, const Common::Rect &bounds);
- ~GfxSurface();
/**
* Write some text to the surface
Commit: e3d8368f1dd43ccc9531c0768b23b199ab9c5499
https://github.com/scummvm/scummvm/commit/e3d8368f1dd43ccc9531c0768b23b199ab9c5499
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:29:55+11:00
Commit Message:
ULTIMA: ULTIMA1: Fix ManagedSurface copy warning
Changed paths:
engines/ultima/ultima1/data/map.cpp
diff --git a/engines/ultima/ultima1/data/map.cpp b/engines/ultima/ultima1/data/map.cpp
index 5a2b191e8a0..0338c2647e6 100644
--- a/engines/ultima/ultima1/data/map.cpp
+++ b/engines/ultima/ultima1/data/map.cpp
@@ -163,7 +163,7 @@ void Map::loadGraphics() {
// Tile 0 is a blank empty floor tile, followed by 19 tiles, and tile 20 is duplicated from the overworld tiles
_mondainTiles[0].create(16, 16, Graphics::PixelFormat::createFormatCLUT8());
loadTiles(cga ? "cgamond.bin" : "egamond.bin", &_mondainTiles[1], MONDAIN_TILES_COUNT, 16, cga);
- _mondainTiles[20] = _overworldTiles[TILE_PLAYER];
+ _mondainTiles[20].copyFrom(_overworldTiles[TILE_PLAYER]);
loadShipTiles(cga ? "cgaspace.bin" : "egaspace.bin", _spaceShipTiles, SPACE_SHIP_TILES_COUNT,
SPACE_SHIP_TILE_WIDTH, cga);
Commit: bfb4e4e22f10713c4ad27d0fcd34fc662cc1ef26
https://github.com/scummvm/scummvm/commit/bfb4e4e22f10713c4ad27d0fcd34fc662cc1ef26
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T12:34:18+11:00
Commit Message:
ULTIMA: Miscellaneous gcc warning fixes
Changed paths:
engines/ultima/ultima1/data/map.h
engines/ultima/ultima1/metaengine.cpp
engines/ultima/ultima1/views/interactions/dead.cpp
engines/ultima/ultima1/views/mondain_map.cpp
engines/ultima/ultima1/views/overworld_map.cpp
engines/ultima/ultima2/metaengine.cpp
engines/ultima/ultima3/metaengine.cpp
diff --git a/engines/ultima/ultima1/data/map.h b/engines/ultima/ultima1/data/map.h
index ff35c82b247..2c1d6c75a60 100644
--- a/engines/ultima/ultima1/data/map.h
+++ b/engines/ultima/ultima1/data/map.h
@@ -194,6 +194,10 @@ public:
return _tiles;
}
+ Graphics::ManagedSurface *tiles() {
+ return _tiles;
+ }
+
/**
* Get the outer-space ship glyph tiles, indexed by shipType*4+facing
*/
diff --git a/engines/ultima/ultima1/metaengine.cpp b/engines/ultima/ultima1/metaengine.cpp
index 6fa0bfa783a..552c5d245b0 100644
--- a/engines/ultima/ultima1/metaengine.cpp
+++ b/engines/ultima/ultima1/metaengine.cpp
@@ -81,32 +81,32 @@ static const KeybindingRecord GAMEPLAY_KEYS[] = {
// Space has everything but the directional attack keys (though most don't do anything).
// Not those keys because the numbers are used for speed control
static const KeybindingRecord SPACE_KEYS[] = {
- { KEYBIND_UP, "UP", _s("Up"), "UP", "JOY_UP"},
- { KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", "JOY_DOWN"},
- { KEYBIND_LEFT, "LEFT", _s("Left"), "LEFT", "JOY_LEFT"},
- { KEYBIND_RIGHT, "RIGHT", _s("Right"), "RIGHT", "JOY_RIGHT"},
- { KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", nullptr },
- { KEYBIND_BOARD, "BOARD", _s("Board"), "b", nullptr },
- { KEYBIND_CAST, "CAST", _s("Cast"), "c", nullptr },
- { KEYBIND_DROP, "DROP", _s("Drop"), "d", nullptr },
- { KEYBIND_ENTER, "ENTER", _s("Enter"), "e", nullptr },
- { KEYBIND_FIRE, "FIRE", _s("Fire"), "f", nullptr },
- { KEYBIND_GET, "GET", _s("Get"), "g", nullptr },
- { KEYBIND_HYPERJUMP, "HYPERJUMP", _s("Hyperjump"), "h", nullptr },
- { KEYBIND_INFORM, "INFORM", _s("Inform"), "i", nullptr },
- { KEYBIND_CLIMB, "CLIMB", _s("Klimb"), "k", nullptr },
- { KEYBIND_NOISE, "NOISE", _s("Noise"), "n", nullptr },
- { KEYBIND_OPEN, "OPEN", _s("Open"), "o", nullptr },
- { KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr },
- { KEYBIND_READY, "READY", _s("Ready"), "r", nullptr },
- { KEYBIND_STEAL, "STEAL", _s("Steal"), "s", nullptr },
- { KEYBIND_TRANSACT, "TRANSACT", _s("Transact"), "t", nullptr },
- { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr },
- { KEYBIND_VIEW, "VIEW", _s("View change"), "v", nullptr },
- { KEYBIND_EXIT, "EXIT", _s("eXit"), "x", nullptr },
- { KEYBIND_STATS, "STATS", _s("Ztats"), "z", nullptr },
- { KEYBIND_PASS, "PASS", _s("Pass"), " ", nullptr },
- { KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
+ { KEYBIND_UP, "UP", _s("Up"), "UP", "JOY_UP", nullptr },
+ { KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", "JOY_DOWN", nullptr },
+ { KEYBIND_LEFT, "LEFT", _s("Left"), "LEFT", "JOY_LEFT", nullptr },
+ { KEYBIND_RIGHT, "RIGHT", _s("Right"), "RIGHT", "JOY_RIGHT", nullptr },
+ { KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", nullptr, nullptr },
+ { KEYBIND_BOARD, "BOARD", _s("Board"), "b", nullptr, nullptr },
+ { KEYBIND_CAST, "CAST", _s("Cast"), "c", nullptr, nullptr },
+ { KEYBIND_DROP, "DROP", _s("Drop"), "d", nullptr, nullptr },
+ { KEYBIND_ENTER, "ENTER", _s("Enter"), "e", nullptr, nullptr },
+ { KEYBIND_FIRE, "FIRE", _s("Fire"), "f", nullptr, nullptr },
+ { KEYBIND_GET, "GET", _s("Get"), "g", nullptr, nullptr },
+ { KEYBIND_HYPERJUMP, "HYPERJUMP", _s("Hyperjump"), "h", nullptr, nullptr },
+ { KEYBIND_INFORM, "INFORM", _s("Inform"), "i", nullptr, nullptr },
+ { KEYBIND_CLIMB, "CLIMB", _s("Klimb"), "k", nullptr, nullptr },
+ { KEYBIND_NOISE, "NOISE", _s("Noise"), "n", nullptr, nullptr },
+ { KEYBIND_OPEN, "OPEN", _s("Open"), "o", nullptr, nullptr },
+ { KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr, nullptr },
+ { KEYBIND_READY, "READY", _s("Ready"), "r", nullptr, nullptr },
+ { KEYBIND_STEAL, "STEAL", _s("Steal"), "s", nullptr, nullptr },
+ { KEYBIND_TRANSACT, "TRANSACT", _s("Transact"), "t", nullptr, nullptr },
+ { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr, nullptr },
+ { KEYBIND_VIEW, "VIEW", _s("View change"), "v", nullptr, nullptr },
+ { KEYBIND_EXIT, "EXIT", _s("eXit"), "x", nullptr, nullptr },
+ { KEYBIND_STATS, "STATS", _s("Ztats"), "z", nullptr, nullptr },
+ { KEYBIND_PASS, "PASS", _s("Pass"), " ", nullptr, nullptr },
+ { KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr, nullptr }
};
struct KeysRecord {
diff --git a/engines/ultima/ultima1/views/interactions/dead.cpp b/engines/ultima/ultima1/views/interactions/dead.cpp
index 0a170ee81d1..66349cb6948 100644
--- a/engines/ultima/ultima1/views/interactions/dead.cpp
+++ b/engines/ultima/ultima1/views/interactions/dead.cpp
@@ -40,7 +40,6 @@ constexpr int RESURRECTED_AMOUNT = 99;
// The skull glyph shown while the player is dead - a 64x95 1-bit-per-pixel
// bitmap, stored as 95 rows of 4 big-endian 16-bit words (bit 15 = leftmost
// pixel of the word), matching the original's drawDeathGraphic byte table
-constexpr int DEATH_GRAPHIC_WIDTH = 64;
constexpr int DEATH_GRAPHIC_HEIGHT = 95;
// Absolute screen position the original centers the glyph at within the
diff --git a/engines/ultima/ultima1/views/mondain_map.cpp b/engines/ultima/ultima1/views/mondain_map.cpp
index 6dee8446aa0..72a16b2e141 100644
--- a/engines/ultima/ultima1/views/mondain_map.cpp
+++ b/engines/ultima/ultima1/views/mondain_map.cpp
@@ -29,7 +29,6 @@ namespace Views {
constexpr int TILE_WIDTH = 16;
constexpr int TILE_HEIGHT = 16;
-constexpr int ATTACK_TILE_DELAY = 100; // Delay after flashing an attack tile
bool MondainMap::msgFocus(const FocusMessage &msg) {
diff --git a/engines/ultima/ultima1/views/overworld_map.cpp b/engines/ultima/ultima1/views/overworld_map.cpp
index 16164b7d97c..8cbbbc4757d 100644
--- a/engines/ultima/ultima1/views/overworld_map.cpp
+++ b/engines/ultima/ultima1/views/overworld_map.cpp
@@ -73,8 +73,8 @@ void OverworldMap::timeout() {
}
void OverworldMap::animateWater() {
- const Graphics::ManagedSurface *tiles = _G(map).tiles();
- const Graphics::ManagedSurface &tile = tiles[Data::TILE_OCEAN];
+ Graphics::ManagedSurface *tiles = _G(map).tiles();
+ Graphics::ManagedSurface &tile = tiles[Data::TILE_OCEAN];
assert(tile.w == TILE_WIDTH && tile.h == TILE_HEIGHT);
byte lastRow[TILE_WIDTH];
diff --git a/engines/ultima/ultima2/metaengine.cpp b/engines/ultima/ultima2/metaengine.cpp
index ff3058b532c..27365ff8adb 100644
--- a/engines/ultima/ultima2/metaengine.cpp
+++ b/engines/ultima/ultima2/metaengine.cpp
@@ -46,37 +46,37 @@ static const KeybindingRecord MINIMAL_KEYS[] = {
};
static const KeybindingRecord GAMEPLAY_KEYS[] = {
- { KEYBIND_UP, "UP", _s("Up"), "UP", "JOY_UP"},
- { KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", "JOY_DOWN"},
- { KEYBIND_LEFT, "LEFT", _s("Left"), "LEFT", "JOY_LEFT"},
- { KEYBIND_RIGHT, "RIGHT", _s("Right"), "RIGHT", "JOY_RIGHT"},
- { KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", nullptr },
- { KEYBIND_BOARD, "BOARD", _s("Board"), "b", nullptr },
- { KEYBIND_CAST, "CAST", _s("Cast"), "c", nullptr },
- { KEYBIND_DESCEND, "DESCEND", _s("Descend"), "d", nullptr },
- { KEYBIND_ENTER, "ENTER", _s("Enter"), "e", nullptr },
- { KEYBIND_FIRE, "FIRE", _s("Fire"), "f", nullptr },
- { KEYBIND_GET, "GET", _s("Get"), "g", nullptr },
- { KEYBIND_HYPER, "HYPER", _s("Hyper"), "h", nullptr },
- { KEYBIND_IGNITE_TORCH, "IGNITE_TORCH", _s("Ignite torch"), "i", nullptr },
- { KEYBIND_JUMP, "JUMP", _s("Jump"), "j", nullptr },
- { KEYBIND_KLIMB, "KLIMB", _s("Klimb"), "k", nullptr },
- { KEYBIND_LAUNCH, "LAUNCH", _s("Launch"), "l", nullptr },
- { KEYBIND_MAGIC, "MAGIC", _s("Magic"), "m", nullptr },
- { KEYBIND_NEGATE_TIME, "NEGATE_TIME", _s("Negate time"), "n", nullptr },
- { KEYBIND_OFFER, "OFFER", _s("Offer"), "o", nullptr },
- { KEYBIND_PASS, "PASS", _s("Pass"), "p", "SPACE" },
- { KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr },
- { KEYBIND_READY, "READY", _s("Ready"), "r", nullptr },
- { KEYBIND_STEAL, "STEAL", _s("Steal"), "s", nullptr },
- { KEYBIND_TRANSACT, "TRANSACT", _s("Transact"), "t", nullptr },
- { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr },
- { KEYBIND_VIEW, "VIEW", _s("View"), "v", nullptr },
- { KEYBIND_WEAR_ARMOR, "WEAR_ARMOR", _s("Wear armor"), "w", nullptr },
- { KEYBIND_X_IT, "X_IT", _s("eXit"), "x", nullptr },
- { KEYBIND_YELL, "YELL", _s("Yell"), "y", nullptr },
- { KEYBIND_ZSTATS, "ZSTATS", _s("Ztats"), "z", nullptr },
- { KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
+ { KEYBIND_UP, "UP", _s("Up"), "UP", "JOY_UP", nullptr },
+ { KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", "JOY_DOWN", nullptr },
+ { KEYBIND_LEFT, "LEFT", _s("Left"), "LEFT", "JOY_LEFT", nullptr },
+ { KEYBIND_RIGHT, "RIGHT", _s("Right"), "RIGHT", "JOY_RIGHT", nullptr },
+ { KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", nullptr, nullptr },
+ { KEYBIND_BOARD, "BOARD", _s("Board"), "b", nullptr, nullptr },
+ { KEYBIND_CAST, "CAST", _s("Cast"), "c", nullptr, nullptr },
+ { KEYBIND_DESCEND, "DESCEND", _s("Descend"), "d", nullptr, nullptr },
+ { KEYBIND_ENTER, "ENTER", _s("Enter"), "e", nullptr, nullptr },
+ { KEYBIND_FIRE, "FIRE", _s("Fire"), "f", nullptr, nullptr },
+ { KEYBIND_GET, "GET", _s("Get"), "g", nullptr, nullptr },
+ { KEYBIND_HYPER, "HYPER", _s("Hyper"), "h", nullptr, nullptr },
+ { KEYBIND_IGNITE_TORCH, "IGNITE_TORCH", _s("Ignite torch"), "i", nullptr, nullptr },
+ { KEYBIND_JUMP, "JUMP", _s("Jump"), "j", nullptr, nullptr },
+ { KEYBIND_KLIMB, "KLIMB", _s("Klimb"), "k", nullptr, nullptr },
+ { KEYBIND_LAUNCH, "LAUNCH", _s("Launch"), "l", nullptr, nullptr },
+ { KEYBIND_MAGIC, "MAGIC", _s("Magic"), "m", nullptr, nullptr },
+ { KEYBIND_NEGATE_TIME, "NEGATE_TIME", _s("Negate time"), "n", nullptr, nullptr },
+ { KEYBIND_OFFER, "OFFER", _s("Offer"), "o", nullptr, nullptr },
+ { KEYBIND_PASS, "PASS", _s("Pass"), "p", "SPACE", nullptr },
+ { KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr, nullptr },
+ { KEYBIND_READY, "READY", _s("Ready"), "r", nullptr, nullptr },
+ { KEYBIND_STEAL, "STEAL", _s("Steal"), "s", nullptr, nullptr },
+ { KEYBIND_TRANSACT, "TRANSACT", _s("Transact"), "t", nullptr, nullptr },
+ { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr, nullptr },
+ { KEYBIND_VIEW, "VIEW", _s("View"), "v", nullptr, nullptr },
+ { KEYBIND_WEAR_ARMOR, "WEAR_ARMOR", _s("Wear armor"), "w", nullptr, nullptr },
+ { KEYBIND_X_IT, "X_IT", _s("eXit"), "x", nullptr, nullptr },
+ { KEYBIND_YELL, "YELL", _s("Yell"), "y", nullptr, nullptr },
+ { KEYBIND_ZSTATS, "ZSTATS", _s("Ztats"), "z", nullptr, nullptr },
+ { KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr, nullptr }
};
struct KeysRecord {
diff --git a/engines/ultima/ultima3/metaengine.cpp b/engines/ultima/ultima3/metaengine.cpp
index f7b763a0afa..1028d277ebe 100644
--- a/engines/ultima/ultima3/metaengine.cpp
+++ b/engines/ultima/ultima3/metaengine.cpp
@@ -46,37 +46,37 @@ static const KeybindingRecord MINIMAL_KEYS[] = {
};
static const KeybindingRecord GAMEPLAY_KEYS[] = {
- { KEYBIND_UP, "UP", _s("Up"), "UP", "JOY_UP"},
- { KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", "JOY_DOWN"},
- { KEYBIND_LEFT, "LEFT", _s("Left"), "LEFT", "JOY_LEFT"},
- { KEYBIND_RIGHT, "RIGHT", _s("Right"), "RIGHT", "JOY_RIGHT"},
- { KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", nullptr },
- { KEYBIND_BOARD, "BOARD", _s("Board"), "b", nullptr },
- { KEYBIND_CAST, "CAST", _s("Cast"), "c", nullptr },
- { KEYBIND_DESCEND, "DESCEND", _s("Descend"), "d", nullptr },
- { KEYBIND_ENTER, "ENTER", _s("Enter"), "e", nullptr },
- { KEYBIND_FIRE, "FIRE", _s("Fire"), "f", nullptr },
- { KEYBIND_GET, "GET", _s("Get"), "g", nullptr },
- { KEYBIND_HYPER, "HYPER", _s("Hyper"), "h", nullptr },
- { KEYBIND_IGNITE_TORCH, "IGNITE_TORCH", _s("Ignite torch"), "i", nullptr },
- { KEYBIND_JUMP, "JUMP", _s("Jump"), "j", nullptr },
- { KEYBIND_KLIMB, "KLIMB", _s("Klimb"), "k", nullptr },
- { KEYBIND_LAUNCH, "LAUNCH", _s("Launch"), "l", nullptr },
- { KEYBIND_MAGIC, "MAGIC", _s("Magic"), "m", nullptr },
- { KEYBIND_NEGATE_TIME, "NEGATE_TIME", _s("Negate time"), "n", nullptr },
- { KEYBIND_OFFER, "OFFER", _s("Offer"), "o", nullptr },
- { KEYBIND_PASS, "PASS", _s("Pass"), "p", nullptr },
- { KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr },
- { KEYBIND_READY, "READY", _s("Ready"), "r", nullptr },
- { KEYBIND_STEAL, "STEAL", _s("Steal"), "s", nullptr },
- { KEYBIND_TRANSACT, "TRANSACT", _s("Transact"), "t", nullptr },
- { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr },
- { KEYBIND_VIEW, "VIEW", _s("View"), "v", nullptr },
- { KEYBIND_WEAR_ARMOR, "WEAR_ARMOR", _s("Wear armor"), "w", nullptr },
- { KEYBIND_X_IT, "X_IT", _s("eXit"), "x", nullptr },
- { KEYBIND_YELL, "YELL", _s("Yell"), "y", nullptr },
- { KEYBIND_ZSTATS, "ZSTATS", _s("Ztats"), "z", nullptr },
- { KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
+ { KEYBIND_UP, "UP", _s("Up"), "UP", "JOY_UP", nullptr },
+ { KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", "JOY_DOWN", nullptr },
+ { KEYBIND_LEFT, "LEFT", _s("Left"), "LEFT", "JOY_LEFT", nullptr },
+ { KEYBIND_RIGHT, "RIGHT", _s("Right"), "RIGHT", "JOY_RIGHT", nullptr },
+ { KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", nullptr, nullptr },
+ { KEYBIND_BOARD, "BOARD", _s("Board"), "b", nullptr, nullptr },
+ { KEYBIND_CAST, "CAST", _s("Cast"), "c", nullptr, nullptr },
+ { KEYBIND_DESCEND, "DESCEND", _s("Descend"), "d", nullptr, nullptr },
+ { KEYBIND_ENTER, "ENTER", _s("Enter"), "e", nullptr, nullptr },
+ { KEYBIND_FIRE, "FIRE", _s("Fire"), "f", nullptr, nullptr },
+ { KEYBIND_GET, "GET", _s("Get"), "g", nullptr, nullptr },
+ { KEYBIND_HYPER, "HYPER", _s("Hyper"), "h", nullptr, nullptr },
+ { KEYBIND_IGNITE_TORCH, "IGNITE_TORCH", _s("Ignite torch"), "i", nullptr, nullptr },
+ { KEYBIND_JUMP, "JUMP", _s("Jump"), "j", nullptr, nullptr },
+ { KEYBIND_KLIMB, "KLIMB", _s("Klimb"), "k", nullptr, nullptr },
+ { KEYBIND_LAUNCH, "LAUNCH", _s("Launch"), "l", nullptr, nullptr },
+ { KEYBIND_MAGIC, "MAGIC", _s("Magic"), "m", nullptr, nullptr },
+ { KEYBIND_NEGATE_TIME, "NEGATE_TIME", _s("Negate time"), "n", nullptr, nullptr },
+ { KEYBIND_OFFER, "OFFER", _s("Offer"), "o", nullptr, nullptr },
+ { KEYBIND_PASS, "PASS", _s("Pass"), "p", nullptr, nullptr },
+ { KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr, nullptr },
+ { KEYBIND_READY, "READY", _s("Ready"), "r", nullptr, nullptr },
+ { KEYBIND_STEAL, "STEAL", _s("Steal"), "s", nullptr, nullptr },
+ { KEYBIND_TRANSACT, "TRANSACT", _s("Transact"), "t", nullptr, nullptr },
+ { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr, nullptr },
+ { KEYBIND_VIEW, "VIEW", _s("View"), "v", nullptr, nullptr },
+ { KEYBIND_WEAR_ARMOR, "WEAR_ARMOR", _s("Wear armor"), "w", nullptr, nullptr },
+ { KEYBIND_X_IT, "X_IT", _s("eXit"), "x", nullptr, nullptr },
+ { KEYBIND_YELL, "YELL", _s("Yell"), "y", nullptr, nullptr },
+ { KEYBIND_ZSTATS, "ZSTATS", _s("Ztats"), "z", nullptr, nullptr },
+ { KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr, nullptr }
};
struct KeysRecord {
More information about the Scummvm-git-logs
mailing list