diff options
| author | Paul Gilbert | 2014-12-10 21:12:39 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 23:06:46 -0500 |
| commit | 781c6ff8c44efd4e9411114d2628d547fab8ce33 (patch) | |
| tree | acd1ce20203fc061054579ab9fcf1601949c2742 /engines/access | |
| parent | b1d5359fc6033c25c3360d30de0fe98ce4fce29e (diff) | |
| download | scummvm-rg350-781c6ff8c44efd4e9411114d2628d547fab8ce33.tar.gz scummvm-rg350-781c6ff8c44efd4e9411114d2628d547fab8ce33.tar.bz2 scummvm-rg350-781c6ff8c44efd4e9411114d2628d547fab8ce33.zip | |
ACCESS: Initial enum cleanup for Ant fields
Diffstat (limited to 'engines/access')
| -rw-r--r-- | engines/access/amazon/amazon_logic.cpp | 30 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_logic.h | 6 |
2 files changed, 19 insertions, 17 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp index eb889d2000..49bc47fc64 100644 --- a/engines/access/amazon/amazon_logic.cpp +++ b/engines/access/amazon/amazon_logic.cpp @@ -1926,8 +1926,8 @@ void River::synchronize(Common::Serializer &s) { /*------------------------------------------------------------------------*/ Ant::Ant(AmazonEngine *vm) : AmazonManager(vm) { - _antDirection = NONE; - _pitDirection = NONE; + _antDirection = RIGHT; + _pitDirection = RIGHT; _antCel = 0; _torchCel = 0; _pitCel = 0; @@ -1962,6 +1962,7 @@ void Ant::plotPit(int indx, const int *&buf) { _vm->_player->_rawPlayer = _pitPos; if (_vm->_inventory->_inv[76]._value == 1) { + // Player has torch idx = _torchCel; buf = Amazon::TORCH; _vm->_timers[14]._flag = 1; @@ -1970,8 +1971,8 @@ void Ant::plotPit(int indx, const int *&buf) { idx = 0; _torchCel = idx; plotTorchSpear(idx, buf); - } - else if (!_stabFl && (_vm->_inventory->_inv[78]._value == 1)) { + } else if (!_stabFl && (_vm->_inventory->_inv[78]._value == 1)) { + // Player has spear idx = 0; buf = Amazon::SPEAR; plotTorchSpear(idx, buf); @@ -1980,8 +1981,8 @@ void Ant::plotPit(int indx, const int *&buf) { int Ant::antHandleRight(int indx, const int *&buf) { int retval = indx; - if (_pitDirection == NONE) { - _pitDirection = UP; + if (_pitDirection == RIGHT) { + _pitDirection = LEFT; _pitPos.y = 127; } retval = _pitCel; @@ -2001,8 +2002,8 @@ int Ant::antHandleRight(int indx, const int *&buf) { int Ant::antHandleLeft(int indx, const int *&buf) { int retval = indx; - if (_pitDirection == UP) { - _pitDirection = NONE; + if (_pitDirection == LEFT) { + _pitDirection = RIGHT; _pitPos.y = 127; } retval = _pitCel; @@ -2058,7 +2059,7 @@ int Ant::antHandleStab(int indx, const int *&buf) { } void Ant::doAnt() { - _antDirection = NONE; + _antDirection = RIGHT; if (_vm->_aniFlag != 1) { _vm->_aniFlag = 1; _antCel = 0; @@ -2086,11 +2087,9 @@ void Ant::doAnt() { const int *buf = nullptr; if (_antDieFl) { buf = Amazon::ANTDIE; - } - else if (_antEatFl) { + } else if (_antEatFl) { buf = Amazon::ANTEAT; - } - else if (_antPos.x > 120 && _vm->_flags[198] == 1) { + } else if (_antPos.x > 120 && _vm->_flags[198] == 1) { _antEatFl = true; _vm->_flags[235] = 1; _antCel = 0; @@ -2098,13 +2097,14 @@ void Ant::doAnt() { } else { buf = Amazon::ANTWALK; if (_vm->_inventory->_inv[76]._value == 1) - _antDirection = UP; + // Player has burning torch, which scares the Ant + _antDirection = LEFT; } int idx = _antCel; if (_vm->_timers[15]._flag == 0) { _vm->_timers[15]._flag = 1; - if (_antDirection == UP) { + if (_antDirection == LEFT) { if (_antPos.x > 10) { if (idx == 0) idx = 36; diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h index 2962d77722..d66a8d818e 100644 --- a/engines/access/amazon/amazon_logic.h +++ b/engines/access/amazon/amazon_logic.h @@ -209,10 +209,12 @@ public: void synchronize(Common::Serializer &s); }; +enum AntDirection { RIGHT = 0, LEFT = 1 }; + class Ant: public AmazonManager { private: - Direction _antDirection; - Direction _pitDirection; + AntDirection _antDirection; + AntDirection _pitDirection; int _antCel; int _torchCel; int _pitCel; |