diff options
author | Strangerke | 2011-08-06 02:42:47 +0200 |
---|---|---|
committer | Strangerke | 2011-08-06 02:42:47 +0200 |
commit | bbc51fa44342f72fd74a5eeabbfad08c4d345a09 (patch) | |
tree | d60064e55e003c3cf02eaa3c5994b5081a1aa30e /engines/cge/cge_main.cpp | |
parent | 7ea1f74759c2b1a5e9d497a6bc3175a414ac94a1 (diff) | |
parent | c1294b772f3f459976dacb1c06f45425cc94853b (diff) | |
download | scummvm-rg350-bbc51fa44342f72fd74a5eeabbfad08c4d345a09.tar.gz scummvm-rg350-bbc51fa44342f72fd74a5eeabbfad08c4d345a09.tar.bz2 scummvm-rg350-bbc51fa44342f72fd74a5eeabbfad08c4d345a09.zip |
Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into soltys_wip2
Diffstat (limited to 'engines/cge/cge_main.cpp')
-rw-r--r-- | engines/cge/cge_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index cbba280ff8..d9d32b7f39 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -311,8 +311,8 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt if (s.isSaving()) { for (i = 0; i < kPocketNX; i++) { - register Sprite *s = _pocket[i]; - _pocref[i] = (s) ? s->_ref : -1; + register Sprite *spr = _pocket[i]; + _pocref[i] = (spr) ? spr->_ref : -1; } warning("STUB: CGEEngine::syncGame Digital and Midi volume"); |