diff options
| author | Matt Lewandowsky | 2011-10-31 02:02:59 -0700 |
|---|---|---|
| committer | Alyssa Milburn | 2011-10-31 12:11:11 +0100 |
| commit | a9d6c87ea64fa3a7e25f46c3478b56559c53d8b7 (patch) | |
| tree | afbf6d919526793e0b610e9ba57ae21b4b23f276 /engines | |
| parent | 53160df757f06f2fa5492815fb44b708d0761d3f (diff) | |
| download | scummvm-rg350-a9d6c87ea64fa3a7e25f46c3478b56559c53d8b7.tar.gz scummvm-rg350-a9d6c87ea64fa3a7e25f46c3478b56559c53d8b7.tar.bz2 scummvm-rg350-a9d6c87ea64fa3a7e25f46c3478b56559c53d8b7.zip | |
HUGO: Change _UP to __UP to avoid definition conflict on some backends.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hugo/game.h | 2 | ||||
| -rw-r--r-- | engines/hugo/object_v1d.cpp | 4 | ||||
| -rw-r--r-- | engines/hugo/object_v1w.cpp | 4 | ||||
| -rw-r--r-- | engines/hugo/object_v2d.cpp | 4 | ||||
| -rw-r--r-- | engines/hugo/object_v3d.cpp | 4 | ||||
| -rw-r--r-- | engines/hugo/route.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/engines/hugo/game.h b/engines/hugo/game.h index 5db57789dc..ca082c2452 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 {RIGHT, LEFT, DOWN, __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 ecdbb3b4c6..813fb2983d 100644 --- a/engines/hugo/object_v1d.cpp +++ b/engines/hugo/object_v1d.cpp @@ -207,7 +207,7 @@ void ObjectHandler_v1d::moveObjects() { if (dy > 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (dx > 0) @@ -241,7 +241,7 @@ void ObjectHandler_v1d::moveObjects() { if (obj->vy > 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (obj->vx > 0) diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp index 11c09176e5..62530026d2 100644 --- a/engines/hugo/object_v1w.cpp +++ b/engines/hugo/object_v1w.cpp @@ -210,7 +210,7 @@ void ObjectHandler_v1w::moveObjects() { if (dy >= 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (dx > 0) @@ -254,7 +254,7 @@ void ObjectHandler_v1w::moveObjects() { if (obj->vy > 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (obj->vx > 0) diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp index c9e5104972..55ccdbb093 100644 --- a/engines/hugo/object_v2d.cpp +++ b/engines/hugo/object_v2d.cpp @@ -213,7 +213,7 @@ void ObjectHandler_v2d::moveObjects() { if (dy > 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (dx > 0) @@ -257,7 +257,7 @@ void ObjectHandler_v2d::moveObjects() { if (obj->vy > 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (obj->vx > 0) diff --git a/engines/hugo/object_v3d.cpp b/engines/hugo/object_v3d.cpp index 07bd5e0c7f..f07e4d6aac 100644 --- a/engines/hugo/object_v3d.cpp +++ b/engines/hugo/object_v3d.cpp @@ -94,7 +94,7 @@ void ObjectHandler_v3d::moveObjects() { if (dy >= 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (dx > 0) @@ -138,7 +138,7 @@ void ObjectHandler_v3d::moveObjects() { if (obj->vy > 0) obj->currImagePtr = obj->seqList[DOWN].seqPtr; else - obj->currImagePtr = obj->seqList[_UP].seqPtr; + obj->currImagePtr = obj->seqList[__UP].seqPtr; } } else if (obj->vx != obj->oldvx) { if (obj->vx > 0) diff --git a/engines/hugo/route.cpp b/engines/hugo/route.cpp index af8ec3427d..60f52bd6e8 100644 --- a/engines/hugo/route.cpp +++ b/engines/hugo/route.cpp @@ -67,7 +67,7 @@ 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[__UP].seqPtr; break; case Common::KEYCODE_DOWN: case Common::KEYCODE_KP2: |