aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2011-09-17 11:09:32 +0200
committerStrangerke2011-09-17 11:09:32 +0200
commit38deee5a88ceedeb0979a9b53e7b4e35a7a03f0f (patch)
treedb720d956bd17d5989f732942e2c623e496a69c7
parent4778ff720c3e7c6527dde90c9eba7ccab7646cbb (diff)
downloadscummvm-rg350-38deee5a88ceedeb0979a9b53e7b4e35a7a03f0f.tar.gz
scummvm-rg350-38deee5a88ceedeb0979a9b53e7b4e35a7a03f0f.tar.bz2
scummvm-rg350-38deee5a88ceedeb0979a9b53e7b4e35a7a03f0f.zip
CGE: some more cleanup
-rw-r--r--engines/cge/cge.h1
-rw-r--r--engines/cge/cge_main.cpp8
-rw-r--r--engines/cge/cge_main.h2
3 files changed, 3 insertions, 8 deletions
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index 8c9a468e54..6110a07797 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -184,6 +184,7 @@ public:
Fx *_fx;
Sound *_sound;
ResourceManager *_resman;
+ Sprite *_pocket[kPocketNX];
Common::RandomSource _randomSource;
MusicPlayer *_midiPlayer;
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index cc04eeb382..de3511813a 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -50,10 +50,6 @@
namespace CGE {
-uint16 _stklen = (kStackSize * 2);
-
-Sprite *_pocket[kPocketNX];
-
const char *savegameStr = "SCUMMVM_CGE";
//--------------------------------------------------------------------------
@@ -951,7 +947,7 @@ void Sprite::touch(uint16 mask, int x, int y) {
}
if ((mask & kMouseRightUp) && _vm->_snail->idle()) {
- Sprite *ps = (_vm->_pocLight->_seqPtr) ? _pocket[_vm->_pocPtr] : NULL;
+ Sprite *ps = (_vm->_pocLight->_seqPtr) ? _vm->_pocket[_vm->_pocPtr] : NULL;
if (ps) {
if (_flags._kept || _hero->distance(this) < kDistMax) {
if (works(ps)) {
@@ -994,7 +990,7 @@ void Sprite::touch(uint16 mask, int x, int y) {
if ((mask & kMouseLeftUp) && _vm->_snail->idle()) {
if (_flags._kept) {
for (int n = 0; n < kPocketNX; n++) {
- if (_pocket[n] == this) {
+ if (_vm->_pocket[n] == this) {
_vm->selectPocket(n);
break;
}
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index d8ac10fe6d..bdb3121d63 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -109,8 +109,6 @@ private:
CGEEngine *_vm;
};
-extern Sprite *_pocket[];
-
} // End of namespace CGE
#endif