libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fix close-up objects placement, incorrect skill text in Create Char dialog

Browse Source
This commit is contained in:
Paul Gilbert 2018-05-27 19:56:41 -04:00
parent 881c946361
commit 23f3f171df
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devtools/create_xeen/constants.cpp
View File

@ -627,7 +627,7 @@ const int MONSTER_GRID_BITMASK[12] = {
}; };
const int INDOOR_OBJECT_X[2][12] = { const int INDOOR_OBJECT_X[2][12] = {
{ 5, -7, -112, 98, -8, -65, 49, -9, -34, 16, -58, 40 }, { -5, -7, -112, 98, -8, -65, 49, -9, -34, 16, -58, 40 },
{ -35, -35, -142, 68, -35, -95, 19, -35, -62, -14, -98, 16 } { -35, -35, -142, 68, -35, -95, 19, -35, -62, -14, -98, 16 }
}; };
@ -1694,6 +1694,7 @@ const char *const SELECT_CLASS_BEFORE_SAVING =
const char *const EXCHANGE_ATTR_WITH = "Exchange %s with..."; const char *const EXCHANGE_ATTR_WITH = "Exchange %s with...";
const int NEW_CHAR_SKILLS[10] = { 1, 5, -1, -1, 4, 0, 0, -1, 6, 11 }; const int NEW_CHAR_SKILLS[10] = { 1, 5, -1, -1, 4, 0, 0, -1, 6, 11 };
const int NEW_CHAR_SKILLS_OFFSET[10] = { 0, 0, 0, 5, 0, 0, 0, 0, 0, 0 };
const int NEW_CHAR_SKILLS_LEN[10] = { 11, 8, 0, 0, 12, 8, 8, 0, 9, 11 }; const int NEW_CHAR_SKILLS_LEN[10] = { 11, 8, 0, 0, 12, 8, 8, 0, 9, 11 };
const int NEW_CHAR_RACE_SKILLS[10] = { 14, -1, 17, 16, -1, 0, 0, 0, 0, 0 }; const int NEW_CHAR_RACE_SKILLS[10] = { 14, -1, 17, 16, -1, 0, 0, 0, 0, 0 };
@ -2255,6 +2256,7 @@ void writeConstants(CCArchive &cc) {
file.syncString(SELECT_CLASS_BEFORE_SAVING); file.syncString(SELECT_CLASS_BEFORE_SAVING);
file.syncString(EXCHANGE_ATTR_WITH); file.syncString(EXCHANGE_ATTR_WITH);
file.syncNumbers((const int *)NEW_CHAR_SKILLS, 10); file.syncNumbers((const int *)NEW_CHAR_SKILLS, 10);
file.syncNumbers((const int *)NEW_CHAR_SKILLS_OFFSET, 10);
file.syncNumbers((const int *)NEW_CHAR_SKILLS_LEN, 10); file.syncNumbers((const int *)NEW_CHAR_SKILLS_LEN, 10);
file.syncNumbers((const int *)NEW_CHAR_RACE_SKILLS, 10); file.syncNumbers((const int *)NEW_CHAR_RACE_SKILLS, 10);
file.syncNumbers((const int *)RACE_MAGIC_RESISTENCES, 5); file.syncNumbers((const int *)RACE_MAGIC_RESISTENCES, 5);

BIN
dists/engine-data/xeen.ccs
View File

Binary file not shown.

3
engines/xeen/dialogs/dialogs_create_char.cpp
View File

@ -389,7 +389,8 @@ int CreateCharacterDialog::newCharDetails(Race race, Sex sex, int classId,
// Set up default skill for the race, if any // Set up default skill for the race, if any
if (Res.NEW_CHAR_RACE_SKILLS[race] != -1) { if (Res.NEW_CHAR_RACE_SKILLS[race] != -1) {
raceSkillStr = Res.SKILL_NAMES[Res.NEW_CHAR_RACE_SKILLS[race]]; const char *skillP = Res.SKILL_NAMES[Res.NEW_CHAR_RACE_SKILLS[race]];
raceSkillStr = Common::String(skillP + Res.NEW_CHAR_SKILLS_OFFSET[race]);
} }
// Set up color to use for each skill string to be displayed, based // Set up color to use for each skill string to be displayed, based

1
engines/xeen/resources.cpp
View File

@ -340,6 +340,7 @@ void Resources::loadData() {
file.syncString(SELECT_CLASS_BEFORE_SAVING); file.syncString(SELECT_CLASS_BEFORE_SAVING);
file.syncString(EXCHANGE_ATTR_WITH); file.syncString(EXCHANGE_ATTR_WITH);
file.syncNumbers((int *)NEW_CHAR_SKILLS, 10); file.syncNumbers((int *)NEW_CHAR_SKILLS, 10);
file.syncNumbers((int *)NEW_CHAR_SKILLS_OFFSET, 10);
file.syncNumbers((int *)NEW_CHAR_SKILLS_LEN, 10); file.syncNumbers((int *)NEW_CHAR_SKILLS_LEN, 10);
file.syncNumbers((int *)NEW_CHAR_RACE_SKILLS, 10); file.syncNumbers((int *)NEW_CHAR_RACE_SKILLS, 10);
file.syncNumbers((int *)RACE_MAGIC_RESISTENCES, 5); file.syncNumbers((int *)RACE_MAGIC_RESISTENCES, 5);

1
engines/xeen/resources.h
View File

@ -395,6 +395,7 @@ public:
const char *SELECT_CLASS_BEFORE_SAVING; const char *SELECT_CLASS_BEFORE_SAVING;
const char *EXCHANGE_ATTR_WITH; const char *EXCHANGE_ATTR_WITH;
int NEW_CHAR_SKILLS[10]; int NEW_CHAR_SKILLS[10];
int NEW_CHAR_SKILLS_OFFSET[10];
int NEW_CHAR_SKILLS_LEN[10]; int NEW_CHAR_SKILLS_LEN[10];
int NEW_CHAR_RACE_SKILLS[10]; int NEW_CHAR_RACE_SKILLS[10];
int RACE_MAGIC_RESISTENCES[5]; int RACE_MAGIC_RESISTENCES[5];