diff options
| author | Jamieson Christian | 2003-08-29 04:05:23 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-29 04:05:23 +0000 |
| commit | 5507d752281c792ffd0037ca80ddeb5da3dc26bf (patch) | |
| tree | 98e1ada2e8246c9856b2e5029172c6a56ac8e5b3 /scumm/imuse_player.cpp | |
| parent | 20aaf3c36552cdb5a4c0cd51e1a0e1496a49f4e7 (diff) | |
| download | scummvm-rg350-5507d752281c792ffd0037ca80ddeb5da3dc26bf.tar.gz scummvm-rg350-5507d752281c792ffd0037ca80ddeb5da3dc26bf.tar.bz2 scummvm-rg350-5507d752281c792ffd0037ca80ddeb5da3dc26bf.zip | |
Replaced VER_V* notation for savegames with
a simple number. So that it's still obvious
that the number refers to version, a VER()
macro does nothing to the number but makes
it obvious what the number is for. This
has the exact same effect as the enum that
was going to get more and more lengthy
as the savegame version evolved.
svn-id: r9901
Diffstat (limited to 'scumm/imuse_player.cpp')
| -rw-r--r-- | scumm/imuse_player.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 597544823c..3b42d2f74c 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -1178,48 +1178,48 @@ enum { int Player::save_or_load(Serializer *ser) { static const SaveLoadEntry playerEntries[] = { - MKREF(Player, _parts, TYPE_PART, VER_V8), - MKLINE(Player, _active, sleByte, VER_V8), - MKLINE(Player, _id, sleUint16, VER_V8), - MKLINE(Player, _priority, sleByte, VER_V8), - MKLINE(Player, _volume, sleByte, VER_V8), - MKLINE(Player, _pan, sleInt8, VER_V8), - MKLINE(Player, _transpose, sleByte, VER_V8), - MKLINE(Player, _detune, sleInt8, VER_V8), - MKLINE(Player, _vol_chan, sleUint16, VER_V8), - MKLINE(Player, _vol_eff, sleByte, VER_V8), - MKLINE(Player, _speed, sleByte, VER_V8), - MK_OBSOLETE(Player, _song_index, sleUint16, VER_V8, VER_V19), - MKLINE(Player, _track_index, sleUint16, VER_V8), - MK_OBSOLETE(Player, _timer_counter, sleUint16, VER_V8, VER_V17), - MKLINE(Player, _loop_to_beat, sleUint16, VER_V8), - MKLINE(Player, _loop_from_beat, sleUint16, VER_V8), - MKLINE(Player, _loop_counter, sleUint16, VER_V8), - MKLINE(Player, _loop_to_tick, sleUint16, VER_V8), - MKLINE(Player, _loop_from_tick, sleUint16, VER_V8), - MK_OBSOLETE(Player, _tempo, sleUint32, VER_V8, VER_V19), - MK_OBSOLETE(Player, _cur_pos, sleUint32, VER_V8, VER_V17), - MK_OBSOLETE(Player, _next_pos, sleUint32, VER_V8, VER_V17), - MK_OBSOLETE(Player, _song_offset, sleUint32, VER_V8, VER_V17), - MK_OBSOLETE(Player, _tick_index, sleUint16, VER_V8, VER_V17), - MK_OBSOLETE(Player, _beat_index, sleUint16, VER_V8, VER_V17), - MK_OBSOLETE(Player, _ticks_per_beat, sleUint16, VER_V8, VER_V17), - MKLINE(Player, _music_tick, sleUint32, VER_V19), - MKLINE(Player, _hook._jump[0], sleByte, VER_V8), - MKLINE(Player, _hook._transpose, sleByte, VER_V8), - MKARRAY(Player, _hook._part_onoff[0], sleByte, 16, VER_V8), - MKARRAY(Player, _hook._part_volume[0], sleByte, 16, VER_V8), - MKARRAY(Player, _hook._part_program[0], sleByte, 16, VER_V8), - MKARRAY(Player, _hook._part_transpose[0], sleByte, 16, VER_V8), + MKREF(Player, _parts, TYPE_PART, VER(8)), + MKLINE(Player, _active, sleByte, VER(8)), + MKLINE(Player, _id, sleUint16, VER(8)), + MKLINE(Player, _priority, sleByte, VER(8)), + MKLINE(Player, _volume, sleByte, VER(8)), + MKLINE(Player, _pan, sleInt8, VER(8)), + MKLINE(Player, _transpose, sleByte, VER(8)), + MKLINE(Player, _detune, sleInt8, VER(8)), + MKLINE(Player, _vol_chan, sleUint16, VER(8)), + MKLINE(Player, _vol_eff, sleByte, VER(8)), + MKLINE(Player, _speed, sleByte, VER(8)), + MK_OBSOLETE(Player, _song_index, sleUint16, VER(8), VER(19)), + MKLINE(Player, _track_index, sleUint16, VER(8)), + MK_OBSOLETE(Player, _timer_counter, sleUint16, VER(8), VER(17)), + MKLINE(Player, _loop_to_beat, sleUint16, VER(8)), + MKLINE(Player, _loop_from_beat, sleUint16, VER(8)), + MKLINE(Player, _loop_counter, sleUint16, VER(8)), + MKLINE(Player, _loop_to_tick, sleUint16, VER(8)), + MKLINE(Player, _loop_from_tick, sleUint16, VER(8)), + MK_OBSOLETE(Player, _tempo, sleUint32, VER(8), VER(19)), + MK_OBSOLETE(Player, _cur_pos, sleUint32, VER(8), VER(17)), + MK_OBSOLETE(Player, _next_pos, sleUint32, VER(8), VER(17)), + MK_OBSOLETE(Player, _song_offset, sleUint32, VER(8), VER(17)), + MK_OBSOLETE(Player, _tick_index, sleUint16, VER(8), VER(17)), + MK_OBSOLETE(Player, _beat_index, sleUint16, VER(8), VER(17)), + MK_OBSOLETE(Player, _ticks_per_beat, sleUint16, VER(8), VER(17)), + MKLINE(Player, _music_tick, sleUint32, VER(19)), + MKLINE(Player, _hook._jump[0], sleByte, VER(8)), + MKLINE(Player, _hook._transpose, sleByte, VER(8)), + MKARRAY(Player, _hook._part_onoff[0], sleByte, 16, VER(8)), + MKARRAY(Player, _hook._part_volume[0], sleByte, 16, VER(8)), + MKARRAY(Player, _hook._part_program[0], sleByte, 16, VER(8)), + MKARRAY(Player, _hook._part_transpose[0], sleByte, 16, VER(8)), MKEND() }; const SaveLoadEntry parameterFaderEntries[] = { - MKLINE(ParameterFader, param, sleInt16, VER_V17), - MKLINE(ParameterFader, start, sleInt16, VER_V17), - MKLINE(ParameterFader, end, sleInt16, VER_V17), - MKLINE(ParameterFader, total_time, sleUint32, VER_V17), - MKLINE(ParameterFader, current_time, sleUint32, VER_V17), + MKLINE(ParameterFader, param, sleInt16, VER(17)), + MKLINE(ParameterFader, start, sleInt16, VER(17)), + MKLINE(ParameterFader, end, sleInt16, VER(17)), + MKLINE(ParameterFader, total_time, sleUint32, VER(17)), + MKLINE(ParameterFader, current_time, sleUint32, VER(17)), MKEND() }; |