diff options
author | uruk | 2014-07-21 19:57:33 +0200 |
---|---|---|
committer | uruk | 2014-07-21 19:57:33 +0200 |
commit | 6e26422468b8667c86219069cea25466370656e1 (patch) | |
tree | 8bb0e63fd54d4103a1940f6ad3028bd40fff4e8e /engines/cge2/spare.cpp | |
parent | 1176721034b07ddc6517e0a8b96c5eedb0b57e08 (diff) | |
download | scummvm-rg350-6e26422468b8667c86219069cea25466370656e1.tar.gz scummvm-rg350-6e26422468b8667c86219069cea25466370656e1.tar.bz2 scummvm-rg350-6e26422468b8667c86219069cea25466370656e1.zip |
CGE2: Rework loading of sprites from file.
Now it satisfies the needs described in the last commit's TODO comment.
Diffstat (limited to 'engines/cge2/spare.cpp')
-rw-r--r-- | engines/cge2/spare.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/engines/cge2/spare.cpp b/engines/cge2/spare.cpp index 54918f7920..547d070fc9 100644 --- a/engines/cge2/spare.cpp +++ b/engines/cge2/spare.cpp @@ -47,17 +47,7 @@ void Spare::sync(Common::Serializer &s) { for (int i = 0; i < size; i++) { Sprite *sprite = new Sprite(_vm); sprite->sync(s); - - // In case the reference of the sprite is changed comapred to CGE.INI - // TODO: Rework the whole loading so it doesn't load every sprite from CGE.INI - // and then update them, but load everything from file, so this check isn't - // needed anymore. To do that, I also have to save/load the toolbar's sprites too. - Sprite *loc = locate(sprite->_file); - if (loc->_ref != sprite->_ref) { - loc->contract(); - *loc = *sprite; - } else - update(sprite); + update(sprite); } } } |