From 5649ce55fc867d711ae3fb5dfd26f3be879995b0 Mon Sep 17 00:00:00 2001 From: upthorn Date: Sat, 28 Jul 2012 21:08:31 -0700 Subject: COMPOSER: Various formatting fixes. --- engines/composer/saveload.cpp | 72 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'engines') diff --git a/engines/composer/saveload.cpp b/engines/composer/saveload.cpp index 919fd0d4e6..55544d79e2 100644 --- a/engines/composer/saveload.cpp +++ b/engines/composer/saveload.cpp @@ -35,7 +35,7 @@ namespace Composer { -template +template void ComposerEngine::syncArray(Common::Serializer &ser, Common::Array &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { if (ser.isSaving()) { uint32 size = data.size(); @@ -54,7 +54,7 @@ void ComposerEngine::syncArray(Common::Serializer &ser, Common::Array &data, } } } -template +template void ComposerEngine::syncList(Common::Serializer &ser, Common::List &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { if (ser.isSaving()) { uint32 size = data.size(); @@ -73,7 +73,7 @@ void ComposerEngine::syncList(Common::Serializer &ser, Common::List &data, Co } } } -template +template void ComposerEngine::syncListReverse(Common::Serializer &ser, Common::List &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { if (ser.isSaving()) { uint32 size = data.size(); @@ -93,15 +93,15 @@ void ComposerEngine::syncListReverse(Common::Serializer &ser, Common::List &d } } template<> -void ComposerEngine::sync (Common::Serializer &ser, uint16 &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, uint16 &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { ser.syncAsUint16LE(data, minVersion, maxVersion); } template<> -void ComposerEngine::sync (Common::Serializer &ser, uint32 &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, uint32 &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { ser.syncAsUint32LE(data, minVersion, maxVersion); } template<> -void ComposerEngine::sync (Common::Serializer &ser, Library &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, Library &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { if (ser.isSaving()) { ser.syncAsUint16LE(data._id, minVersion, maxVersion); ser.syncString(data._group, minVersion, maxVersion); @@ -112,8 +112,8 @@ void ComposerEngine::sync (Common::Serializer &ser, Library &data, Comm loadLibrary(id); } } -template <> -void ComposerEngine::syncListReverse (Common::Serializer &ser, Common::List &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +template<> +void ComposerEngine::syncListReverse(Common::Serializer &ser, Common::List &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { if (ser.isSaving()) { uint32 size = data.size(); ser.syncAsUint32LE(size, minVersion, maxVersion); @@ -130,12 +130,12 @@ void ComposerEngine::syncListReverse (Common::Serializer &ser, Common:: } } template<> -void ComposerEngine::sync (Common::Serializer &ser, PendingPageChange &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, PendingPageChange &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { ser.syncAsUint16LE(data._pageId, minVersion, maxVersion); ser.syncAsByte(data._remove, minVersion, maxVersion); } template<> -void ComposerEngine::sync (Common::Serializer &ser, OldScript *&data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, OldScript *&data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { uint16 id; uint32 pos, delay; if (ser.isSaving()) { @@ -153,7 +153,7 @@ void ComposerEngine::sync (Common::Serializer &ser, OldScript *&dat } } template<> -void ComposerEngine::sync (Common::Serializer &ser, QueuedScript &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, QueuedScript &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { ser.syncAsUint32LE(data._baseTime); ser.syncAsUint32LE(data._duration); ser.syncAsUint32LE(data._count); @@ -161,7 +161,7 @@ void ComposerEngine::sync (Common::Serializer &ser, QueuedScript & if (ser.isLoading()) data._baseTime += _timeDelta; } template<> -void ComposerEngine::sync (Common::Serializer &ser, Pipe *&data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, Pipe *&data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { uint16 id; uint32 offset, tmp; if (ser.isSaving()) { @@ -200,18 +200,18 @@ void ComposerEngine::sync (Common::Serializer &ser, Pipe *&data, Common: for (Pipe::DelMap::iterator i = data->_bufferedResources.begin(); i != data->_bufferedResources.end(); i++) { uint32 key = (*i)._key; ser.syncAsUint32LE(key); - syncList (ser, (*i)._value, minVersion, maxVersion); + syncList(ser, (*i)._value, minVersion, maxVersion); } } } template<> -void ComposerEngine::sync (Common::Serializer &ser, AnimationEntry &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, AnimationEntry &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { ser.syncAsUint32LE(data.state); ser.syncAsUint16LE(data.counter); ser.syncAsUint16LE(data.prevValue); } template<> -void ComposerEngine::sync (Common::Serializer &ser, Animation *&data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, Animation *&data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { uint16 animId, x, y; uint32 offset, state, param; int32 size; @@ -239,14 +239,14 @@ void ComposerEngine::sync (Common::Serializer &ser, Animation *&dat uint32 tmp; ser.syncAsUint32LE(tmp); for (uint32 i = 0; i < tmp; i++) { - sync (ser, data->_entries[i], minVersion, maxVersion); + sync(ser, data->_entries[i], minVersion, maxVersion); } } else { - syncArray (ser, data->_entries, minVersion, maxVersion); + syncArray(ser, data->_entries, minVersion, maxVersion); } } template<> -void ComposerEngine::sync (Common::Serializer &ser, Sprite &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { +void ComposerEngine::sync(Common::Serializer &ser, Sprite &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { ser.syncAsUint16LE(data._id); ser.syncAsUint16LE(data._animId); ser.syncAsSint16LE(data._pos.x); @@ -301,20 +301,20 @@ Common::Error ComposerEngine::loadGameState(int slot) { for (uint32 i = 0; i < libIds.size(); i++) unloadLibrary(libIds[i]); - syncListReverse (ser, _libraries); + syncListReverse(ser, _libraries); ser.syncString(_bookGroup); - syncArray (ser, _pendingPageChanges); - syncArray (ser, _stack); - syncArray (ser, _vars); + syncArray(ser, _pendingPageChanges); + syncArray(ser, _stack); + syncArray(ser, _vars); // Free outdated pointers for (Common::List::iterator i = _oldScripts.begin(); i != _oldScripts.end(); i++) { delete *i; } - syncList (ser, _oldScripts); - syncArray (ser, _queuedScripts); + syncList(ser, _oldScripts); + syncArray(ser, _queuedScripts); ser.syncAsSint16LE(_lastMousePos.x); ser.syncAsSint16LE(_lastMousePos.y); @@ -332,15 +332,15 @@ Common::Error ComposerEngine::loadGameState(int slot) { } _pipeStreams.clear(); - syncListReverse (ser, _pipes); + syncListReverse(ser, _pipes); // Free outdated pointers for (Common::List::iterator i = _anims.begin(); i != _anims.end(); i++) { delete *i; } - syncList (ser, _anims); - syncList (ser, _sprites); + syncList(ser, _anims); + syncList(ser, _sprites); _dirtyRects.clear(); @@ -391,14 +391,14 @@ Common::Error ComposerEngine::saveGameState(int slot, const Common::String &desc ser.syncAsUint32LE(_currentTime); ser.syncAsUint32LE(_lastTime); - syncListReverse (ser, _libraries); + syncListReverse(ser, _libraries); ser.syncString(_bookGroup); - syncArray (ser, _pendingPageChanges); - syncArray (ser, _stack); - syncArray (ser, _vars); - syncList (ser, _oldScripts); - syncArray (ser, _queuedScripts); + syncArray(ser, _pendingPageChanges); + syncArray(ser, _stack); + syncArray(ser, _vars); + syncList(ser, _oldScripts); + syncArray(ser, _queuedScripts); ser.syncAsSint16LE(_lastMousePos.x); ser.syncAsSint16LE(_lastMousePos.y); @@ -406,9 +406,9 @@ Common::Error ComposerEngine::saveGameState(int slot, const Common::String &desc ser.syncAsByte(_mouseVisible); ser.syncAsUint16LE(_mouseSpriteId); - syncListReverse (ser, _pipes); - syncList (ser, _anims); - syncList (ser, _sprites); + syncListReverse(ser, _pipes); + syncList(ser, _anims); + syncList(ser, _sprites); byte paletteBuffer[256 * 3]; _system->getPaletteManager()->grabPalette(paletteBuffer, 0, 256); -- cgit v1.2.3