diff options
-rw-r--r-- | scumm/imuse.cpp | 12 | ||||
-rw-r--r-- | scumm/saveload.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 1777eb5247..c3788fa58b 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -1449,6 +1449,7 @@ int IMuseInternal::save_or_load(Serializer *ser, ScummEngine *scumm) { MKLINE(IMuseInternal, _queue_cleared, sleByte, VER(8)), MKLINE(IMuseInternal, _master_volume, sleByte, VER(8)), MKLINE(IMuseInternal, _trigger_count, sleUint16, VER(8)), + MKLINE(IMuseInternal, _snm_trigger_index, sleUint16, VER(54)), MKARRAY(IMuseInternal, _channel_volume[0], sleUint16, 8, VER(8)), MKARRAY(IMuseInternal, _volchan_table[0], sleUint16, 8, VER(8)), MKEND() @@ -1473,6 +1474,14 @@ int IMuseInternal::save_or_load(Serializer *ser, ScummEngine *scumm) { MKEND() }; + const SaveLoadEntry snmTriggerEntries[] = { + MKLINE(ImTrigger, sound, sleInt16, VER(54)), + MKLINE(ImTrigger, id, sleByte, VER(54)), + MKLINE(ImTrigger, expire, sleUint16, VER(54)), + MKARRAY(ImTrigger, command[0], sleUint16, 8, VER(54)), + MKEND() + }; + const SaveLoadEntry partEntries[] = { MKREF(Part, _next, TYPE_PART, VER(8)), MKREF(Part, _prev, TYPE_PART, VER(8)), @@ -1503,7 +1512,8 @@ int IMuseInternal::save_or_load(Serializer *ser, ScummEngine *scumm) { ser->_load_ref = loadReference; ser->saveLoadEntries(this, mainEntries); - ser->saveLoadArrayOf (_cmd_queue, ARRAYSIZE(_cmd_queue), sizeof(_cmd_queue[0]), cmdQueueEntries); + ser->saveLoadArrayOf(_cmd_queue, ARRAYSIZE(_cmd_queue), sizeof(_cmd_queue[0]), cmdQueueEntries); + ser->saveLoadArrayOf(_snm_triggers, ARRAYSIZE(_snm_triggers), sizeof(_snm_triggers[0]), snmTriggerEntries); // The players for (i = 0; i < ARRAYSIZE(_players); ++i) diff --git a/scumm/saveload.h b/scumm/saveload.h index 5df78513c7..ac0528c834 100644 --- a/scumm/saveload.h +++ b/scumm/saveload.h @@ -45,7 +45,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 53 +#define CURRENT_VER 54 /** * An auxillary macro, used to specify savegame versions. We use this instead |