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

Fixed bug that made ScummVM crash when loading a savegame where the main

Browse Source 
character was walking. (I had missed a case where pointers were cast to
integers.)

svn-id: r12113
This commit is contained in:
Torbjörn Andersson 2004-01-03 15:52:05 +00:00
parent fa523f7f7e
commit c1cddedca8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sword2/save_rest.cpp
View File

@ -350,7 +350,7 @@ uint32 Sword2Engine::restoreFromBuffer(Memory *buffer, uint32 size) {
varsRes = _resman->openResource(1);
// copy that to the buffer, following the header
memcpy(varsRes, buffer->ad + sizeof(_saveGameHeader), _saveGameHeader.varLength );
memcpy(varsRes, buffer->ad + sizeof(_saveGameHeader), _saveGameHeader.varLength);
#ifdef SCUMM_BIG_ENDIAN
uint32 *globalVars = (uint32 *) (varsRes + sizeof(StandardHeader));
@ -583,10 +583,10 @@ int32 Logic::fnGetPlayerSaveData(int32 *params) {
ob_mega->currently_walking = 0;
// pointer to object's graphic structure
pars[0] = (int32) ob_graphic;
pars[0] = _vm->_memory->ptrToInt((const uint8 *) ob_graphic);
// pointer to object's mega structure
pars[1] = (int32) ob_mega;
pars[1] = _vm->_memory->ptrToInt((const uint8 *) ob_mega);
// target direction
pars[2] = ob_mega->current_dir;