aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/snail.cpp
diff options
context:
space:
mode:
authorStrangerke2011-06-20 23:40:22 +0200
committerStrangerke2011-06-20 23:40:22 +0200
commit6dc29e4a0489a62498653a880f38369ce05d41f8 (patch)
treeade5ca48edfb8a6408d3a6702d1acf86afcc86bb /engines/cge/snail.cpp
parent77d4dcade26a69a6e2ebcc69a4224059c450f3e4 (diff)
downloadscummvm-rg350-6dc29e4a0489a62498653a880f38369ce05d41f8.tar.gz
scummvm-rg350-6dc29e4a0489a62498653a880f38369ce05d41f8.tar.bz2
scummvm-rg350-6dc29e4a0489a62498653a880f38369ce05d41f8.zip
CGE: Remove some statics
Diffstat (limited to 'engines/cge/snail.cpp')
-rw-r--r--engines/cge/snail.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index afe73b4d24..4675c6b848 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -58,7 +58,7 @@ int Lev = -1;
SNAIL Snail = false;
SNAIL Snail_ = true;
-extern SPRITE PocLight;
+extern SPRITE *PocLight;
//-------------------------------------------------------------------------
// SPRITE * Pocket[POCKET_NX]={ NULL, NULL, NULL, NULL,
@@ -68,8 +68,6 @@ extern SPRITE PocLight;
extern SPRITE *Pocket[];
extern int PocPtr;
extern DAC *SysPal;
-extern MOUSE Mouse;
-
static void SNGame(SPRITE *spr, int num) {
switch (num) {
@@ -300,18 +298,18 @@ int FindPocket(SPRITE *spr) {
void SelectPocket(int n) {
- if (n < 0 || (PocLight.SeqPtr && PocPtr == n)) {
- PocLight.Step(0);
+ if (n < 0 || (PocLight->SeqPtr && PocPtr == n)) {
+ PocLight->Step(0);
n = FindPocket(NULL);
if (n >= 0)
PocPtr = n;
} else {
if (Pocket[n] != NULL) {
PocPtr = n;
- PocLight.Step(1);
+ PocLight->Step(1);
}
}
- PocLight.Goto(POCKET_X + PocPtr * POCKET_DX + POCKET_SX, POCKET_Y + POCKET_SY);
+ PocLight->Goto(POCKET_X + PocPtr * POCKET_DX + POCKET_SX, POCKET_Y + POCKET_SY);
}
@@ -903,9 +901,9 @@ static void SNReach(SPRITE *spr, int mode) {
static void SNMouse(bool on) {
if (on)
- Mouse.On();
+ Mouse->On();
else
- Mouse.Off();
+ Mouse->Off();
}
@@ -960,13 +958,13 @@ void SNAIL::RunCom(void) {
if (sprel == Hero && sprel->SeqTest(-1))
sprel->Step(HTALK);
Say(Text->getText(snc->Val), sprel);
- SYSTEM::FunDel = HEROFUN0;
+ Sys->FunDel = HEROFUN0;
}
break;
case SNINF :
if (TalkEnable) {
Inf(Text->getText(snc->Val));
- SYSTEM::FunDel = HEROFUN0;
+ Sys->FunDel = HEROFUN0;
}
break;
case SNTIME :