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

dreammaster noreply at scummvm.org
Sat Nov 14 06:48:19 UTC 2026


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

Summary:
d5379a0a27 ULTIMA: ULTIMA2: Avoid calling virtual setBounds in constructors
bc69b75117 ULTIMA: ULTIMA2: Fix identified warnings.
90df2fff54 ULTIMA: ULTIMA3: Fix identified warnings.
e5b36ba22f ULTIMA: ULTIMA1: Fix identified warnings.
aed0208e77 ULTIMA: ULTIMA0: Fix identified warnings.


Commit: d5379a0a27869a1da06ab07914396b25f0145af1
    https://github.com/scummvm/scummvm/commit/d5379a0a27869a1da06ab07914396b25f0145af1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-14T17:40:32+11:00

Commit Message:
ULTIMA: ULTIMA2: Avoid calling virtual setBounds in constructors

Changed paths:
    engines/ultima/ultima1/views/dialog.cpp
    engines/ultima/ultima1/views/game.cpp
    engines/ultima/ultima1/views/interactions/interaction.cpp
    engines/ultima/ultima1/views/space_game.cpp
    engines/ultima/ultima2/views/commands.cpp
    engines/ultima/ultima2/views/ending.cpp
    engines/ultima/ultima2/views/game.cpp
    engines/ultima/ultima2/views/helm_map.cpp
    engines/ultima/ultima2/views/interactions/interaction.cpp
    engines/ultima/ultima2/views/map.h
    engines/ultima/ultima2/views/space_map.cpp
    engines/ultima/ultima2/views/space_stats.cpp
    engines/ultima/ultima2/views/stats.cpp
    engines/ultima/ultima2/views/zstats.cpp


diff --git a/engines/ultima/ultima1/views/dialog.cpp b/engines/ultima/ultima1/views/dialog.cpp
index 98c54f4a7bb..dc9b17611eb 100644
--- a/engines/ultima/ultima1/views/dialog.cpp
+++ b/engines/ultima/ultima1/views/dialog.cpp
@@ -31,7 +31,7 @@ namespace Views {
 constexpr int COLOR_NOTCH = 0;   // black - corner notch pixels
 
 Dialog::Dialog(const Common::String &name) : View(name) {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 19);
 }
 
 void Dialog::draw() {
diff --git a/engines/ultima/ultima1/views/game.cpp b/engines/ultima/ultima1/views/game.cpp
index 2f7e76771c9..8b7cb391681 100644
--- a/engines/ultima/ultima1/views/game.cpp
+++ b/engines/ultima/ultima1/views/game.cpp
@@ -35,7 +35,7 @@ namespace Views {
 // Colors used
 
 Game::Game() : Shared::View("Game"), _commands(this), _stats(this) {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 24));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 24);
 	_commands.setBounds(Graphics::Views::TextRect(0, 20, 29, 24));
 	_stats.setBounds(Graphics::Views::TextRect(31, 21, 39, 24));
 }
diff --git a/engines/ultima/ultima1/views/interactions/interaction.cpp b/engines/ultima/ultima1/views/interactions/interaction.cpp
index e17b776a706..174fa5df09d 100644
--- a/engines/ultima/ultima1/views/interactions/interaction.cpp
+++ b/engines/ultima/ultima1/views/interactions/interaction.cpp
@@ -30,7 +30,7 @@ namespace Interactions {
 using namespace Graphics::Views;
 
 Interaction::Interaction(const Common::String &name) : View(name) {
-	setBounds(Common::Rect(0, 0, 0, 0));
+	_bounds = Common::Rect(0, 0, 0, 0);
 }
 
 bool Interaction::tick() {
diff --git a/engines/ultima/ultima1/views/space_game.cpp b/engines/ultima/ultima1/views/space_game.cpp
index 837870bf7c0..91d41b5b89a 100644
--- a/engines/ultima/ultima1/views/space_game.cpp
+++ b/engines/ultima/ultima1/views/space_game.cpp
@@ -30,7 +30,7 @@ namespace Views {
 // Colors used
 
 SpaceGame::SpaceGame() : Shared::View("SpaceGame"), _commands(this), _stats(this) {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 24));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 24);
 	_commands.setBounds(Graphics::Views::TextRect(0, 20, 29, 24));
 	_stats.setBounds(Graphics::Views::TextRect(31, 21, 39, 24));
 }
diff --git a/engines/ultima/ultima2/views/commands.cpp b/engines/ultima/ultima2/views/commands.cpp
index e12bbe469d4..9c4504b5fcc 100644
--- a/engines/ultima/ultima2/views/commands.cpp
+++ b/engines/ultima/ultima2/views/commands.cpp
@@ -35,7 +35,7 @@ constexpr int PROMPT_ROW = 3; // last of the 4 rows within Commands' own bounds
 constexpr int PROMPT_ABSOLUTE_ROW = 23;
 
 Commands::Commands(UIElement *parent) : Graphics::Views::UIElement("Commands", parent), _textCursor("CommandsCursor", this, COLOR_TEXT) {
-	setBounds(Graphics::Views::TextRect(0, 20, 29, 23));
+	_bounds = Graphics::Views::TextRect(0, 20, 29, 23);
 }
 
 void Commands::draw() {
diff --git a/engines/ultima/ultima2/views/ending.cpp b/engines/ultima/ultima2/views/ending.cpp
index 8dc998ae454..2b2408a522d 100644
--- a/engines/ultima/ultima2/views/ending.cpp
+++ b/engines/ultima/ultima2/views/ending.cpp
@@ -46,7 +46,7 @@ constexpr uint32 STEP_DELAY = 90;
 } // namespace
 
 Ending::Ending() : View("Ending") {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 24));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 24);
 }
 
 Ending::~Ending() {
diff --git a/engines/ultima/ultima2/views/game.cpp b/engines/ultima/ultima2/views/game.cpp
index 63e24204395..91ee2ca6653 100644
--- a/engines/ultima/ultima2/views/game.cpp
+++ b/engines/ultima/ultima2/views/game.cpp
@@ -27,7 +27,7 @@ namespace Ultima2 {
 namespace Views {
 
 Game::Game() : Shared::View("Game"), _commands(this), _stats(this) {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 24));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 24);
 }
 
 } // namespace Views
diff --git a/engines/ultima/ultima2/views/helm_map.cpp b/engines/ultima/ultima2/views/helm_map.cpp
index 453e8c8eab6..0b8ab3325f0 100644
--- a/engines/ultima/ultima2/views/helm_map.cpp
+++ b/engines/ultima/ultima2/views/helm_map.cpp
@@ -43,7 +43,7 @@ static const byte ICON_ROAD[][2] = { {0, 0}, {0, 1}, {2, 0}, {2, 1} };
 static const byte ICON_OTHER[][2] = { {1, 0}, {2, 0}, {2, 1}, {1, 1} };
 
 HelmMap::HelmMap() : Shared::View("HelmMap") {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 19);
 }
 
 void HelmMap::plotIcon(Graphics::Views::GfxSurface &s, int cellX, int cellY, Data::TileId tile) {
diff --git a/engines/ultima/ultima2/views/interactions/interaction.cpp b/engines/ultima/ultima2/views/interactions/interaction.cpp
index 0426eaf52d5..270afd49d8b 100644
--- a/engines/ultima/ultima2/views/interactions/interaction.cpp
+++ b/engines/ultima/ultima2/views/interactions/interaction.cpp
@@ -28,7 +28,7 @@ namespace Views {
 namespace Interactions {
 
 Interaction::Interaction(const Common::String &name) : View(name) {
-	setBounds(Common::Rect(0, 0, 0, 0));
+	_bounds = Common::Rect(0, 0, 0, 0);
 }
 
 bool Interaction::tick() {
diff --git a/engines/ultima/ultima2/views/map.h b/engines/ultima/ultima2/views/map.h
index 8aec6dc7351..6e7e9fdc44f 100644
--- a/engines/ultima/ultima2/views/map.h
+++ b/engines/ultima/ultima2/views/map.h
@@ -81,7 +81,7 @@ public:
 	virtual void reloadTiles() {}
 
 	Map(const Common::String &name) : View(name) {
-		setBounds(Graphics::Views::TextRect(0, 0, 39, 19));
+		_bounds = Graphics::Views::TextRect(0, 0, 39, 19);
 	}
 	~Map() override {}
 
diff --git a/engines/ultima/ultima2/views/space_map.cpp b/engines/ultima/ultima2/views/space_map.cpp
index 40d557c4a49..f271ec46396 100644
--- a/engines/ultima/ultima2/views/space_map.cpp
+++ b/engines/ultima/ultima2/views/space_map.cpp
@@ -38,7 +38,7 @@ constexpr int COLOR_STAR = 3;
 constexpr int WARP_STEPS_PER_TICK = 2;
 
 SpaceMap::SpaceMap() : View("SpaceMap") {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 24));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 24);
 	_staging.resize(320 * 200);
 }
 
diff --git a/engines/ultima/ultima2/views/space_stats.cpp b/engines/ultima/ultima2/views/space_stats.cpp
index b2824e14b4f..44e7f4ac105 100644
--- a/engines/ultima/ultima2/views/space_stats.cpp
+++ b/engines/ultima/ultima2/views/space_stats.cpp
@@ -29,7 +29,7 @@ namespace Ultima2 {
 namespace Views {
 
 SpaceStats::SpaceStats(UIElement *parent) : Graphics::Views::UIElement("SpaceStats", parent) {
-	setBounds(Graphics::Views::TextRect(30, 20, 39, 23));
+	_bounds = Graphics::Views::TextRect(30, 20, 39, 23);
 }
 
 void SpaceStats::draw() {
diff --git a/engines/ultima/ultima2/views/stats.cpp b/engines/ultima/ultima2/views/stats.cpp
index 4aa7be7ebfe..8fd95987f50 100644
--- a/engines/ultima/ultima2/views/stats.cpp
+++ b/engines/ultima/ultima2/views/stats.cpp
@@ -29,7 +29,7 @@ namespace Ultima2 {
 namespace Views {
 
 Stats::Stats(UIElement *parent) : Graphics::Views::UIElement("Stats", parent) {
-	setBounds(Graphics::Views::TextRect(30, 20, 39, 23));
+	_bounds = Graphics::Views::TextRect(30, 20, 39, 23);
 }
 
 void Stats::draw() {
diff --git a/engines/ultima/ultima2/views/zstats.cpp b/engines/ultima/ultima2/views/zstats.cpp
index 0fd2f51e7c4..0d35184bf51 100644
--- a/engines/ultima/ultima2/views/zstats.cpp
+++ b/engines/ultima/ultima2/views/zstats.cpp
@@ -28,7 +28,7 @@ namespace Ultima2 {
 namespace Views {
 
 ZStats::ZStats() : View("ZStats") {
-	setBounds(Graphics::Views::TextRect(0, 0, 39, 24));
+	_bounds = Graphics::Views::TextRect(0, 0, 39, 24);
 }
 
 bool ZStats::msgFocus(const FocusMessage &msg) {


Commit: bc69b75117c58251983f1dc2984eadb457e2bd54
    https://github.com/scummvm/scummvm/commit/bc69b75117c58251983f1dc2984eadb457e2bd54
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-14T17:40:32+11:00

Commit Message:
ULTIMA: ULTIMA2: Fix identified warnings.

PVS-Studio V522, V547, V560, V703, V1016, V1053

Changed paths:
    engines/ultima/ultima2/console.cpp
    engines/ultima/ultima2/data/data.cpp
    engines/ultima/ultima2/gfx/ega_picture.cpp
    engines/ultima/ultima2/gfx/pic_decoder.h
    engines/ultima/ultima2/gfx/text_cursor.cpp
    engines/ultima/ultima2/views/create_character.cpp
    engines/ultima/ultima2/views/create_character.h
    engines/ultima/ultima2/views/dungeon_map.cpp
    engines/ultima/ultima2/views/location_map.cpp
    engines/ultima/ultima2/views/overworld_map.cpp


diff --git a/engines/ultima/ultima2/console.cpp b/engines/ultima/ultima2/console.cpp
index cac89fca953..df4bda2a3d2 100644
--- a/engines/ultima/ultima2/console.cpp
+++ b/engines/ultima/ultima2/console.cpp
@@ -197,7 +197,10 @@ bool Console::cmdEnemy(int, const char **) {
 	}
 
 	Logic::OverworldLogic *logic = dynamic_cast<Logic::OverworldLogic *>(_G(logic).get());
-	assert(logic);
+	if (!logic) {
+		debugPrintf("Only supported when walking about\n");
+		return true;
+	}
 
 	Data::MapMonsters &monsters = _G(map)._monsters;
 
@@ -317,7 +320,10 @@ bool Console::cmdTransport(int argc, const char **argv) {
 	}
 
 	Logic::OverworldLogic *logic = dynamic_cast<Logic::OverworldLogic *>(_G(logic).get());
-	assert(logic);
+	if (!logic) {
+		debugPrintf("Only supported when walking about\n");
+		return true;
+	}
 
 	// Ships need water, and the others are put on grass
 	Data::TileId transport = TRANSPORTS[type];
diff --git a/engines/ultima/ultima2/data/data.cpp b/engines/ultima/ultima2/data/data.cpp
index e2f5cbf1384..66e8fe56a5c 100644
--- a/engines/ultima/ultima2/data/data.cpp
+++ b/engines/ultima/ultima2/data/data.cpp
@@ -133,23 +133,23 @@ const char *const ITEM_NAMES[ITEM_COUNT] = {
 };
 
 const char *raceName(Race race) {
-	return (race >= 0 && race < RACE_COUNT) ? RACE_NAMES[race] : "";
+	return (race < RACE_COUNT) ? RACE_NAMES[race] : "";
 }
 
 const char *className(CharClass charClass) {
-	return (charClass >= 0 && charClass < CLASS_COUNT) ? CLASS_NAMES[charClass] : "";
+	return (charClass < CLASS_COUNT) ? CLASS_NAMES[charClass] : "";
 }
 
 const char *weaponName(WeaponType weapon) {
-	return (weapon >= 0 && weapon < WEAPON_COUNT) ? WEAPON_NAMES[weapon] : "";
+	return (weapon < WEAPON_COUNT) ? WEAPON_NAMES[weapon] : "";
 }
 
 const char *armorName(ArmorType armor) {
-	return (armor >= 0 && armor < ARMOR_COUNT) ? ARMOR_NAMES[armor] : "";
+	return (armor < ARMOR_COUNT) ? ARMOR_NAMES[armor] : "";
 }
 
 const char *spellName(SpellType spell) {
-	return (spell >= 0 && spell < SPELL_COUNT) ? SPELL_NAMES[spell] : "";
+	return (spell < SPELL_COUNT) ? SPELL_NAMES[spell] : "";
 }
 
 const char *itemName(int item) {
diff --git a/engines/ultima/ultima2/gfx/ega_picture.cpp b/engines/ultima/ultima2/gfx/ega_picture.cpp
index 3d54611c067..f2cc8c50147 100644
--- a/engines/ultima/ultima2/gfx/ega_picture.cpp
+++ b/engines/ultima/ultima2/gfx/ega_picture.cpp
@@ -81,9 +81,6 @@ static bool loadTileMapPicture(const Common::String &name, Data::RenderMode mode
 	for (int cell = 0; cell < MAP_CELLS; ++cell) {
 		// Tile codes are the same as in the map files: tile id * 4
 		int tileId = codes[cell] / 4;
-		if (tileId >= Data::TILE_COUNT)
-			continue;
-
 		surf.blitFrom(tiles[tileId], Common::Point((cell % MAP_COLUMNS) * Data::TILE_WIDTH,
 			(cell / MAP_COLUMNS) * Data::TILE_HEIGHT));
 	}
diff --git a/engines/ultima/ultima2/gfx/pic_decoder.h b/engines/ultima/ultima2/gfx/pic_decoder.h
index 8e422ad04db..aabd44cc0fe 100644
--- a/engines/ultima/ultima2/gfx/pic_decoder.h
+++ b/engines/ultima/ultima2/gfx/pic_decoder.h
@@ -43,7 +43,7 @@ private:
 	Graphics::Surface _surface;
 public:
 	~PicDecoder() {
-		destroy();
+		_surface.free();
 	}
 
 	bool loadStream(Common::SeekableReadStream &stream) override;
diff --git a/engines/ultima/ultima2/gfx/text_cursor.cpp b/engines/ultima/ultima2/gfx/text_cursor.cpp
index 48fbd37da05..3d77692e9f3 100644
--- a/engines/ultima/ultima2/gfx/text_cursor.cpp
+++ b/engines/ultima/ultima2/gfx/text_cursor.cpp
@@ -30,7 +30,7 @@ namespace Gfx {
 
 TextCursor::TextCursor(const Common::String &name, UIElement *parent, byte color) :
 		UIElement(name, parent), _color(color) {
-	setPosition(Common::Point(0, 0));
+	_bounds = Graphics::Views::TextRect(0, 0, 0, 0);
 	delayFrames(DELAY_FRAMES);
 }
 
diff --git a/engines/ultima/ultima2/views/create_character.cpp b/engines/ultima/ultima2/views/create_character.cpp
index 649295b0f9e..18db041803e 100644
--- a/engines/ultima/ultima2/views/create_character.cpp
+++ b/engines/ultima/ultima2/views/create_character.cpp
@@ -42,7 +42,7 @@ void CreateCharacter::reset() {
 	_state = STRENGTH;
 	_pointsRemaining = STARTING_POINTS;
 	_digitCount = 0;
-	_name.clear();
+	_charName.clear();
 
 	_G(savegame) = Data::Savegame();
 	_G(map).clearSaved();
@@ -114,7 +114,7 @@ void CreateCharacter::positionCursor() {
 		_cursor.setPosition(Common::Point(20, 13));
 		break;
 	case NAME:
-		_cursor.setPosition(Common::Point((int16)(20 + _name.size()), 14));
+		_cursor.setPosition(Common::Point((int16)(20 + _charName.size()), 14));
 		break;
 	case CONFIRM:
 		_cursor.setPosition(Common::Point(29, 16));
@@ -179,7 +179,7 @@ void CreateCharacter::draw() {
 	if (_state > CLASS)
 		put(20, 13, Gfx::TEXT_HEADING, Data::className(sg._class));
 	if (_state >= NAME)
-		put(20, 14, Gfx::TEXT_LIST, _name);
+		put(20, 14, Gfx::TEXT_LIST, _charName);
 
 	put(10, 16, Gfx::TEXT_NORMAL, "Satisfactory (Y/N)-");
 
@@ -261,16 +261,16 @@ bool CreateCharacter::msgKeypress(const KeypressMessage &msg) {
 
 	case NAME:
 		if (msg.ascii == 8) { // backspace
-			if (!_name.empty())
-				_name.deleteLastChar();
+			if (!_charName.empty())
+				_charName.deleteLastChar();
 			positionCursor();
 			redraw();
 		} else if (msg.ascii == 13) { // enter
 			_state = CONFIRM;
 			positionCursor();
 			redraw();
-		} else if (msg.ascii >= 32 && msg.ascii < 127 && (int)_name.size() < Data::MAX_NAME_LENGTH) {
-			_name += (char)msg.ascii;
+		} else if (msg.ascii >= 32 && msg.ascii < 127 && (int)_charName.size() < Data::MAX_NAME_LENGTH) {
+			_charName += (char)msg.ascii;
 			positionCursor();
 			redraw();
 		}
@@ -280,7 +280,7 @@ bool CreateCharacter::msgKeypress(const KeypressMessage &msg) {
 		if (toupper(msg.ascii) == 'N') {
 			reset();
 		} else if (toupper(msg.ascii) == 'Y') {
-			Common::strlcpy(sg._name, _name.c_str(), sizeof(sg._name));
+			Common::strlcpy(sg._name, _charName.c_str(), sizeof(sg._name));
 			sg._hp = 400;
 			sg._food = 400;
 			sg._gold = 400;
diff --git a/engines/ultima/ultima2/views/create_character.h b/engines/ultima/ultima2/views/create_character.h
index f59855f4b39..9bd725fa934 100644
--- a/engines/ultima/ultima2/views/create_character.h
+++ b/engines/ultima/ultima2/views/create_character.h
@@ -50,7 +50,7 @@ private:
 	int _pointsRemaining = 0;
 	int _digits[2] = { 0, 0 };
 	int _digitCount = 0;
-	Common::String _name;
+	Common::String _charName;
 
 	// Blinking cursor, tracking whichever field is currently being entered
 	Gfx::TextCursor _cursor;
diff --git a/engines/ultima/ultima2/views/dungeon_map.cpp b/engines/ultima/ultima2/views/dungeon_map.cpp
index f19a8d23732..ccaea150236 100644
--- a/engines/ultima/ultima2/views/dungeon_map.cpp
+++ b/engines/ultima/ultima2/views/dungeon_map.cpp
@@ -146,7 +146,7 @@ private:
 
 	void plot(byte x, byte y) {
 		int px = x + VIEW_OFFSET, py = y + VIEW_OFFSET;
-		if (px < 320 && py < 160)
+		if (py < 160)
 			_s.setPixel(px, py, _color);
 	}
 
@@ -524,8 +524,10 @@ int DungeonMap::drawCorridor(Graphics::Views::GfxSurface &s) {
 				break;
 
 			p.frontDoor();
-			if (d != 0 || ++d >= MAX_DEPTH)
+			if (d != 0)
 				break;
+
+			++d;
 			continue;
 		}
 
diff --git a/engines/ultima/ultima2/views/location_map.cpp b/engines/ultima/ultima2/views/location_map.cpp
index a64f32fb5d9..0b5b1feffbc 100644
--- a/engines/ultima/ultima2/views/location_map.cpp
+++ b/engines/ultima/ultima2/views/location_map.cpp
@@ -38,7 +38,7 @@ constexpr int PLAYER_VIEWPORT_X = 9;
 constexpr int PLAYER_VIEWPORT_Y = 5;
 
 LocationMap::LocationMap() : Map("LocationMap") {
-	reloadTiles();
+	LocationMap::reloadTiles();
 }
 
 LocationMap::~LocationMap() {
diff --git a/engines/ultima/ultima2/views/overworld_map.cpp b/engines/ultima/ultima2/views/overworld_map.cpp
index 3e5f14c4356..27425329d72 100644
--- a/engines/ultima/ultima2/views/overworld_map.cpp
+++ b/engines/ultima/ultima2/views/overworld_map.cpp
@@ -39,7 +39,7 @@ constexpr int PLAYER_VIEWPORT_X = 9;
 constexpr int PLAYER_VIEWPORT_Y = 5;
 
 OverworldMap::OverworldMap() : Map("OverworldMap") {
-	reloadTiles();
+	OverworldMap::reloadTiles();
 }
 
 OverworldMap::~OverworldMap() {


Commit: 90df2fff54369ab0c94e11a2417f9dd71eacf064
    https://github.com/scummvm/scummvm/commit/90df2fff54369ab0c94e11a2417f9dd71eacf064
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-14T17:40:32+11:00

Commit Message:
ULTIMA: ULTIMA3: Fix identified warnings.

PVS-Studio: V536, V547, V560, V575, V730, V1053, V1077

Changed paths:
    engines/ultima/ultima3/gfx/pic_decoder.h
    engines/ultima/ultima3/gfx/shapes.h
    engines/ultima/ultima3/ultima3.cpp
    engines/ultima/ultima3/views/dungeon_map.cpp
    engines/ultima/ultima3/views/interactions/equip.h
    engines/ultima/ultima3/views/interactions/hand_equipment.h
    engines/ultima/ultima3/views/interactions/insert_card.cpp
    engines/ultima/ultima3/views/interactions/shops.cpp
    engines/ultima/ultima3/views/interactions/shops.h


diff --git a/engines/ultima/ultima3/gfx/pic_decoder.h b/engines/ultima/ultima3/gfx/pic_decoder.h
index 9445a1dc414..6cef13a1f7e 100644
--- a/engines/ultima/ultima3/gfx/pic_decoder.h
+++ b/engines/ultima/ultima3/gfx/pic_decoder.h
@@ -45,7 +45,7 @@ private:
 	Graphics::Surface _surface;
 public:
 	~PicDecoder() {
-		destroy();
+		_surface.free();
 	}
 
 	bool loadStream(Common::SeekableReadStream &stream) override;
diff --git a/engines/ultima/ultima3/gfx/shapes.h b/engines/ultima/ultima3/gfx/shapes.h
index ef9d5b4506e..436ab71fe19 100644
--- a/engines/ultima/ultima3/gfx/shapes.h
+++ b/engines/ultima/ultima3/gfx/shapes.h
@@ -44,9 +44,9 @@ private:
 	byte _pixels[SHAPE_COUNT * SHAPE_PIXELS] = {};
 
 	// Ticks left before each animation step is next applied
-	byte _scrollCounters[4];
-	byte _flickerCounters[3];
-	byte _swapCounter;
+	byte _scrollCounters[4] = {};
+	byte _flickerCounters[3] = {};
+	byte _swapCounter = 0;
 
 	byte *tile(int index) {
 		return &_pixels[index * SHAPE_PIXELS];
diff --git a/engines/ultima/ultima3/ultima3.cpp b/engines/ultima/ultima3/ultima3.cpp
index d5d62b64259..813d5f4eb3e 100644
--- a/engines/ultima/ultima3/ultima3.cpp
+++ b/engines/ultima/ultima3/ultima3.cpp
@@ -228,6 +228,9 @@ void Ultima3Engine::queueEffect(const Common::Array<byte> &samples) {
 		return;
 
 	byte *data = (byte *)malloc(samples.size());
+	if (!data)
+		return;
+
 	memcpy(data, &samples[0], samples.size());
 	_effectStream->queueBuffer(data, samples.size(), DisposeAfterUse::YES, Audio::FLAG_UNSIGNED);
 }
diff --git a/engines/ultima/ultima3/views/dungeon_map.cpp b/engines/ultima/ultima3/views/dungeon_map.cpp
index 601f26f679c..350806e03bc 100644
--- a/engines/ultima/ultima3/views/dungeon_map.cpp
+++ b/engines/ultima/ultima3/views/dungeon_map.cpp
@@ -40,7 +40,6 @@ namespace Views {
 constexpr int VIEW_LEFT = 8;
 constexpr int VIEW_TOP = 8;
 constexpr int VIEW_SIZE = 176;
-constexpr int FIRST_SPECIAL = 1;
 constexpr int LAST_SPECIAL = 6;
 
 // What is shown for each way of facing at the bottom of the frame
@@ -163,7 +162,7 @@ void DungeonMap::endTurn() {
 		if (sign)
 			_G(messages).print(sign);
 		_G(messages).print("\n");
-	} else if (tile >= FIRST_SPECIAL && tile <= LAST_SPECIAL) {
+	} else if (tile <= LAST_SPECIAL) {
 		_special = true;
 		startInteraction(new Interactions::DungeonSpecial(tile));
 		return;
diff --git a/engines/ultima/ultima3/views/interactions/equip.h b/engines/ultima/ultima3/views/interactions/equip.h
index e5e0cbd4cb3..706cd80a203 100644
--- a/engines/ultima/ultima3/views/interactions/equip.h
+++ b/engines/ultima/ultima3/views/interactions/equip.h
@@ -40,8 +40,8 @@ private:
 	bool _choosing = true;
 	int _slot = -1;
 	LogMenu _menu;
-	char _keys[20];
-	const char *_words[19];
+	char _keys[20] = {};
+	const char *_words[19] = {};
 
 	/**
 	 * Sets up the menu of what can be picked once a party member is chosen
diff --git a/engines/ultima/ultima3/views/interactions/hand_equipment.h b/engines/ultima/ultima3/views/interactions/hand_equipment.h
index 1135d465621..e346231bea9 100644
--- a/engines/ultima/ultima3/views/interactions/hand_equipment.h
+++ b/engines/ultima/ultima3/views/interactions/hand_equipment.h
@@ -65,8 +65,8 @@ private:
 	PlayerChooser _players;
 	LogMenu _menu;
 	LogNumber _number;
-	char _keys[20];
-	const char *_words[19];
+	char _keys[20] = {};
+	const char *_words[19] = {};
 
 	void startAmount(int digits, bool rejectLetters);
 	void startEquipmentMenu();
diff --git a/engines/ultima/ultima3/views/interactions/insert_card.cpp b/engines/ultima/ultima3/views/interactions/insert_card.cpp
index 64d7c4a91d4..c5828bd1b21 100644
--- a/engines/ultima/ultima3/views/interactions/insert_card.cpp
+++ b/engines/ultima/ultima3/views/interactions/insert_card.cpp
@@ -28,6 +28,7 @@ namespace Ultima3 {
 namespace Views {
 namespace Interactions {
 
+constexpr char ESCAPE_KEY = 0x1B;
 constexpr byte MACHINE_CELL = 0x7C;
 constexpr byte FLASH_CELL = 0xF0;
 constexpr byte EMPTY_CELL = 0x20;
@@ -88,7 +89,7 @@ bool InsertCard::chooseCell() {
 
 	static const char *const WORDS[6] = { "Moons", "Death", "Love", "Sol", "Quit", "Quit" };
 	_G(messages).print("D, S, L, M:\n");
-	_menu.setup("MDLSQ\033", WORDS, 6);
+	_menu.setup("MDLSQ\x1B", WORDS, 6);
 	_stage = CHOOSE_WORD;
 	return false;
 }
@@ -99,7 +100,7 @@ bool InsertCard::tryWord() {
 	char key = _menu.key();
 
 	_G(messages).print("\n");
-	if (key == 'Q' || key == '\033')
+	if (key == 'Q' || key == ESCAPE_KEY)
 		return true;
 
 	// The card for this slot has to be in this person's hands
diff --git a/engines/ultima/ultima3/views/interactions/shops.cpp b/engines/ultima/ultima3/views/interactions/shops.cpp
index c28bd5d13d4..2d0d67e9932 100644
--- a/engines/ultima/ultima3/views/interactions/shops.cpp
+++ b/engines/ultima/ultima3/views/interactions/shops.cpp
@@ -193,8 +193,6 @@ void Temple::farewell() {
 
 bool Temple::serve(int slot) {
 	Data::RosterEntry &e = _G(savegame).partyMember(slot);
-	bool restored = false;
-
 	// A flash of light goes over everything
 	auto flash = [&]() {
 		_G(effects).flashViewport();
@@ -216,7 +214,6 @@ bool Temple::serve(int slot) {
 		}
 
 		e._status = Data::STATUS_GOOD;
-		restored = true;
 		break;
 
 	case 1:
@@ -227,7 +224,6 @@ bool Temple::serve(int slot) {
 
 		e._hitPoints = e._maxHitPoints;
 		flash();
-		restored = true;
 		break;
 
 	case 2:
@@ -247,7 +243,6 @@ bool Temple::serve(int slot) {
 		}
 
 		e._status = Data::STATUS_GOOD;
-		restored = true;
 		break;
 
 	default:
@@ -262,19 +257,16 @@ bool Temple::serve(int slot) {
 
 		e._status = Data::STATUS_GOOD;
 		flash();
-		restored = true;
 		break;
 	}
 
-	if (restored) {
-		spend(TEMPLE_COSTS[_service]);
+	spend(TEMPLE_COSTS[_service]);
 
-		// Bringing someone back from the dead is celebrated
-		if (_service >= 2)
-			_G(music).jingle(SONG_ALIVE);
-	}
+	// Bringing someone back from the dead is celebrated
+	if (_service >= 2)
+		_G(music).jingle(SONG_ALIVE);
 
-	return restored;
+	return true;
 }
 
 bool Temple::keypress(const KeypressMessage &msg) {
diff --git a/engines/ultima/ultima3/views/interactions/shops.h b/engines/ultima/ultima3/views/interactions/shops.h
index 7017df57be8..a44039381b2 100644
--- a/engines/ultima/ultima3/views/interactions/shops.h
+++ b/engines/ultima/ultima3/views/interactions/shops.h
@@ -130,8 +130,8 @@ private:
 	LogYesNo _list;
 	LogMenu _action;
 	LogMenu _item;
-	char _keys[20];
-	const char *_words[20];
+	char _keys[20] = {};
+	const char *_words[20] = {};
 
 	/**
 	 * Returns true if the shop is the one holding the best equipment


Commit: e5b36ba22f93d060a1765951b16a550ec65a4180
    https://github.com/scummvm/scummvm/commit/e5b36ba22f93d060a1765951b16a550ec65a4180
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-14T17:42:59+11:00

Commit Message:
ULTIMA: ULTIMA1: Fix identified warnings.

PVS-Studio: V522, V547, V560, V575, V730, V1053, V1064

Changed paths:
    engines/ultima/ultima1/data/map.h
    engines/ultima/ultima1/data/savegame.h
    engines/ultima/ultima1/gfx/pic_decoder.h
    engines/ultima/ultima1/logic/overworld_logic.cpp
    engines/ultima/ultima1/logic/space_cockpit_logic.cpp
    engines/ultima/ultima1/ultima1.cpp
    engines/ultima/ultima1/views/interactions/merchant.cpp
    engines/ultima/ultima1/views/overworld_map.cpp


diff --git a/engines/ultima/ultima1/data/map.h b/engines/ultima/ultima1/data/map.h
index 2c1d6c75a60..a16bd042d94 100644
--- a/engines/ultima/ultima1/data/map.h
+++ b/engines/ultima/ultima1/data/map.h
@@ -83,7 +83,7 @@ struct Map {
 private:
 	Common::Array<byte> _overworldMap;		// Cached overworld map data
 	Common::Array<byte> _cityMap[10];		// Cached city/castle/town maps
-	byte _mondainMap[MONDAIN_HEIGHT][MONDAIN_WIDTH];	// Cached Mondain encounter map
+	byte _mondainMap[MONDAIN_HEIGHT][MONDAIN_WIDTH] = {};	// Cached Mondain encounter map
 
 	MapTiles _mapTiles;						// Visible on-screen tiles
 	int _mapWidth = 0, _mapHeight = 0;		// Map width/height
diff --git a/engines/ultima/ultima1/data/savegame.h b/engines/ultima/ultima1/data/savegame.h
index a50ec8a2fbd..a2445b32da3 100644
--- a/engines/ultima/ultima1/data/savegame.h
+++ b/engines/ultima/ultima1/data/savegame.h
@@ -113,7 +113,7 @@ public:
 	uint16 _shipFuel = 0;
 	uint16 _shipShield = 0;
 
-	OverworldEntity _overworldEntities[OVERWORLD_ENTITY_COUNT];
+	OverworldEntity _overworldEntities[OVERWORLD_ENTITY_COUNT] = {};
 
 	// Extra fields
 	int16 _mapNum = 0;
diff --git a/engines/ultima/ultima1/gfx/pic_decoder.h b/engines/ultima/ultima1/gfx/pic_decoder.h
index e0d0d580995..a448408c67d 100644
--- a/engines/ultima/ultima1/gfx/pic_decoder.h
+++ b/engines/ultima/ultima1/gfx/pic_decoder.h
@@ -47,7 +47,7 @@ private:
 	Graphics::Surface _surface;
 public:
 	~PicDecoder() {
-		destroy();
+		_surface.free();
 	}
 
 	/**
diff --git a/engines/ultima/ultima1/logic/overworld_logic.cpp b/engines/ultima/ultima1/logic/overworld_logic.cpp
index 55d6564378c..9612025cf3f 100644
--- a/engines/ultima/ultima1/logic/overworld_logic.cpp
+++ b/engines/ultima/ultima1/logic/overworld_logic.cpp
@@ -312,11 +312,11 @@ bool OverworldLogic::moveCheck(Data::Direction dir) {
 		impassable(IMP_WOODS);
 		return false;
 
-	} else if (transport == Data::TRANSPORT_FRIGATE && tile != Data::TILE_OCEAN) {
+	} else if (transport == Data::TRANSPORT_FRIGATE) {
 		impassable(IMP_FRIGATES_WATER);
 		return false;
 
-	} else if (transport == Data::TRANSPORT_RAFT && tile != Data::TILE_OCEAN) {
+	} else if (transport == Data::TRANSPORT_RAFT) {
 		impassable(IMP_RAFTS_WATER);
 		return false;
 
diff --git a/engines/ultima/ultima1/logic/space_cockpit_logic.cpp b/engines/ultima/ultima1/logic/space_cockpit_logic.cpp
index ccc2c9c64ae..db30d899bde 100644
--- a/engines/ultima/ultima1/logic/space_cockpit_logic.cpp
+++ b/engines/ultima/ultima1/logic/space_cockpit_logic.cpp
@@ -167,8 +167,8 @@ void SpaceCockpitLogic::alienFiresBack() {
 	int endY = _G(cockpitTargetY) + Data::SPACE_TARGET_HIT_MAX_Y[stage];
 
 	Views::SpaceCockpit *view = dynamic_cast<Views::SpaceCockpit *>(g_engine->findView("SpaceCockpit"));
-	assert(view);
-	view->alienFireFlash(originX, originY, endX, endY);
+	if (view)
+		view->alienFireFlash(originX, originY, endX, endY);
 	playFX(8);
 
 	if (roll < ALIEN_FIRE_HIT_THRESHOLD) {
@@ -235,8 +235,8 @@ bool SpaceCockpitLogic::fire() {
 	// Flash a laser bolt in from each side of the viewport, converging on
 	// the crosshair
 	Views::SpaceCockpit *view = dynamic_cast<Views::SpaceCockpit *>(g_engine->findView("SpaceCockpit"));
-	assert(view);
-	view->fireLaser();
+	if (view)
+		view->fireLaser();
 	playFX(8);
 
 	int stage = _G(cockpitTargetStage);
@@ -300,7 +300,9 @@ bool SpaceCockpitLogic::hyperjump() {
 	int dy = Data::SPACE_FACING_DY[ship._facing];
 
 	Views::SpaceCockpit *view = dynamic_cast<Views::SpaceCockpit *>(g_engine->findView("SpaceCockpit"));
-	assert(view);
+	if (!view)
+		return true;
+
 	_hyperjumping = true;
 	view->startHyperjump(dx, dy);
 
diff --git a/engines/ultima/ultima1/ultima1.cpp b/engines/ultima/ultima1/ultima1.cpp
index c6e1600354d..ccac2d456b2 100644
--- a/engines/ultima/ultima1/ultima1.cpp
+++ b/engines/ultima/ultima1/ultima1.cpp
@@ -164,6 +164,9 @@ void Ultima1Engine::queueEffect(const Common::Array<byte> &samples) {
 		return;
 
 	byte *data = (byte *)malloc(samples.size());
+	if (!data)
+		return;
+
 	memcpy(data, &samples[0], samples.size());
 	_effectStream->queueBuffer(data, samples.size(), DisposeAfterUse::YES, Audio::FLAG_UNSIGNED);
 }
diff --git a/engines/ultima/ultima1/views/interactions/merchant.cpp b/engines/ultima/ultima1/views/interactions/merchant.cpp
index f6ad51f2275..c1d651f19c4 100644
--- a/engines/ultima/ultima1/views/interactions/merchant.cpp
+++ b/engines/ultima/ultima1/views/interactions/merchant.cpp
@@ -586,7 +586,7 @@ void Merchant::weaponsRange(int &minIdx, int &maxIdx) const {
 	// The original takes the savegame _moveCount % 0x7FFF before the /1500, but with the
 	// > 3000 branch forcing tier 3 that modulo never changes the result
 	uint32 moveCtr = _G(savegame)._moveCount;
-	int tier = (moveCtr <= 3000) ? MIN<uint32>((moveCtr % 0x7FFF) / 1500, 3) : 3;
+	int tier = (moveCtr <= 3000) ? MIN<uint32>(moveCtr / 1500, 3) : 3;
 
 	minIdx = base;
 	maxIdx = base + (tier + 1) * 2;
diff --git a/engines/ultima/ultima1/views/overworld_map.cpp b/engines/ultima/ultima1/views/overworld_map.cpp
index 8cbbbc4757d..ea22542fc0a 100644
--- a/engines/ultima/ultima1/views/overworld_map.cpp
+++ b/engines/ultima/ultima1/views/overworld_map.cpp
@@ -113,10 +113,8 @@ void OverworldMap::draw() {
 	for (int oy = 0; oy < Data::OVERWORLD_VISIBLE_HEIGHT; oy++) {
 		for (int ox = 0; ox < Data::OVERWORLD_VISIBLE_WIDTH; ox++) {
 			int tileId = animatedTileId(_mapTilesId[oy][ox]);
-			if (tileId != -1) {
-				const Graphics::ManagedSurface &tileImg = tiles[tileId];
-				s.blitFrom(tileImg, Common::Point(ox * TILE_WIDTH + 8, oy * TILE_HEIGHT + 8));
-			}
+			const Graphics::ManagedSurface &tileImg = tiles[tileId];
+			s.blitFrom(tileImg, Common::Point(ox * TILE_WIDTH + 8, oy * TILE_HEIGHT + 8));
 		}
 	}
 }


Commit: aed0208e772b128d3f953207a297fc521c32833a
    https://github.com/scummvm/scummvm/commit/aed0208e772b128d3f953207a297fc521c32833a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-14T17:47:29+11:00

Commit Message:
ULTIMA: ULTIMA0: Fix identified warnings.

PVS-Studio: V730, V016, V1053, V1054

Changed paths:
    engines/ultima/ultima0/events.cpp
    engines/ultima/ultima0/messages.h
    engines/ultima/ultima0/views/attack.cpp
    engines/ultima/ultima0/views/castle.cpp
    engines/ultima/ultima0/views/dead.cpp
    engines/ultima/ultima0/views/info.cpp
    engines/ultima/ultima0/views/status.cpp
    engines/ultima/ultima0/views/title.cpp


diff --git a/engines/ultima/ultima0/events.cpp b/engines/ultima/ultima0/events.cpp
index aced93f1c9c..af56faae7f9 100644
--- a/engines/ultima/ultima0/events.cpp
+++ b/engines/ultima/ultima0/events.cpp
@@ -297,7 +297,7 @@ bool UIElement::isFocused() const {
 }
 
 void UIElement::clearSurface() {
-	Graphics::ManagedSurface s = getSurface();
+	auto s = getSurface();
 	s.fillRect(Common::Rect(s.w, s.h), 0);
 }
 
diff --git a/engines/ultima/ultima0/messages.h b/engines/ultima/ultima0/messages.h
index 6f409fed9c8..215187d6b93 100644
--- a/engines/ultima/ultima0/messages.h
+++ b/engines/ultima/ultima0/messages.h
@@ -105,7 +105,7 @@ struct GameMessage : public Message {
 		_name(name), _value(value) {
 	}
 	GameMessage(const Common::String &name, const Common::String &value) :
-		Message(), _name(name), _stringValue(value) {
+		Message(), _name(name), _value(-1), _stringValue(value) {
 	}
 };
 
diff --git a/engines/ultima/ultima0/views/attack.cpp b/engines/ultima/ultima0/views/attack.cpp
index 7823c673ea0..2ceadf079e3 100644
--- a/engines/ultima/ultima0/views/attack.cpp
+++ b/engines/ultima/ultima0/views/attack.cpp
@@ -28,7 +28,7 @@ namespace Ultima0 {
 namespace Views {
 
 Attack::Attack() : View("Attack") {
-	setBounds(Gfx::TextRect(1, 22, 26, 24));
+	_bounds = Gfx::TextRect(1, 22, 26, 24);
 }
 
 bool Attack::msgFocus(const FocusMessage &msg) {
diff --git a/engines/ultima/ultima0/views/castle.cpp b/engines/ultima/ultima0/views/castle.cpp
index a0acb1931a4..bfdceb95332 100644
--- a/engines/ultima/ultima0/views/castle.cpp
+++ b/engines/ultima/ultima0/views/castle.cpp
@@ -68,7 +68,7 @@ void Castle::firstTime() {
 	auto s = getSurface();
 	const auto &player = g_engine->_player;
 
-	if (_mode >= NAMING && _mode <= FIRST_TASK) {
+	if (_mode <= FIRST_TASK) {
 		s.writeString(Common::Point(5, 2), "Welcome Peasant into the halls of\n"
 			"the mighty Lord British.  Herein thou\n"
 			"may choose to dare battle with the\n"
diff --git a/engines/ultima/ultima0/views/dead.cpp b/engines/ultima/ultima0/views/dead.cpp
index e2cf7a9b13e..8941957a1ec 100644
--- a/engines/ultima/ultima0/views/dead.cpp
+++ b/engines/ultima/ultima0/views/dead.cpp
@@ -28,7 +28,7 @@ namespace Ultima0 {
 namespace Views {
 
 Dead::Dead() : View("Dead") {
-	setBounds(Common::Rect(0, DEFAULT_SCY - 4 * Gfx::GLYPH_HEIGHT, DEFAULT_SCX, DEFAULT_SCY));
+	_bounds = Common::Rect(0, DEFAULT_SCY - 4 * Gfx::GLYPH_HEIGHT, DEFAULT_SCX, DEFAULT_SCY);
 }
 
 void Dead::draw() {
diff --git a/engines/ultima/ultima0/views/info.cpp b/engines/ultima/ultima0/views/info.cpp
index 52a1d9f8b06..5b3dc9c82f3 100644
--- a/engines/ultima/ultima0/views/info.cpp
+++ b/engines/ultima/ultima0/views/info.cpp
@@ -128,7 +128,7 @@ bool Info::msgGame(const GameMessage &msg) {
 Info::InfoObject::InfoObject(Info *parent, const Common::Point &pt, int id,
 		const Common::String &text) :
 		UIElement("InfoObject", parent), _id(id), _text(text) {
-	setBounds(Gfx::TextRect(pt.x, pt.y, pt.x + text.size(), pt.y));
+	_bounds = Gfx::TextRect(pt.x, pt.y, pt.x + text.size(), pt.y);
 }
 
 void Info::InfoObject::draw() {
diff --git a/engines/ultima/ultima0/views/status.cpp b/engines/ultima/ultima0/views/status.cpp
index f2b12529185..aac5de34d1c 100644
--- a/engines/ultima/ultima0/views/status.cpp
+++ b/engines/ultima/ultima0/views/status.cpp
@@ -27,7 +27,7 @@ namespace Ultima0 {
 namespace Views {
 
 Status::Status(const Common::String &name, UIElement *parent) : View(name, parent) {
-	setBounds(Common::Rect(0, DEFAULT_SCY - 4 * Gfx::GLYPH_HEIGHT, DEFAULT_SCX, DEFAULT_SCY));
+	_bounds = Common::Rect(0, DEFAULT_SCY - 4 * Gfx::GLYPH_HEIGHT, DEFAULT_SCX, DEFAULT_SCY);
 }
 
 bool Status::msgFocus(const FocusMessage &msg) {
diff --git a/engines/ultima/ultima0/views/title.cpp b/engines/ultima/ultima0/views/title.cpp
index 6d773e70dd2..7ae181f1259 100644
--- a/engines/ultima/ultima0/views/title.cpp
+++ b/engines/ultima/ultima0/views/title.cpp
@@ -125,7 +125,7 @@ void Title::selectOption() {
 Title::TitleOption::TitleOption(Title *parent, int index, const Common::String &text, int row) :
 		UIElement("TitleOption", parent), _index(index), _text(text) {
 	int xs = 20 - text.size() / 2;
-	setBounds(Gfx::TextRect(xs, row, xs + text.size(), row));
+	_bounds = Gfx::TextRect(xs, row, xs + text.size(), row);
 }
 
 void Title::TitleOption::draw() {




More information about the Scummvm-git-logs mailing list