aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche
diff options
context:
space:
mode:
Diffstat (limited to 'engines/avalanche')
-rw-r--r--engines/avalanche/acci2.cpp4
-rw-r--r--engines/avalanche/avalanche.cpp4
-rw-r--r--engines/avalanche/lucerna2.cpp36
-rw-r--r--engines/avalanche/scrolls2.cpp2
-rw-r--r--engines/avalanche/timeout2.cpp6
-rw-r--r--engines/avalanche/trip6.cpp100
-rw-r--r--engines/avalanche/trip6.h24
-rw-r--r--engines/avalanche/visa2.cpp2
8 files changed, 89 insertions, 89 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 882fc3d3ed..30f5a4b9a1 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -1277,7 +1277,7 @@ void Acci::personSpeaks() {
bool found = false; // The _person we're looking for's code is in _person.
- for (byte i = 0; i < _vm->_trip->numtr; i++) {
+ for (byte i = 0; i < _vm->_trip->kSpriteNumbMax; i++) {
if (_vm->_trip->tr[i].quick && ((_vm->_trip->tr[i].a.accinum + 149) == _person)) {
_vm->_scrolls->display(Common::String(_vm->_scrolls->kControlRegister) + byte(i + 49) + _vm->_scrolls->kControlToBuffer);
found = true;
@@ -1573,7 +1573,7 @@ void Acci::doThat() {
int16 y = _vm->_trip->tr[0].y;
_vm->_trip->tr[0].done();
_vm->_trip->tr[0].init(i, true, _vm->_trip);
- _vm->_trip->tr[0].appear(x, y, _vm->_trip->left);
+ _vm->_trip->tr[0].appear(x, y, _vm->_trip->kDirLeft);
_vm->_trip->tr[0].visible = false;
}
}
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 9fd802d30a..4e3bbba319 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -282,7 +282,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
byte spriteNum = 0;
if (sz.isSaving()) {
- for (byte i = 0; i < _trip->numtr; i++) {
+ for (byte i = 0; i < _trip->kSpriteNumbMax; i++) {
if (_trip->tr[i].quick)
spriteNum++;
}
@@ -290,7 +290,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
sz.syncAsByte(spriteNum);
if (sz.isLoading()) {
- for (byte i = 0; i < _trip->numtr; i++) { // Deallocate sprites.
+ for (byte i = 0; i < _trip->kSpriteNumbMax; i++) { // Deallocate sprites.
if (_trip->tr[i].quick)
_trip->tr[i].done();
}
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 47f8382143..a2df1fae24 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -466,7 +466,7 @@ void Lucerna::enterroom(byte x, byte ped) {
} else {
// You've been here before.
_vm->_trip->apped(2, 4); // He's standing in your way straight away...
- _vm->_trip->tr[1].face = _vm->_trip->left;
+ _vm->_trip->tr[1].face = _vm->_trip->kDirLeft;
}
}
}
@@ -535,7 +535,7 @@ void Lucerna::enterroom(byte x, byte ped) {
default: { // You've answered SOME of his questions.
_vm->_trip->tr[1].init(9, false, _vm->_trip);
_vm->_trip->apped(2, 3);
- _vm->_trip->tr[1].face = _vm->_trip->right;
+ _vm->_trip->tr[1].face = _vm->_trip->kDirRight;
_vm->_timeout->set_up_timer(3, _vm->_timeout->proccardiff_return, _vm->_timeout->reason_cardiffsurvey);
}
}
@@ -954,26 +954,26 @@ void Lucerna::mouseway(const Common::Point &cursorPos) {
switch (col) {
case kColorGreen: {
- _vm->_gyro->_dna._direction = _vm->_trip->up;
- _vm->_trip->rwsp(0, _vm->_trip->up);
+ _vm->_gyro->_dna._direction = _vm->_trip->kDirUp;
+ _vm->_trip->rwsp(0, _vm->_trip->kDirUp);
showrw();
}
break;
case kColorBrown: {
- _vm->_gyro->_dna._direction = _vm->_trip->down;
- _vm->_trip->rwsp(0, _vm->_trip->down);
+ _vm->_gyro->_dna._direction = _vm->_trip->kDirDown;
+ _vm->_trip->rwsp(0, _vm->_trip->kDirDown);
showrw();
}
break;
case kColorCyan: {
- _vm->_gyro->_dna._direction = _vm->_trip->left;
- _vm->_trip->rwsp(0, _vm->_trip->left);
+ _vm->_gyro->_dna._direction = _vm->_trip->kDirLeft;
+ _vm->_trip->rwsp(0, _vm->_trip->kDirLeft);
showrw();
}
break;
case kColorLightmagenta: {
- _vm->_gyro->_dna._direction = _vm->_trip->right;
- _vm->_trip->rwsp(0, _vm->_trip->right);
+ _vm->_gyro->_dna._direction = _vm->_trip->kDirRight;
+ _vm->_trip->rwsp(0, _vm->_trip->kDirRight);
showrw();
}
break;
@@ -1032,28 +1032,28 @@ void Lucerna::verte(Common::Point cursorPos) {
_vm->_trip->stopwalking();
break; // Clicked on Avvy: no movement.
case 1:
- _vm->_trip->rwsp(0, _vm->_trip->left);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirLeft);
break;
case 2:
- _vm->_trip->rwsp(0, _vm->_trip->right);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirRight);
break;
case 3:
- _vm->_trip->rwsp(0, _vm->_trip->up);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirUp);
break;
case 4:
- _vm->_trip->rwsp(0, _vm->_trip->ul);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirUpLeft);
break;
case 5:
- _vm->_trip->rwsp(0, _vm->_trip->ur);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirUpRight);
break;
case 6:
- _vm->_trip->rwsp(0, _vm->_trip->down);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirDown);
break;
case 7:
- _vm->_trip->rwsp(0, _vm->_trip->dl);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirDownLeft);
break;
case 8:
- _vm->_trip->rwsp(0, _vm->_trip->dr);
+ _vm->_trip->rwsp(0, _vm->_trip->kDirDownRight);
break;
} // No other values are possible.
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index d3f76b595c..4105c16f10 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -691,7 +691,7 @@ void Scrolls::calldrivers() {
if (param == 0)
natural();
else if ((1 <= param) && (param <= 9)) {
- if ((param > _vm->_trip->numtr) || (!_vm->_trip->tr[param - 1].quick)) { // Not valid.
+ if ((param > _vm->_trip->kSpriteNumbMax) || (!_vm->_trip->tr[param - 1].quick)) { // Not valid.
_vm->_lucerna->errorled();
natural();
} else
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index 59c7ed45fb..9155643d27 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -243,7 +243,7 @@ void Timeout::avaricius_talks() {
}
void Timeout::urinate() {
- _vm->_trip->tr[0].turn(_vm->_trip->up);
+ _vm->_trip->tr[0].turn(_vm->_trip->kDirUp);
_vm->_trip->stopwalking();
_vm->_lucerna->showrw();
set_up_timer(14, proctoilet2, reason_gototoilet);
@@ -545,7 +545,7 @@ void Timeout::meet_avaroid() {
_vm->_gyro->_dna._metAvaroid = true;
set_up_timer(1, procrise_up_oubliette, reason_rising_up_oubliette);
- _vm->_trip->tr[0].face = _vm->_trip->left;
+ _vm->_trip->tr[0].face = _vm->_trip->kDirLeft;
_vm->_trip->tr[0].x = 151;
_vm->_trip->tr[0].ix = -3;
_vm->_trip->tr[0].iy = -5;
@@ -569,7 +569,7 @@ void Timeout::robin_hood_and_geida() {
_vm->_trip->apped(1, 7);
_vm->_trip->tr[0].walkto(6);
_vm->_trip->tr[1].stopwalk();
- _vm->_trip->tr[1].face = _vm->_trip->left;
+ _vm->_trip->tr[1].face = _vm->_trip->kDirLeft;
set_up_timer(20, procrobin_hood_and_geida_talk, reason_robin_hood_and_geida);
_vm->_gyro->_dna._geidaFollows = false;
}
diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp
index ccaba83088..c74efb5f92 100644
--- a/engines/avalanche/trip6.cpp
+++ b/engines/avalanche/trip6.cpp
@@ -171,7 +171,7 @@ void triptype::appear(int16 wx, int16 wy, byte wf) {
}
bool triptype::collision_check() {
- for (byte fv = 0; fv < _tr->numtr; fv++)
+ for (byte fv = 0; fv < _tr->kSpriteNumbMax; fv++)
if (_tr->tr[fv].quick && (_tr->tr[fv].whichsprite != whichsprite) &&
((x + _info._xLength) > _tr->tr[fv].x) &&
(x < (_tr->tr[fv].x + _tr->tr[fv]._info._xLength)) &&
@@ -326,14 +326,14 @@ void triptype::speed(int8 xx, int8 yy) {
if (ix == 0) {
// No horz movement
if (iy < 0)
- turn(_tr->up);
+ turn(_tr->kDirUp);
else
- turn(_tr->down);
+ turn(_tr->kDirDown);
} else {
if (ix < 0)
- turn(_tr->left);
+ turn(_tr->kDirLeft);
else
- turn(_tr->right);
+ turn(_tr->kDirRight);
}
}
@@ -461,14 +461,14 @@ Trip::Trip(AvalancheEngine *vm) {
}
Trip::~Trip() {
- for (byte i = 0; i < numtr; i++) {
+ for (byte i = 0; i < kSpriteNumbMax; i++) {
if (tr[i].quick)
tr[i].done();
}
}
void Trip::loadtrip() {
- for (int16 gm = 0; gm < numtr; gm++)
+ for (int16 gm = 0; gm < kSpriteNumbMax; gm++)
tr[gm].original();
for (uint16 i = 0; i < sizeof(aa); i++)
@@ -883,7 +883,7 @@ void Trip::call_special(uint16 which) {
break;
case 4: // This is the ghost room link.
_vm->_lucerna->dusk();
- tr[0].turn(right); // you'll see this after we get back from bootstrap
+ tr[0].turn(kDirRight); // you'll see this after we get back from bootstrap
_vm->_timeout->set_up_timer(1, _vm->_timeout->procghost_room_phew, _vm->_timeout->reason_ghost_room_phew);
_vm->_enid->backToBootstrap(3);
break;
@@ -909,7 +909,7 @@ void Trip::call_special(uint16 which) {
_vm->_gyro->_dna._userMovesAvvy = false;
tr[0].ix = 3;
tr[0].iy = 0;
- tr[0].face = right;
+ tr[0].face = kDirRight;
_vm->_timeout->set_up_timer(1, _vm->_timeout->procfall_down_oubliette, _vm->_timeout->reason_falling_down_oubliette);
break;
case 7: // _vm->_gyro->special 7: stop falling down oubliette.
@@ -925,7 +925,7 @@ void Trip::call_special(uint16 which) {
case 8: // _vm->_gyro->special 8: leave du Lustie's room.
if ((_vm->_gyro->_dna._geidaFollows) && (!_vm->_gyro->_dna._lustieIsAsleep)) {
_vm->_visa->dixi('q', 63);
- tr[1].turn(down);
+ tr[1].turn(kDirDown);
tr[1].stopwalk();
tr[1].call_eachstep = false; // Geida
_vm->_lucerna->gameover();
@@ -1046,7 +1046,7 @@ void Trip::open_the_door(byte whither, byte ped, byte magicnum) {
return;
} else {
apped(1, 6);
- tr[0].face = right; // added by TT 12/3/1995
+ tr[0].face = kDirRight; // added by TT 12/3/1995
_vm->_sequence->first_show(8);
_vm->_sequence->then_show(9);
}
@@ -1092,28 +1092,28 @@ void Trip::newspeed() {
void Trip::rwsp(byte t, byte dir) {
switch (dir) {
- case up:
+ case kDirUp:
tr[t].speed(0, -tr[t].ys);
break;
- case down:
+ case kDirDown:
tr[t].speed(0, tr[t].ys);
break;
- case left:
+ case kDirLeft:
tr[t].speed(-tr[t].xs, 0);
break;
- case right:
+ case kDirRight:
tr[t].speed(tr[t].xs, 0);
break;
- case ul:
+ case kDirUpLeft:
tr[t].speed(-tr[t].xs, -tr[t].ys);
break;
- case ur:
+ case kDirUpRight:
tr[t].speed(tr[t].xs, -tr[t].ys);
break;
- case dl:
+ case kDirDownLeft:
tr[t].speed(-tr[t].xs, tr[t].ys);
break;
- case dr:
+ case kDirDownRight:
tr[t].speed(tr[t].xs, tr[t].ys);
break;
}
@@ -1160,7 +1160,7 @@ void Trip::getback() {
// Eachstep procedures:
void Trip::follow_avvy_y(byte tripnum) {
- if (tr[0].face == left)
+ if (tr[0].face == kDirLeft)
return;
if (tr[tripnum].homing)
tr[tripnum].hy = tr[1].y;
@@ -1182,7 +1182,7 @@ void Trip::follow_avvy_y(byte tripnum) {
void Trip::back_and_forth(byte tripnum) {
if (!tr[tripnum].homing) {
- if (tr[tripnum].face == right)
+ if (tr[tripnum].face == kDirRight)
tr[tripnum].walkto(4);
else
tr[tripnum].walkto(5);
@@ -1192,9 +1192,9 @@ void Trip::back_and_forth(byte tripnum) {
void Trip::face_avvy(byte tripnum) {
if (!tr[tripnum].homing) {
if (tr[0].x >= tr[tripnum].x)
- tr[tripnum].face = right;
+ tr[tripnum].face = kDirRight;
else
- tr[tripnum].face = left;
+ tr[tripnum].face = kDirLeft;
}
}
@@ -1258,7 +1258,7 @@ void Trip::grab_avvy(byte tripnum) { // For Friar Tuck, in Nottingham.
int16 toy = tr[0].y - 1;
if ((tr[tripnum].x == tox) && (tr[tripnum].y == toy)) {
tr[tripnum].call_eachstep = false;
- tr[tripnum].face = left;
+ tr[tripnum].face = kDirLeft;
tr[tripnum].stopwalk();
// ... whatever ...
} else {
@@ -1310,14 +1310,14 @@ void Trip::geida_procs(byte tripnum) {
if (tr[tripnum].y < (tr[0].y - 2)) {
// Geida is further from the screen than Avvy.
- spin(down, tripnum);
+ spin(kDirDown, tripnum);
tr[tripnum].iy = 1;
tr[tripnum].ix = 0;
take_a_step(tripnum);
return;
} else if (tr[tripnum].y > (tr[0].y + 2)) {
// Avvy is further from the screen than Geida.
- spin(up, tripnum);
+ spin(kDirUp, tripnum);
tr[tripnum].iy = -1;
tr[tripnum].ix = 0;
take_a_step(tripnum);
@@ -1329,11 +1329,11 @@ void Trip::geida_procs(byte tripnum) {
// Now the NPC which is following Avvy won't block his way and will walk next to him properly.
if (tr[tripnum].x < tr[0].x - tr[0].xs * 8 - 12) {
tr[tripnum].ix = tr[0].xs;
- spin(right, tripnum);
+ spin(kDirRight, tripnum);
take_a_step(tripnum);
} else if (tr[tripnum].x > tr[0].x + tr[0].xs * 8 + 12) {
tr[tripnum].ix = -tr[0].xs;
- spin(left, tripnum);
+ spin(kDirLeft, tripnum);
take_a_step(tripnum);
} else
tr[tripnum].ix = 0;
@@ -1349,7 +1349,7 @@ void Trip::call_andexors() {
for (int i = 0; i < 5; i++)
order[i] = -1;
- for (fv = 0; fv < numtr; fv++) {
+ for (fv = 0; fv < kSpriteNumbMax; fv++) {
if (tr[fv].quick && tr[fv].visible)
order[fv] = fv;
}
@@ -1382,14 +1382,14 @@ void Trip::trippancy_link() {
if (_vm->_gyro->_dropdownActive | _vm->_gyro->_onToolbar | _vm->_gyro->_seeScroll)
return;
- for (fv = 0; fv < numtr; fv++) {
+ for (fv = 0; fv < kSpriteNumbMax; fv++) {
if (tr[fv].quick && tr[fv].visible)
tr[fv].walk();
}
call_andexors();
- for (fv = 0; fv < numtr; fv++) {
+ for (fv = 0; fv < kSpriteNumbMax; fv++) {
if (tr[fv].quick && tr[fv].call_eachstep) {
switch (tr[fv].eachstep) {
case procfollow_avvy_y :
@@ -1424,7 +1424,7 @@ void Trip::trippancy_link() {
void Trip::get_back_loretta() {
byte fv;
- for (fv = 0; fv < numtr; fv++) {
+ for (fv = 0; fv < kSpriteNumbMax; fv++) {
if (tr[fv].quick) {
getback();
return;
@@ -1435,7 +1435,7 @@ void Trip::get_back_loretta() {
void Trip::stopwalking() {
tr[0].stopwalk();
- _vm->_gyro->_dna._direction = stopped;
+ _vm->_gyro->_dna._direction = kDirStopped;
if (_vm->_gyro->_alive)
tr[0].step = 1;
}
@@ -1504,7 +1504,7 @@ void Trip::fliproom(byte room, byte ped) {
getsetclear();
- for (fv = 1; fv < numtr; fv++) {
+ for (fv = 1; fv < kSpriteNumbMax; fv++) {
if (tr[fv].quick)
tr[fv].done();
} // Deallocate sprite
@@ -1570,57 +1570,57 @@ void Trip::handleMoveKey(const Common::Event &event) {
else {
switch (event.kbd.keycode) {
case Common::KEYCODE_UP:
- if (_vm->_gyro->_dna._direction != up) {
- _vm->_gyro->_dna._direction = up;
+ if (_vm->_gyro->_dna._direction != kDirUp) {
+ _vm->_gyro->_dna._direction = kDirUp;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_DOWN:
- if (_vm->_gyro->_dna._direction != down) {
- _vm->_gyro->_dna._direction = down;
+ if (_vm->_gyro->_dna._direction != kDirDown) {
+ _vm->_gyro->_dna._direction = kDirDown;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_LEFT:
- if (_vm->_gyro->_dna._direction != left) {
- _vm->_gyro->_dna._direction = left;
+ if (_vm->_gyro->_dna._direction != kDirLeft) {
+ _vm->_gyro->_dna._direction = kDirLeft;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_RIGHT:
- if (_vm->_gyro->_dna._direction != right) {
- _vm->_gyro->_dna._direction = right;
+ if (_vm->_gyro->_dna._direction != kDirRight) {
+ _vm->_gyro->_dna._direction = kDirRight;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_PAGEUP:
- if (_vm->_gyro->_dna._direction != ur) {
- _vm->_gyro->_dna._direction = ur;
+ if (_vm->_gyro->_dna._direction != kDirUpRight) {
+ _vm->_gyro->_dna._direction = kDirUpRight;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_PAGEDOWN:
- if (_vm->_gyro->_dna._direction != dr) {
- _vm->_gyro->_dna._direction = dr;
+ if (_vm->_gyro->_dna._direction != kDirDownRight) {
+ _vm->_gyro->_dna._direction = kDirDownRight;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_END:
- if (_vm->_gyro->_dna._direction != dl) {
- _vm->_gyro->_dna._direction = dl;
+ if (_vm->_gyro->_dna._direction != kDirDownLeft) {
+ _vm->_gyro->_dna._direction = kDirDownLeft;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
break;
case Common::KEYCODE_HOME:
- if (_vm->_gyro->_dna._direction != ul) {
- _vm->_gyro->_dna._direction = ul;
+ if (_vm->_gyro->_dna._direction != kDirUpLeft) {
+ _vm->_gyro->_dna._direction = kDirUpLeft;
rwsp(0, _vm->_gyro->_dna._direction);
} else
stopwalking();
diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h
index e701464f85..76b435b163 100644
--- a/engines/avalanche/trip6.h
+++ b/engines/avalanche/trip6.h
@@ -140,17 +140,17 @@ public:
friend class triptype;
friend class getsettype;
- static const int16 up = 0;
- static const int16 right = 1;
- static const int16 down = 2;
- static const int16 left = 3;
- static const int16 ur = 4;
- static const int16 dr = 5;
- static const int16 dl = 6;
- static const int16 ul = 7;
- static const int16 stopped = 8;
-
- static const int16 numtr = 5; // current max no. of sprites
+ static const int16 kDirUp = 0;
+ static const int16 kDirRight = 1;
+ static const int16 kDirDown = 2;
+ static const int16 kDirLeft = 3;
+ static const int16 kDirUpRight = 4;
+ static const int16 kDirDownRight = 5;
+ static const int16 kDirDownLeft = 6;
+ static const int16 kDirUpLeft = 7;
+ static const int16 kDirStopped = 8;
+
+ static const int16 kSpriteNumbMax = 5; // current max no. of sprites
static const int16 procfollow_avvy_y = 1;
static const int16 procback_and_forth = 2;
@@ -183,7 +183,7 @@ public:
void take_a_step(byte &tripnum);
void handleMoveKey(const Common::Event &event); // To replace tripkey().
- triptype tr[numtr];
+ triptype tr[kSpriteNumbMax];
getsettype getset[2];
byte aa[1600];
diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp
index f61236593e..2f438ba5f9 100644
--- a/engines/avalanche/visa2.cpp
+++ b/engines/avalanche/visa2.cpp
@@ -260,7 +260,7 @@ void Visa::talkto(byte whom) {
whom -= 149;
no_matches = true;
- for (fv = 0; fv <= _vm->_trip->numtr; fv++)
+ for (fv = 0; fv <= _vm->_trip->kSpriteNumbMax; fv++)
if (_vm->_trip->tr[fv].a.accinum == whom) {
_vm->_scrolls->display(Common::String(_vm->_scrolls->kControlRegister) + (fv + 49) + _vm->_scrolls->kControlToBuffer);
no_matches = false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 00:18:30 +0000