aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/snail.cpp
diff options
context:
space:
mode:
authorStrangerke2011-08-02 21:47:56 +0200
committerStrangerke2011-08-02 21:47:56 +0200
commit6f92cdd0d0e124653c4164c7ab0f91e5b910f6bc (patch)
treed158a6c1d9208df64c129001f0d1b17bb1858779 /engines/cge/snail.cpp
parent88f6cc9b234432b068a6bd7e18ed92696dc95176 (diff)
downloadscummvm-rg350-6f92cdd0d0e124653c4164c7ab0f91e5b910f6bc.tar.gz
scummvm-rg350-6f92cdd0d0e124653c4164c7ab0f91e5b910f6bc.tar.bz2
scummvm-rg350-6f92cdd0d0e124653c4164c7ab0f91e5b910f6bc.zip
CGE: Rename some more defines
Diffstat (limited to 'engines/cge/snail.cpp')
-rw-r--r--engines/cge/snail.cpp21
1 files changed, 6 insertions, 15 deletions
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index aece48a933..2d4c28c0ab 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -36,15 +36,6 @@
namespace CGE {
-extern Sprite *_pocLight;
-
-//-------------------------------------------------------------------------
-// SPRITE * Pocket[POCKET_NX]={ NULL, NULL, NULL, NULL,
-// NULL, NULL, NULL, NULL, };
-// int _pocPtr = 0;
-//-------------------------------------------------------------------------
-extern Sprite *_pocket[];
-
void CGEEngine::snGame(Sprite *spr, int num) {
debugC(1, kCGEDebugEngine, "CGEEngine::snGame(spr, %d)", num);
@@ -67,11 +58,11 @@ void CGEEngine::snGame(Sprite *spr, int num) {
}
if (_game) { // continue game
- int i = new_random(3), hand = (dup[0]->_shpCnt == 6);
+ int i = newRandom(3), hand = (dup[0]->_shpCnt == 6);
Stage++;
if (hand && Stage > kDressed)
++hand;
- if (i >= 0 || (dup[i] == spr && new_random(3) == 0)) {
+ if (i >= 0 || (dup[i] == spr && newRandom(3) == 0)) {
_snail->addCom(kSnSeq, -1, 3, dup[0]); // yes
_snail->addCom(kSnSeq, -1, 3, dup[1]); // yes
_snail->addCom(kSnSeq, -1, 3, dup[2]); // yes
@@ -149,9 +140,9 @@ void CGEEngine::snGame(Sprite *spr, int num) {
_snail->addCom(kSnGame, 20002, 2, NULL);
_game = true;
} else { // cont
- _sprK1->step(new_random(6));
- _sprK2->step(new_random(6));
- _sprK3->step(new_random(6));
+ _sprK1->step(newRandom(6));
+ _sprK2->step(newRandom(6));
+ _sprK3->step(newRandom(6));
///--------------------
if (spr->_ref == 1 && _keyboard->_key[kKeyAlt]) {
_sprK1->step(5);
@@ -179,7 +170,7 @@ void CGEEngine::snGame(Sprite *spr, int num) {
_game = false;
return;
} else
- _sprK3->step(new_random(5));
+ _sprK3->step(newRandom(5));
}
if (_gameCase2Cpt < 100) {
switch (_gameCase2Cpt) {