[Scummvm-git-logs] scummvm master -> ee5945d7cf7d1c89296f8f7135199c176d2d0393
dreammaster
noreply at scummvm.org
Thu Nov 12 20:58:29 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ee5945d7cf ULTIMA: ULTIMA3: Compilation fixes
Commit: ee5945d7cf7d1c89296f8f7135199c176d2d0393
https://github.com/scummvm/scummvm/commit/ee5945d7cf7d1c89296f8f7135199c176d2d0393
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-11-13T07:58:14+11:00
Commit Message:
ULTIMA: ULTIMA3: Compilation fixes
Changed paths:
engines/ultima/module.mk
engines/ultima/ultima3/data/roster.h
engines/ultima/ultima3/views/create_character.cpp
diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index 61b4d89db4d..f6eea01608b 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -6,7 +6,6 @@ MODULE_OBJS := \
shared/conf/xml_tree.o \
shared/engine/events.o \
shared/engine/graphics_options.o \
- shared/engine/messages.o \
shared/gfx/gfx_surface.o \
shared/gfx/view.o \
shared/engine/view.o
diff --git a/engines/ultima/ultima3/data/roster.h b/engines/ultima/ultima3/data/roster.h
index 698221f81e7..9e58777e6bc 100644
--- a/engines/ultima/ultima3/data/roster.h
+++ b/engines/ultima/ultima3/data/roster.h
@@ -31,7 +31,7 @@ namespace Data {
constexpr int ROSTER_COUNT = 20;
constexpr int PARTY_MAX = 4;
-constexpr int NAME_MAX = 9;
+constexpr int PARTY_NAME_MAX = 9;
constexpr byte IN_PARTY = 0xFF;
constexpr byte STATUS_GOOD = 'G';
@@ -64,7 +64,7 @@ inline int fromBcdWord(uint16 value) {
* original, so the same digits are shown when they're printed as hex.
*/
struct RosterEntry {
- char _name[NAME_MAX + 1] = {};
+ char _name[PARTY_NAME_MAX + 1] = {};
byte _marksAndCards = 0;
byte _torches = 0;
byte _partyMember = 0;
diff --git a/engines/ultima/ultima3/views/create_character.cpp b/engines/ultima/ultima3/views/create_character.cpp
index 9dc8a71c952..216c7218e55 100644
--- a/engines/ultima/ultima3/views/create_character.cpp
+++ b/engines/ultima/ultima3/views/create_character.cpp
@@ -42,7 +42,7 @@ static const char *const YES_NO_WORDS[2] = { "Yes", "No" };
CreateCharacter::CreateCharacter() : WindowView("CreateCharacter") {
_entry.setup(22, 18);
- _name.setup(Data::NAME_MAX, FIELD_COL, 13);
+ _name.setup(Data::PARTY_NAME_MAX, FIELD_COL, 13);
_sex.setup(Data::SEX_KEYS, Data::SEX_NAMES, Data::SEX_COUNT, FIELD_COL, 14);
_race.setup(Data::RACE_KEYS, Data::RACE_NAMES, Data::RACE_COUNT, FIELD_COL, 15);
_class.setup(Data::CLASS_KEYS, Data::CLASS_NAMES, Data::CLASS_COUNT, FIELD_COL, 16);
More information about the Scummvm-git-logs
mailing list