aboutsummaryrefslogtreecommitdiff
path: root/devtools/create_hugo/staticdata.h
diff options
context:
space:
mode:
authorMatt Lewandowsky2011-10-31 02:02:59 -0700
committerAlyssa Milburn2011-10-31 12:11:11 +0100
commita9d6c87ea64fa3a7e25f46c3478b56559c53d8b7 (patch)
treeafbf6d919526793e0b610e9ba57ae21b4b23f276 /devtools/create_hugo/staticdata.h
parent53160df757f06f2fa5492815fb44b708d0761d3f (diff)
downloadscummvm-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 'devtools/create_hugo/staticdata.h')
-rw-r--r--devtools/create_hugo/staticdata.h36
1 files changed, 18 insertions, 18 deletions
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};