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

CGE: Fixed non-portability in loading _heroXY array

Browse Source
This commit is contained in:
Paul Gilbert 2011-08-06 15:29:49 +10:00
parent f5d38d82d0
commit c961597988
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/cge/cge_main.cpp
View File

@ -26,6 +26,7 @@
*/
#include "common/scummsys.h"
#include "common/endian.h"
#include "common/memstream.h"
#include "common/savefile.h"
#include "common/serializer.h"
@ -110,11 +111,12 @@ void CGEEngine::syncHeader(Common::Serializer &s) {
for (i = 0; i < 4; i++)
s.syncAsUint16LE(_flag[i]);
initCaveValues();
if (s.isLoading()) {
//TODO: Fix the memory leak when the game is already running
_heroXY = (Hxy *) malloc (sizeof(Hxy) * _caveMax);
_barriers = (Bar *) malloc (sizeof(Bar) * (1 + _caveMax));
// Reinitialise cave values
free(_heroXY);
free(_barriers);
initCaveValues();
}
for (i = 0; i < _caveMax; i++) {
@ -429,9 +431,18 @@ void CGEEngine::loadHeroXY() {
debugC(1, kCGEDebugEngine, "CGEEngine::loadHeroXY()");
INI_FILE cf(progName(".HXY"));
uint16 x, y;
memset(_heroXY, 0, sizeof(_heroXY));
if (!cf._error)
cf.read((uint8 *)(&_heroXY),sizeof(*(&_heroXY)));
if (!cf._error) {
for (int i = 0; i < _caveMax; ++i) {
cf.read((byte *)&x, 2);
cf.read((byte *)&y, 2);
_heroXY[i]._x = (int16)FROM_LE_16(x);
_heroXY[i]._y = (int16)FROM_LE_16(y);
}
}
}
void CGEEngine::loadMapping() {