libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HE games require min/max heap sizes to be set, after index is read.

Browse Source 
Init _hePalettes, to fix valgrind warnings.

svn-id: r18311
This commit is contained in:
Travis Howell 2005-06-02 14:40:13 +00:00
parent bf89c8a4b9
commit 0e26360fe3
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scumm/scumm.cpp
View File

@ -946,6 +946,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_palManipPalette = NULL;
_palManipIntermediatePal = NULL;
memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
_hePalettes = NULL;
_shadowPalette = NULL;
_shadowPaletteSize = 0;
memset(_currentPalette, 0, sizeof(_currentPalette));
@ -1513,24 +1514,6 @@ int ScummEngine::init(GameDetector &detector) {
requestLoad(ConfMan.getInt("save_slot"));
}
#ifdef __PALM_OS__
if (_features & GF_NEW_COSTUMES)
res._maxHeapThreshold = gVars->memory[kMemScummNewCostGames];
else
res._maxHeapThreshold = gVars->memory[kMemScummOldCostGames];
#else
if (_heversion >= 90 && _HEHeapSize) {
res._maxHeapThreshold = _HEHeapSize * 1024;
} else if (_features & GF_NEW_COSTUMES) {
// Since the new costumes are very big, we increase the heap limit, to avoid having
// to constantly reload stuff from the data files.
res._maxHeapThreshold = 2500000;
} else {
res._maxHeapThreshold = 550000;
}
#endif
res._minHeapThreshold = 400000;
allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
setupScummVars();
@ -1570,6 +1553,24 @@ int ScummEngine::init(GameDetector &detector) {
readIndexFile();
#ifdef __PALM_OS__
if (_features & GF_NEW_COSTUMES)
res._maxHeapThreshold = gVars->memory[kMemScummNewCostGames];
else
res._maxHeapThreshold = gVars->memory[kMemScummOldCostGames];
#else
if (_heversion >= 90 && _HEHeapSize) {
res._maxHeapThreshold = _HEHeapSize * 1024;
} else if (_features & GF_NEW_COSTUMES) {
// Since the new costumes are very big, we increase the heap limit, to avoid having
// to constantly reload stuff from the data files.
res._maxHeapThreshold = 2500000;
} else {
res._maxHeapThreshold = 550000;
}
#endif
res._minHeapThreshold = 400000;
scummInit();
initScummVars();
@ -1885,6 +1886,7 @@ void ScummEngine_v99he::scummInit() {
ScummEngine_v90he::scummInit();
_hePalettes = (uint8 *)malloc((_numPalettes + 1) * 1024);
memset(_hePalettes, 0, (_numPalettes + 1) * 1024);
// Array 129 is set to base name
int len = resStrLen((const byte *)_gameName.c_str()) + 1;