aboutsummaryrefslogtreecommitdiff
path: root/engines/access/amazon/amazon_logic.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-12-03 22:56:58 -0500
committerPaul Gilbert2014-12-12 22:59:45 -0500
commitc1e80440b5969e025109301fad9fa8426558108a (patch)
tree12aa4ccc09e7114d25cb7108272384864925bdfa /engines/access/amazon/amazon_logic.cpp
parent4c2ab8b2979dcbc7ccaee4d42e79aed554d1eb46 (diff)
downloadscummvm-rg350-c1e80440b5969e025109301fad9fa8426558108a.tar.gz
scummvm-rg350-c1e80440b5969e025109301fad9fa8426558108a.tar.bz2
scummvm-rg350-c1e80440b5969e025109301fad9fa8426558108a.zip
ACCESS: Fix the formatting of a bunch of else statements
Diffstat (limited to 'engines/access/amazon/amazon_logic.cpp')
-rw-r--r--engines/access/amazon/amazon_logic.cpp36
1 files changed, 12 insertions, 24 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 1a9765e835..94a61ade61 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1040,8 +1040,7 @@ void Guard::chkVLine() {
if (_position.x > _vm->_player->_rawPlayer.x) {
_topLeft = _vm->_player->_rawPlayer;
_bottomRight = _position;
- }
- else {
+ } else {
_topLeft = _position;
_bottomRight = _vm->_player->_rawPlayer;
}
@@ -1071,8 +1070,7 @@ void Guard::chkVLine() {
_topLeft.x = midX;
_topLeft.y = midY;
- }
- else {
+ } else {
if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
return;
@@ -1086,8 +1084,7 @@ void Guard::chkHLine() {
if (_position.y > _vm->_player->_rawPlayer.y) {
_topLeft = _vm->_player->_rawPlayer;
_bottomRight = _position;
- }
- else {
+ } else {
_topLeft = _position;
_bottomRight = _vm->_player->_rawPlayer;
}
@@ -1117,8 +1114,7 @@ void Guard::chkHLine() {
_topLeft.x = midX;
_topLeft.y = midY;
- }
- else {
+ } else {
if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
return;
@@ -2032,15 +2028,13 @@ int Ant::antHandleStab(int indx, const int *&buf) {
_pitPos.y = 127;
retval = 0;
buf = Amazon::PITWALK;
- }
- else {
+ } else {
_pitPos.x += buf[(retval / 2) + 1];
_pitPos.y += buf[(retval / 2) + 2];
_pitCel = retval;
}
}
- }
- else {
+ } else {
_stabFl = true;
_pitCel = 0;
retval = 0;
@@ -2095,8 +2089,7 @@ void Ant::doAnt() {
_vm->_flags[235] = 1;
_antCel = 0;
buf = Amazon::ANTEAT;
- }
- else {
+ } else {
buf = Amazon::ANTWALK;
if (_vm->_inventory->_inv[76]._value == 1)
_antDirection = UP;
@@ -2115,19 +2108,16 @@ void Ant::doAnt() {
_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
_antCel = idx;
}
- }
- else {
+ } else {
idx += 6;
if (buf[(idx / 2)] != -1) {
_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
_antCel = idx;
- }
- else if (!_antDieFl) {
+ } else if (!_antDieFl) {
idx = 0;
_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
_antCel = idx;
- }
- else {
+ } else {
idx -= 6;
if (_vm->_flags[200] == 0)
_vm->_flags[200] = 1;
@@ -2148,8 +2138,7 @@ void Ant::doAnt() {
idx = _pitCel;
if (_stabFl == 1) {
idx = antHandleStab(idx, buf);
- }
- else {
+ } else {
buf = Amazon::PITWALK;
if (_vm->_timers[13]._flag == 0) {
_vm->_timers[13]._flag = 1;
@@ -2160,8 +2149,7 @@ void Ant::doAnt() {
idx = antHandleLeft(idx, buf);
else if (pt.x > _pitPos.x)
idx = antHandleRight(idx, buf);
- }
- else {
+ } else {
buf = Amazon::PITWALK;
if (_vm->_player->_playerDirection == UP)
idx = antHandleStab(idx, buf);