thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source 
svn-id: r36232
This commit is contained in:
Travis Howell 2009-02-07 03:36:36 +00:00
parent 3a4cc4b88d
commit 5de19ecb28
15 changed files with 178 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/agos/string.cpp
View file

@ -170,7 +170,7 @@ TextLocation *AGOSEngine::getTextLocation(uint a) {
void AGOSEngine::allocateStringTable(int num) {
_stringTabPtr = (byte **)calloc(num, sizeof(byte *));
_stringTabPos = 0;
_stringtab_numalloc = num;
_stringTabSize = num;
}
void AGOSEngine::setupStringTable(byte *mem, int num) {
@ -283,7 +283,7 @@ void AGOSEngine::loadTextIntoMem(uint16 stringId) {
byte *p;
char filename[30];
int i;
uint base_min = 0x8000, base_max, size;
uint16 baseMin = 0x8000, baseMax, size;
_tablesHeapPtr = _tablesheapPtrNew;
_tablesHeapCurPos = _tablesHeapCurPosNew;
@ -301,22 +301,22 @@ void AGOSEngine::loadTextIntoMem(uint16 stringId) {
sprintf(filename, "%s.DAT", filename);
}
base_max = (p[0] * 256) | p[1];
baseMax = (p[0] * 256) | p[1];
p += 2;
if (stringId < base_max) {
_stringIdLocalMin = base_min;
_stringIdLocalMax = base_max;
if (stringId < baseMax) {
_stringIdLocalMin = baseMin;
_stringIdLocalMax = baseMax;
_localStringtable = (byte **)_tablesHeapPtr;
size = (base_max - base_min + 1) * sizeof(byte *);
size = (baseMax - baseMin + 1) * sizeof(byte *);
_tablesHeapPtr += size;
_tablesHeapCurPos += size;
size = loadTextFile(filename, _tablesHeapPtr);
setupLocalStringTable(_tablesHeapPtr, base_max - base_min + 1);
setupLocalStringTable(_tablesHeapPtr, baseMax - baseMin + 1);
_tablesHeapPtr += size;
_tablesHeapCurPos += size;
@ -327,7 +327,7 @@ void AGOSEngine::loadTextIntoMem(uint16 stringId) {
return;
}
base_min = base_max;
baseMin = baseMax;
}
error("loadTextIntoMem: didn't find %d", stringId);