libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-08 03:47:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: Updates to atdsys::aad_search_dia

Browse Source
This commit is contained in:
Paul Gilbert 2022-01-26 22:46:07 -08:00
parent 1259e19806
commit c058c67a9e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engines/chewy/atds.cpp
View File

@ -1135,18 +1135,19 @@ int16 atdsys::aad_get_zeilen(char *str_, int16 *txt_len) {
void atdsys::aad_search_dia(int16 dia_nr, char **ptr) { void atdsys::aad_search_dia(int16 dia_nr, char **ptr) {
char *start_ptr; char *start_ptr;
int16 *pos; uint16 *pos;
int16 ende; int16 ende;
int16 ende1; int16 ende1;
start_ptr = *ptr; start_ptr = *ptr;
ende = 0; ende = 0;
if (start_ptr[0] == (char)BLOCKENDE && if (start_ptr[0] == (char)BLOCKENDE &&
start_ptr[1] == (char)BLOCKENDE && start_ptr[1] == (char)BLOCKENDE &&
start_ptr[2] == (char)BLOCKENDE) { start_ptr[2] == (char)BLOCKENDE) {
*ptr = 0; *ptr = 0;
} else { } else {
while (!ende) { while (!ende) {
pos = (int16 *)start_ptr; pos = (uint16 *)start_ptr;
if (pos[0] == dia_nr) { if (pos[0] == dia_nr) {
ende = 1; ende = 1;
aadv.TxtHeader = (AadTxtHeader *)start_ptr; aadv.TxtHeader = (AadTxtHeader *)start_ptr;
@ -1154,18 +1155,22 @@ void atdsys::aad_search_dia(int16 dia_nr, char **ptr) {
} else { } else {
start_ptr += sizeof(AadTxtHeader) + pos[1] * sizeof(AadInfo); start_ptr += sizeof(AadTxtHeader) + pos[1] * sizeof(AadInfo);
ende1 = 0; ende1 = 0;
while (!ende1) { for (; !ende1; ++start_ptr) {
if (*start_ptr == ATDS_END) { if (*start_ptr != ATDS_END_TEXT)
continue;
if (start_ptr[1] == ATDS_END) {
++start_ptr;
if (start_ptr[1] == (char)BLOCKENDE && if (start_ptr[1] == (char)BLOCKENDE &&
start_ptr[2] == (char)BLOCKENDE && start_ptr[2] == (char)BLOCKENDE &&
start_ptr[3] == (char)BLOCKENDE) { start_ptr[3] == (char)BLOCKENDE) {
ende = 1; ende = 1;
ende1 = 1; ende1 = 1;
*ptr = 0; *ptr = 0;
} else } else {
ende1 = 1; ende1 = 1;
}
} }
++start_ptr;
} }
} }
} }