aboutsummaryrefslogtreecommitdiff
path: root/engines/hugo
diff options
context:
space:
mode:
authorD G Turner2011-10-31 21:59:32 +0000
committerD G Turner2011-10-31 21:59:32 +0000
commit2a7c65f02dcb37f80431f84982f3036c303d37e8 (patch)
tree670f51527e69992738defe8c62b10b04fd1b789e /engines/hugo
parent6e6fc324470281bc2e6f46343e29e0e5dbfa810d (diff)
downloadscummvm-rg350-2a7c65f02dcb37f80431f84982f3036c303d37e8.tar.gz
scummvm-rg350-2a7c65f02dcb37f80431f84982f3036c303d37e8.tar.bz2
scummvm-rg350-2a7c65f02dcb37f80431f84982f3036c303d37e8.zip
HUGO: Rename Sequence Index Direction Enums.
This is to avoid any further collisions with system defines.
Diffstat (limited to 'engines/hugo')
-rw-r--r--engines/hugo/game.h2
-rw-r--r--engines/hugo/object_v1d.cpp16
-rw-r--r--engines/hugo/object_v1w.cpp20
-rw-r--r--engines/hugo/object_v2d.cpp20
-rw-r--r--engines/hugo/object_v3d.cpp20
-rw-r--r--engines/hugo/route.cpp16
6 files changed, 47 insertions, 47 deletions
diff --git a/engines/hugo/game.h b/engines/hugo/game.h
index ca082c2452..b1c5f407b3 100644
--- a/engines/hugo/game.h
+++ b/engines/hugo/game.h
@@ -66,7 +66,7 @@ enum cycle_t {kCycleInvisible, kCycleAlmostInvisible, kCycleNotCycling, kCycleFo
/**
* Enumerate sequence index matching direction of travel
*/
-enum {RIGHT, LEFT, DOWN, __UP};
+enum {SEQ_RIGHT, SEQ_LEFT, SEQ_DOWN, SEQ_UP};
enum font_t {LARGE_ROMAN, MED_ROMAN, NUM_GDI_FONTS, INIT_FONTS, DEL_FONTS};
diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp
index 813fb2983d..831dc88dea 100644
--- a/engines/hugo/object_v1d.cpp
+++ b/engines/hugo/object_v1d.cpp
@@ -205,15 +205,15 @@ void ObjectHandler_v1d::moveObjects() {
if (!obj->vx) { // Got 4 directions
if (obj->vx != obj->oldvx) {// vx just stopped
if (dy > 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (dx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
}
@@ -239,15 +239,15 @@ void ObjectHandler_v1d::moveObjects() {
if (!obj->vx && (obj->seqNumb > 2)) {
if (obj->vx != obj->oldvx) { // vx just stopped
if (obj->vy > 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (obj->vx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
if (obj->vx || obj->vy)
diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp
index 62530026d2..4388ef5520 100644
--- a/engines/hugo/object_v1w.cpp
+++ b/engines/hugo/object_v1w.cpp
@@ -208,24 +208,24 @@ void ObjectHandler_v1w::moveObjects() {
if (!obj->vx) { // Got 4 directions
if (obj->vx != obj->oldvx) { // vx just stopped
if (dy >= 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (dx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
break;
case 3:
case 2:
if (obj->vx != obj->oldvx) { // vx just stopped
if (dx > 0) // Left & right only
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
break;
}
@@ -252,15 +252,15 @@ void ObjectHandler_v1w::moveObjects() {
if (!obj->vx && (obj->seqNumb >= 4)) {
if (obj->vx != obj->oldvx) { // vx just stopped
if (obj->vy > 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (obj->vx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
}
obj->oldvx = obj->vx;
diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp
index 55ccdbb093..4a22fab2c0 100644
--- a/engines/hugo/object_v2d.cpp
+++ b/engines/hugo/object_v2d.cpp
@@ -211,24 +211,24 @@ void ObjectHandler_v2d::moveObjects() {
if (!obj->vx) { // Got 4 directions
if (obj->vx != obj->oldvx) { // vx just stopped
if (dy > 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (dx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
break;
case 3:
case 2:
if (obj->vx != obj->oldvx) { // vx just stopped
if (dx > 0) // Left & right only
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
break;
}
@@ -255,15 +255,15 @@ void ObjectHandler_v2d::moveObjects() {
if (!obj->vx && (obj->seqNumb >= 4)) {
if (obj->vx != obj->oldvx) { // vx just stopped
if (obj->vy > 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (obj->vx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
}
obj->oldvx = obj->vx;
diff --git a/engines/hugo/object_v3d.cpp b/engines/hugo/object_v3d.cpp
index f07e4d6aac..cde7f5fd62 100644
--- a/engines/hugo/object_v3d.cpp
+++ b/engines/hugo/object_v3d.cpp
@@ -92,24 +92,24 @@ void ObjectHandler_v3d::moveObjects() {
if (!obj->vx) { // Got 4 directions
if (obj->vx != obj->oldvx) { // vx just stopped
if (dy >= 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (dx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
break;
case 3:
case 2:
if (obj->vx != obj->oldvx) { // vx just stopped
if (dx > 0) // Left & right only
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
break;
}
@@ -136,15 +136,15 @@ void ObjectHandler_v3d::moveObjects() {
if (!obj->vx && (obj->seqNumb >= 4)) {
if (obj->vx != obj->oldvx) { // vx just stopped
if (obj->vy > 0)
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
else
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
}
} else if (obj->vx != obj->oldvx) {
if (obj->vx > 0)
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
else
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
}
}
obj->oldvx = obj->vx;
diff --git a/engines/hugo/route.cpp b/engines/hugo/route.cpp
index 60f52bd6e8..57c5148dd8 100644
--- a/engines/hugo/route.cpp
+++ b/engines/hugo/route.cpp
@@ -67,35 +67,35 @@ void Route::setDirection(const uint16 keyCode) {
switch (keyCode) {
case Common::KEYCODE_UP:
case Common::KEYCODE_KP8:
- obj->currImagePtr = obj->seqList[__UP].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_UP].seqPtr;
break;
case Common::KEYCODE_DOWN:
case Common::KEYCODE_KP2:
- obj->currImagePtr = obj->seqList[DOWN].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_DOWN].seqPtr;
break;
case Common::KEYCODE_LEFT:
case Common::KEYCODE_KP4:
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
break;
case Common::KEYCODE_RIGHT:
case Common::KEYCODE_KP6:
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
break;
case Common::KEYCODE_HOME:
case Common::KEYCODE_KP7:
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
break;
case Common::KEYCODE_END:
case Common::KEYCODE_KP1:
- obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_LEFT].seqPtr;
break;
case Common::KEYCODE_PAGEUP:
case Common::KEYCODE_KP9:
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
break;
case Common::KEYCODE_PAGEDOWN:
case Common::KEYCODE_KP3:
- obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
+ obj->currImagePtr = obj->seqList[SEQ_RIGHT].seqPtr;
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 17:40:42 +0000