diff options
| author | Colin Snover | 2017-11-20 20:42:29 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-11-20 20:44:54 -0600 |
| commit | cf61174396cdbbf371cb26bac753a190277da6e5 (patch) | |
| tree | 4bf97b45c4fdb02cc55aa26d8d38ce5bed71982c /devtools/create_kyradat | |
| parent | 097523d0ecd4e3da6a991b57c02cf278e7af216b (diff) | |
| download | scummvm-rg350-cf61174396cdbbf371cb26bac753a190277da6e5.tar.gz scummvm-rg350-cf61174396cdbbf371cb26bac753a190277da6e5.tar.bz2 scummvm-rg350-cf61174396cdbbf371cb26bac753a190277da6e5.zip | |
KYRA: Fix crash due to missing palette data for OldFloppy version
Thanks to sergesv for the patch.
Fixes Trac#9733.
Diffstat (limited to 'devtools/create_kyradat')
| -rw-r--r-- | devtools/create_kyradat/games.cpp | 1 | ||||
| -rw-r--r-- | devtools/create_kyradat/resources.cpp | 1 | ||||
| -rw-r--r-- | devtools/create_kyradat/resources/lok_dos_oldfloppy.h | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index e6f0b38c45..0c151ec7cb 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -287,6 +287,7 @@ const int kyra1FloppyOldNeed[] = { k1SpecialPalette30, k1SpecialPalette31, k1SpecialPalette32, + k1SpecialPalette33, k1PutDownString, k1WaitAmuletString, k1BlackJewelString, diff --git a/devtools/create_kyradat/resources.cpp b/devtools/create_kyradat/resources.cpp index 246811f821..8347279f13 100644 --- a/devtools/create_kyradat/resources.cpp +++ b/devtools/create_kyradat/resources.cpp @@ -442,6 +442,7 @@ static const ResourceProvider resourceProviders[] = { { k1SpecialPalette30, kKyra1, kPlatformDOS, kOldFloppy, UNK_LANG, &k1SpecialPalette30DOSOldFloppyProvider }, { k1SpecialPalette31, kKyra1, kPlatformDOS, kOldFloppy, UNK_LANG, &k1SpecialPalette31DOSOldFloppyProvider }, { k1SpecialPalette32, kKyra1, kPlatformDOS, kOldFloppy, UNK_LANG, &k1SpecialPalette32DOSOldFloppyProvider }, + { k1SpecialPalette33, kKyra1, kPlatformDOS, kOldFloppy, UNK_LANG, &k1SpecialPalette33DOSOldFloppyProvider }, { k1PutDownString, kKyra1, kPlatformDOS, kOldFloppy, RU_RUS, &k1PutDownStringDOSOldFloppyRussianProvider }, { k1WaitAmuletString, kKyra1, kPlatformDOS, kOldFloppy, RU_RUS, &k1WaitAmuletStringDOSOldFloppyRussianProvider }, { k1BlackJewelString, kKyra1, kPlatformDOS, kOldFloppy, RU_RUS, &k1BlackJewelStringDOSOldFloppyRussianProvider }, diff --git a/devtools/create_kyradat/resources/lok_dos_oldfloppy.h b/devtools/create_kyradat/resources/lok_dos_oldfloppy.h index 62b1530941..68c8a588e8 100644 --- a/devtools/create_kyradat/resources/lok_dos_oldfloppy.h +++ b/devtools/create_kyradat/resources/lok_dos_oldfloppy.h @@ -1440,6 +1440,19 @@ static const byte k1SpecialPalette32DOSOldFloppy[39] = { static const ByteProvider k1SpecialPalette32DOSOldFloppyProvider = { ARRAYSIZE(k1SpecialPalette32DOSOldFloppy), k1SpecialPalette32DOSOldFloppy }; +static const byte k1SpecialPalette33DOSOldFloppy[60] = { + 0x3F, 0x3D, 0x2F, 0x3F, 0x3D, 0x29, 0x3F, 0x3D, + 0x23, 0x3F, 0x3D, 0x1D, 0x3F, 0x3B, 0x17, 0x3F, + 0x3B, 0x11, 0x3F, 0x3B, 0x0B, 0x3F, 0x3B, 0x05, + 0x3F, 0x3B, 0x00, 0x3D, 0x38, 0x00, 0x3B, 0x34, + 0x00, 0x39, 0x33, 0x00, 0x39, 0x30, 0x00, 0x37, + 0x2D, 0x00, 0x36, 0x2B, 0x00, 0x34, 0x28, 0x00, + 0x33, 0x26, 0x00, 0x32, 0x24, 0x00, 0x30, 0x22, + 0x00, 0x2F, 0x20, 0x00 +}; + +static const ByteProvider k1SpecialPalette33DOSOldFloppyProvider = { ARRAYSIZE(k1SpecialPalette33DOSOldFloppy), k1SpecialPalette33DOSOldFloppy }; + static const Shape k1Healing1ShapesDOSOldFloppy[22] = { { 8, 0, 0, 3, 48, -12, -48 }, { 8, 3, 0, 3, 48, -12, -48 }, |