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

HOPKINS: Fix loading of variant COMPUTAN.TXT used by Polish version.

Browse Source 
This is the final fix for bug #6590 - "HOPKINS-PL: Crash using computer
in office".
This commit is contained in:
D G Turner 2014-05-17 20:22:19 +01:00
parent 2126bef17a
commit bee54dc048
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/hopkins/computer.cpp
View File

@ -345,6 +345,7 @@ static const char _spanishText[] =
* Load Menu data
*/
void ComputerManager::loadMenu() {
debug(9, "ComputerManager::loadMenu()");
char *ptr;
if (_vm->_fileIO->fileExists("COMPUTAN.TXT")) {
ptr = (char *)_vm->_fileIO->loadFile("COMPUTAN.TXT");
@ -368,17 +369,19 @@ void ComputerManager::loadMenu() {
char *tmpPtr = ptr;
int lineNum = 0;
const char lineSep = tmpPtr[0];
while (tmpPtr[0] != '\0' && lineNum < ARRAYSIZE(_menuText)) {
if (tmpPtr[0] == '%' && tmpPtr[1] == '%') {
// End of file marker found - Break out of parse loop
break;
}
if (tmpPtr[0] == '%') {
if (tmpPtr[0] == lineSep) {
int strPos = 0;
while (strPos < ARRAYSIZE(_menuText[0]._line)) {
char curChar = tmpPtr[strPos + 2];
if (curChar == '\0' || curChar == '%' || curChar == 0x0a) // Line Feed
if (curChar == '\0' || curChar == lineSep || curChar == 0x0a) // Line Feed
break;
_menuText[lineNum]._line[strPos++] = curChar;
}
@ -388,7 +391,10 @@ void ComputerManager::loadMenu() {
_menuText[lineNum]._lineSize = strPos - 1;
}
++lineNum;
if (strPos != 0) {
debug(9, "_menuText[%d]._line (size: %d): \"%s\"", lineNum, _menuText[lineNum]._lineSize, _menuText[lineNum]._line);
++lineNum;
}
}
++tmpPtr;
}