libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 07:14:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: Cleanup and bugfix for getText()

Browse Source
This commit is contained in:
Filippos Karapetis 2022-04-05 01:50:44 +03:00
parent b7b5d5cfb9
commit 93a55e98f7
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/chewy/text.cpp
View File

@ -82,21 +82,30 @@ TextEntryList *Text::getDialog(uint chunk, uint entry) {
}
TextEntry *Text::getText(uint chunk, uint entry, int type) {
bool isText = false;
bool isAutoDialog = false;
bool isInvDesc = false;
switch (type) {
case AAD_DATA:
chunk += AAD_TAP_OFF;
chunk += kADSTextMax + kATSTextMax;
isAutoDialog = true;
break;
case ATS_DATA:
chunk += ATS_TAP_OFF;
chunk += kADSTextMax;
isText = true;
break;
case ADS_DATA:
chunk += ADS_TAP_OFF;
// No change - chunk starts from 0
break;
case INV_USE_DATA:
chunk += USE_TAP_OFF;
case INV_USE_DEF:
chunk += kADSTextMax + kATSTextMax + kAADTextMax + kINVTextMax;
isInvDesc = true;
break;
case INV_ATS_DATA:
chunk += INV_TAP_OFF;
chunk += kADSTextMax + kATSTextMax + kAADTextMax;
isInvDesc = true;
break;
}
@ -104,9 +113,6 @@ TextEntry *Text::getText(uint chunk, uint entry, int type) {
error("getText(): Invalid chunk number requested, %d (min %d)", chunk, kADSTextMax);
TextEntry *d = new TextEntry();
const bool isText = (chunk >= kADSTextMax && chunk < kADSTextMax + kATSTextMax);
const bool isAutoDialog = (chunk >= kADSTextMax + kATSTextMax && chunk < kADSTextMax + kATSTextMax + kAADTextMax);
const bool isInvDesc = (chunk >= kADSTextMax + kATSTextMax + kAADTextMax && chunk < kADSTextMax + kATSTextMax + kAADTextMax + kINVTextMax);
byte *data = getChunkData(chunk);
byte *ptr = data;

4
engines/chewy/text.h
View File

@ -40,8 +40,8 @@ enum MaxTextTypes {
kADSTextMax = 500, // 0 - 499
kATSTextMax = 100, // 500 - 599
kAADTextMax = 100, // 600 - 699
kINVTextMax = 100, // 700 - 799
kUSETextMax = 100 // 800 - 899
kINVTextMax = 140, // 700 - 849
kUSETextMax = 60 // 850 - 899
};
/**