aboutsummaryrefslogtreecommitdiff
path: root/engines/access/amazon
diff options
context:
space:
mode:
authorFilippos Karapetis2015-07-24 23:03:22 +0300
committerFilippos Karapetis2015-07-24 23:03:22 +0300
commit8be83948b1485bb143dd05f7373ffeeb08a8638d (patch)
tree7082d1b73e52c97ea4b6bf1955171e00b72cf57e /engines/access/amazon
parent8ccc6331adadee6cb5c4d6582ce3af614be0850d (diff)
downloadscummvm-rg350-8be83948b1485bb143dd05f7373ffeeb08a8638d.tar.gz
scummvm-rg350-8be83948b1485bb143dd05f7373ffeeb08a8638d.tar.bz2
scummvm-rg350-8be83948b1485bb143dd05f7373ffeeb08a8638d.zip
ACCESS: Use our formatting conventions for variable and function names
Diffstat (limited to 'engines/access/amazon')
-rw-r--r--engines/access/amazon/amazon_game.cpp4
-rw-r--r--engines/access/amazon/amazon_resources.cpp2
-rw-r--r--engines/access/amazon/amazon_resources.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 9c39a9bd49..7a55873d97 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -195,8 +195,8 @@ void AmazonEngine::initVariables() {
_timers.push_back(te);
}
- _player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
- _player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
+ _player->_playerX = _player->_rawPlayer.x = _travelPos[_player->_roomNumber][0];
+ _player->_playerY = _player->_rawPlayer.y = _travelPos[_player->_roomNumber][1];
_room->_selectCommand = -1;
_events->setNormalCursor(CURSOR_CROSSHAIRS);
_mouseMode = 0;
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 5ffb91d9fd..430aa64f30 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -326,7 +326,7 @@ const byte *const CURSORS[10] = {
MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
};
-const int TRAVEL_POS[][2] = {
+const int _travelPos[][2] = {
{ -1, 0 },
{ 228, 117 },
{ 28, 98 },
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 9801fd9dee..10dea02abc 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -60,7 +60,7 @@ extern const int DIAGOFFDLY[];
extern const byte *const CURSORS[10];
-extern const int TRAVEL_POS[][2];
+extern const int _travelPos[][2];
extern const int OVEROFFR[];
extern const int OVEROFFL[];