HUGO: Change _UP to __UP to avoid definition conflict on some backends.

8 files changed, 29 insertions, 29 deletions

diff --git a/devtools/create_hugo/enums.h b/devtools/create_hugo/enums.h
index f721c3d4f5..667d7ebce1 100644
--- a/devtools/create_hugo/enums.h
+++ b/devtools/create_hugo/enums.h
@@ -1501,7 +1501,7 @@ enum objid_3d {
 };
 
 // Enumerate sequence index matching direction of travel
-enum {RIGHT, LEFT, DOWN, _UP};
+enum {RIGHT, LEFT, DOWN, __UP};
 
 enum sound_t_1w {
 //Hugo 1 Win
diff --git a/devtools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h
index 612e044982..0ead2109d0 100644
--- a/devtools/create_hugo/staticdata.h
+++ b/devtools/create_hugo/staticdata.h
@@ -6171,8 +6171,8 @@ act16 adogseq2_1w    = {INIT_OBJ_SEQ, 4 * NORMAL_TPS_v2d,  DOG_1w,   2};
 act16 adog5_1w       = {INIT_OBJ_SEQ, 0,                   DOG_1w,   0};
 act16 at78c_1w       = {INIT_OBJ_SEQ, NORMAL_TPS_v2d + 12, TRAP_1w,  0};
 act16 arock3_1w      = {INIT_OBJ_SEQ, 0,                   HERO,     RIGHT};
-act16 arock5_1w      = {INIT_OBJ_SEQ, 11,                  HERO,     _UP};
-act16 arock10_1w     = {INIT_OBJ_SEQ, 40,                  HERO,     _UP};
+act16 arock5_1w      = {INIT_OBJ_SEQ, 11,                  HERO,     __UP};
+act16 arock10_1w     = {INIT_OBJ_SEQ, 40,                  HERO,     __UP};
 act16 arock12_1w     = {INIT_OBJ_SEQ, 44,                  HERO,     DOWN};
 act16 acutrope_1w    = {INIT_OBJ_SEQ, 0,                   ROPE_1w,  1};
 act16 abin1_1w       = {INIT_OBJ_SEQ, 0,                   BOAT_1w,  1};
@@ -7192,9 +7192,9 @@ act16 abd11_2w       = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 abd2_2w        = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 abd21_2w       = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 aclosedoor1_2w = {INIT_OBJ_SEQ, DOORDELAY,     DOOR1_2w,    0};
-act16 adone10_2w     = {INIT_OBJ_SEQ, 10,            HERO,        _UP};
+act16 adone10_2w     = {INIT_OBJ_SEQ, 10,            HERO,        __UP};
 act16 adone6_2w      = {INIT_OBJ_SEQ, 0,             HORACE_2w,   LEFT};
-act16 adone9_2w      = {INIT_OBJ_SEQ, 10,            HORACE_2w,   _UP};
+act16 adone9_2w      = {INIT_OBJ_SEQ, 10,            HORACE_2w,   __UP};
 act16 adumb13_2w     = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 adumb3_2w      = {INIT_OBJ_SEQ, 0,             HERO,        RIGHT};
 act16 afuze1_2w      = {INIT_OBJ_SEQ, 0,             DYNAMITE_2w, 1};
@@ -7202,10 +7202,10 @@ act16 agiveb5_2w     = {INIT_OBJ_SEQ, 2,             CAT_2w,      1};
 act16 ahall1_3_2w    = {INIT_OBJ_SEQ, 0,             HERO,        RIGHT};
 act16 ahall2_2a_2w   = {INIT_OBJ_SEQ, 0,             HERO,        LEFT};
 act16 ahall3_1a_2w   = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
-act16 ahdrink4_2w    = {INIT_OBJ_SEQ, 3,             HESTER_2w,   _UP};
+act16 ahdrink4_2w    = {INIT_OBJ_SEQ, 3,             HESTER_2w,   __UP};
 act16 ahdrink5_2w    = {INIT_OBJ_SEQ, 70,            HESTER_2w,   DOWN};
 act16 ahest3_2w      = {INIT_OBJ_SEQ, 0,             HESTER_2w,   RIGHT};
-act16 ahest5_2w      = {INIT_OBJ_SEQ, 22,            HESTER_2w,   _UP};
+act16 ahest5_2w      = {INIT_OBJ_SEQ, 22,            HESTER_2w,   __UP};
 act16 ahest7_2w      = {INIT_OBJ_SEQ, 24,            HESTER_2w,   LEFT};
 act16 ahest9_2w      = {INIT_OBJ_SEQ, 45,            HESTER_2w,   DOWN};
 act16 ainshed2_2w    = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
@@ -7236,11 +7236,11 @@ act16 amaidc4_2w     = {INIT_OBJ_SEQ, 8,             MAID_2w,     RIGHT};
 act16 amaidc7_2w     = {INIT_OBJ_SEQ, 16,            MAID_2w,     LEFT};
 act16 amaidp6_2w     = {INIT_OBJ_SEQ, 10,            MAID_2w,     DOWN};
 act16 apenbseq1_2w   = {INIT_OBJ_SEQ, 0,             PENNY_2w,    RIGHT};
-act16 apenbseq2_2w   = {INIT_OBJ_SEQ, 25,            PENNY_2w,    _UP};
+act16 apenbseq2_2w   = {INIT_OBJ_SEQ, 25,            PENNY_2w,    __UP};
 act16 apenseq1_2w    = {INIT_OBJ_SEQ, 0,             PENNY_2w,    RIGHT};
 act16 apenseq2_2w    = {INIT_OBJ_SEQ, PENDELAY + 7,  PENNY_2w,    DOWN};
 act16 apenseq3_2w    = {INIT_OBJ_SEQ, PENDELAY + 10, PENNY_2w,    LEFT};
-act16 apenseq4_2w    = {INIT_OBJ_SEQ, PENDELAY + 17, PENNY_2w,    _UP};
+act16 apenseq4_2w    = {INIT_OBJ_SEQ, PENDELAY + 17, PENNY_2w,    __UP};
 act16 apenseq5_2w    = {INIT_OBJ_SEQ, PENDELAY + 42, PENNY_2w,    RIGHT};
 act16 apenseq6_2w    = {INIT_OBJ_SEQ, PENDELAY + 74, PENNY_2w,    2};
 
@@ -8254,12 +8254,12 @@ act16 acamp7b_3w    = {INIT_OBJ_SEQ, 40,           NATG_3w,     2};
 act16 acrash10_3w   = {INIT_OBJ_SEQ, 8,            HERO,        LEFT};
 act16 acrash15_3w   = {INIT_OBJ_SEQ, 21,           PENNY_3w,    DOWN};
 act16 acrash16_3w   = {INIT_OBJ_SEQ, 22,           PENNY_3w,    LEFT};
-act16 acrash18_3w   = {INIT_OBJ_SEQ, 40,           HERO,        _UP};
+act16 acrash18_3w   = {INIT_OBJ_SEQ, 40,           HERO,        __UP};
 act16 acrash2_3w    = {INIT_OBJ_SEQ, 1,            PENNY_3w,    DOWN};
 act16 acrash3_3w    = {INIT_OBJ_SEQ, 1,            HERO,        DOWN};
 act16 acrash8_3w    = {INIT_OBJ_SEQ, 4,            PENNY_3w,    RIGHT};
 act16 adart6_3w     = {INIT_OBJ_SEQ, DARTTIME - 1, E_EYES_3w,   1};
-act16 adoc1_3w      = {INIT_OBJ_SEQ, 0,            HERO,        _UP};
+act16 adoc1_3w      = {INIT_OBJ_SEQ, 0,            HERO,        __UP};
 act16 aeleblink1_3w = {INIT_OBJ_SEQ, 41,           E_EYES_3w,   1};
 act16 aeleblink2_3w = {INIT_OBJ_SEQ, 42,           E_EYES_3w,   0};
 act16 aeleblink3_3w = {INIT_OBJ_SEQ, 43,           E_EYES_3w,   1};
@@ -10145,9 +10145,9 @@ act16 abd2_2d        = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 abd21_2d       = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 aclosedoor1_2d = {INIT_OBJ_SEQ, DOORDELAY,     DOOR1_2d,    0};
 act16 adalek2_2d     = {INIT_OBJ_SEQ, 0,             DALEK_2d,    2};
-act16 adone10_2d     = {INIT_OBJ_SEQ, 10,            HERO,        _UP};
+act16 adone10_2d     = {INIT_OBJ_SEQ, 10,            HERO,        __UP};
 act16 adone6_2d      = {INIT_OBJ_SEQ, 0,             HORACE_2d,   LEFT};
-act16 adone9_2d      = {INIT_OBJ_SEQ, 10,            HORACE_2d,   _UP};
+act16 adone9_2d      = {INIT_OBJ_SEQ, 10,            HORACE_2d,   __UP};
 act16 adumb13_2d     = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
 act16 adumb3_2d      = {INIT_OBJ_SEQ, 0,             HERO,        RIGHT};
 act16 afuze1_2d      = {INIT_OBJ_SEQ, 0,             DYNAMITE_2d, 1};
@@ -10155,10 +10155,10 @@ act16 agiveb5_2d     = {INIT_OBJ_SEQ, 2,             CAT_2d,      1};
 act16 ahall1_3_2d    = {INIT_OBJ_SEQ, 0,             HERO,        RIGHT};
 act16 ahall2_2a_2d   = {INIT_OBJ_SEQ, 0,             HERO,        LEFT};
 act16 ahall3_1a_2d   = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
-act16 ahdrink4_2d    = {INIT_OBJ_SEQ, 3,             HESTER_2d,   _UP};
+act16 ahdrink4_2d    = {INIT_OBJ_SEQ, 3,             HESTER_2d,   __UP};
 act16 ahdrink5_2d    = {INIT_OBJ_SEQ, 50,            HESTER_2d,   DOWN};
 act16 ahest3_2d      = {INIT_OBJ_SEQ, 0,             HESTER_2d,   RIGHT};
-act16 ahest5_2d      = {INIT_OBJ_SEQ, 22,            HESTER_2d,   _UP};
+act16 ahest5_2d      = {INIT_OBJ_SEQ, 22,            HESTER_2d,   __UP};
 act16 ahest7_2d      = {INIT_OBJ_SEQ, 24,            HESTER_2d,   LEFT};
 act16 ahest9_2d      = {INIT_OBJ_SEQ, 45,            HESTER_2d,   DOWN};
 act16 ainshed2_2d    = {INIT_OBJ_SEQ, 0,             HERO,        DOWN};
@@ -10188,11 +10188,11 @@ act16 amaidc4_2d     = {INIT_OBJ_SEQ, 8,             MAID_2d,     RIGHT};
 act16 amaidc7_2d     = {INIT_OBJ_SEQ, 16,            MAID_2d,     LEFT};
 act16 amaidp6_2d     = {INIT_OBJ_SEQ, 10,            MAID_2d,     DOWN};
 act16 apenbseq1_2d   = {INIT_OBJ_SEQ, 0,             PENNY_2d,    RIGHT};
-act16 apenbseq2_2d   = {INIT_OBJ_SEQ, 25,            PENNY_2d,    _UP};
+act16 apenbseq2_2d   = {INIT_OBJ_SEQ, 25,            PENNY_2d,    __UP};
 act16 apenseq1_2d    = {INIT_OBJ_SEQ, 0,             PENNY_2d,    RIGHT};
 act16 apenseq2_2d    = {INIT_OBJ_SEQ, PENDELAY + 7,  PENNY_2d,    DOWN};
 act16 apenseq3_2d    = {INIT_OBJ_SEQ, PENDELAY + 10, PENNY_2d,    LEFT};
-act16 apenseq4_2d    = {INIT_OBJ_SEQ, PENDELAY + 17, PENNY_2d,    _UP};
+act16 apenseq4_2d    = {INIT_OBJ_SEQ, PENDELAY + 17, PENNY_2d,    __UP};
 act16 apenseq5_2d    = {INIT_OBJ_SEQ, PENDELAY + 42, PENNY_2d,    RIGHT};
 act16 apenseq6_2d    = {INIT_OBJ_SEQ, PENDELAY + 74, PENNY_2d,    2};
 
@@ -11155,12 +11155,12 @@ act16 acamp7b_3d =    {INIT_OBJ_SEQ, 40,           NATG_3d,     2};
 act16 acrash10_3d =   {INIT_OBJ_SEQ, 8,            HERO,        LEFT};
 act16 acrash15_3d =   {INIT_OBJ_SEQ, 21,           PENNY_3d,    DOWN};
 act16 acrash16_3d =   {INIT_OBJ_SEQ, 22,           PENNY_3d,    LEFT};
-act16 acrash18_3d =   {INIT_OBJ_SEQ, 40,           HERO,        _UP};
+act16 acrash18_3d =   {INIT_OBJ_SEQ, 40,           HERO,        __UP};
 act16 acrash2_3d =    {INIT_OBJ_SEQ, 1,            PENNY_3d,    DOWN};
 act16 acrash3_3d =    {INIT_OBJ_SEQ, 1,            HERO,        DOWN};
 act16 acrash8_3d =    {INIT_OBJ_SEQ, 4,            PENNY_3d,    RIGHT};
 act16 adart6_3d =     {INIT_OBJ_SEQ, DARTTIME - 1, E_EYES_3d,   1};
-act16 adoc1_3d =      {INIT_OBJ_SEQ, 0,            HERO,        _UP};
+act16 adoc1_3d =      {INIT_OBJ_SEQ, 0,            HERO,        __UP};
 act16 aeleblink1_3d = {INIT_OBJ_SEQ, 41,           E_EYES_3d,   1};
 act16 aeleblink2_3d = {INIT_OBJ_SEQ, 42,           E_EYES_3d,   0};
 act16 aeleblink3_3d = {INIT_OBJ_SEQ, 43,           E_EYES_3d,   1};
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: