aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorOliver Kiehl2003-04-29 22:29:26 +0000
committerOliver Kiehl2003-04-29 22:29:26 +0000
commitb2f510aa751bda76e0bb5124f374a63706fd839c (patch)
treefde0b8a0d3fc58e64ada900e2afd885f5c1fda73 /sky
parent27bacb86cc7a0d7fcbb6eec606c249a263a7650d (diff)
downloadscummvm-rg350-b2f510aa751bda76e0bb5124f374a63706fd839c.tar.gz
scummvm-rg350-b2f510aa751bda76e0bb5124f374a63706fd839c.tar.bz2
scummvm-rg350-b2f510aa751bda76e0bb5124f374a63706fd839c.zip
small restructure (I hope the last one, but at least it pushes us up in the
list of SF's most active projects ;) ) svn-id: r7206
Diffstat (limited to 'sky')
-rw-r--r--sky/compacts/0compact.h8
-rw-r--r--sky/compacts/13comp.h4
-rw-r--r--sky/compacts/14comp.h4
-rw-r--r--sky/compacts/27comp.h4
-rw-r--r--sky/compacts/2compact.h16
-rw-r--r--sky/compacts/36comp.h4
-rw-r--r--sky/compacts/38comp.h12
-rw-r--r--sky/compacts/3compact.h4
-rw-r--r--sky/compacts/71comp.h4
-rw-r--r--sky/compacts/72comp.h4
-rw-r--r--sky/compacts/73comp.h4
-rw-r--r--sky/compacts/76comp.h4
-rw-r--r--sky/compacts/z_compac.h36
13 files changed, 54 insertions, 54 deletions
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h
index f8f50dba7a..8bf60f68a7 100644
--- a/sky/compacts/0compact.h
+++ b/sky/compacts/0compact.h
@@ -4066,7 +4066,7 @@ uint16 m_ss_r_to_l[] = {
0,
};
-uint16 *mini_so_turnTable0[5][5] = {
+TurnTable mini_so_turnTable0 = {
{ // turnTableUp
0,
m_ss_u_to_d,
@@ -4118,7 +4118,7 @@ MegaSet mini_so_megaSet0 = {
m_ss_st_left, // standLeft
m_ss_st_right, // standRight
m_ss_st_talk, // standTalk
- mini_so_turnTable0,
+ &mini_so_turnTable0,
};
ExtCompact mini_so_ext = {
@@ -4590,7 +4590,7 @@ uint16 f_ss_r_to_l[] = {
0,
};
-uint16 *full_so_turnTable0[5][5] = {
+TurnTable full_so_turnTable0 = {
{ // turnTableUp
0,
f_ss_u_to_d,
@@ -4642,7 +4642,7 @@ MegaSet full_so_megaSet0 = {
f_ss_st_left, // standLeft
f_ss_st_right, // standRight
0, // standTalk
- full_so_turnTable0,
+ &full_so_turnTable0,
};
ExtCompact full_so_ext = {
diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h
index 9886d9ae35..e5a2b5a97c 100644
--- a/sky/compacts/13comp.h
+++ b/sky/compacts/13comp.h
@@ -2367,7 +2367,7 @@ uint16 foreman_r_to_d[] = {
0,
};
-uint16 *foreman_turnTable0[5][5] = {
+TurnTable foreman_turnTable0 = {
{ // turnTableUp
0,
foreman_u_to_d,
@@ -2419,7 +2419,7 @@ MegaSet foreman_megaSet0 = {
foreman_st_left, // standLeft
foreman_st_right, // standRight
foreman_st_talk, // standTalk
- foreman_turnTable0,
+ &foreman_turnTable0,
};
ExtCompact foreman_ext = {
diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h
index 6072c7d5be..5da3123b6b 100644
--- a/sky/compacts/14comp.h
+++ b/sky/compacts/14comp.h
@@ -337,7 +337,7 @@ uint16 radman_r_to_l[] = {
0,
};
-uint16 *radman_turnTable0[5][5] = {
+TurnTable radman_turnTable0 = {
{ // turnTableUp
0,
radman_u_to_d,
@@ -389,7 +389,7 @@ MegaSet radman_megaSet0 = {
radman_st_left, // standLeft
radman_st_right, // standRight
radman_st_talk, // standTalk
- radman_turnTable0,
+ &radman_turnTable0,
};
ExtCompact radman_ext = {
diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h
index 0bc4cbf42b..f5308a0ba0 100644
--- a/sky/compacts/27comp.h
+++ b/sky/compacts/27comp.h
@@ -2039,7 +2039,7 @@ uint16 burke_d_to_r[] = {
0,
};
-uint16 *burke_turnTable0[5][5] = {
+TurnTable burke_turnTable0 = {
{ // turnTableUp
0,
burke_u_to_d,
@@ -2091,7 +2091,7 @@ MegaSet burke_megaSet0 = {
burke_st_left, // standLeft
burke_st_right, // standRight
burke_st_talk, // standTalk
- burke_turnTable0,
+ &burke_turnTable0,
};
ExtCompact burke_ext = {
diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h
index f8ca7d7bc5..aab2bd036e 100644
--- a/sky/compacts/2compact.h
+++ b/sky/compacts/2compact.h
@@ -1259,7 +1259,7 @@ uint16 sml_loaderb_l_to_d[] = {
0,
};
-uint16 *loader_turnTable0[5][5] = {
+TurnTable loader_turnTable0 = {
{ // turnTableUp
0,
loader_u_to_d,
@@ -1297,7 +1297,7 @@ uint16 *loader_turnTable0[5][5] = {
},
};
-uint16 *loader_turnTable1[5][5] = {
+TurnTable loader_turnTable1 = {
{ // turnTableUp
0,
loaderb_u_to_d,
@@ -1335,7 +1335,7 @@ uint16 *loader_turnTable1[5][5] = {
},
};
-uint16 *loader_turnTable2[5][5] = {
+TurnTable loader_turnTable2 = {
{ // turnTableUp
0,
sml_loader_u_to_d,
@@ -1373,7 +1373,7 @@ uint16 *loader_turnTable2[5][5] = {
},
};
-uint16 *loader_turnTable3[5][5] = {
+TurnTable loader_turnTable3 = {
{ // turnTableUp
0,
sml_loaderb_u_to_d,
@@ -1425,7 +1425,7 @@ MegaSet loader_megaSet0 = {
loader_st_left, // standLeft
loader_st_right, // standRight
0, // standTalk
- loader_turnTable0,
+ &loader_turnTable0,
};
MegaSet loader_megaSet1 = {
@@ -1442,7 +1442,7 @@ MegaSet loader_megaSet1 = {
loaderb_st_left, // standLeft
loaderb_st_right, // standRight
0, // standTalk
- loader_turnTable1,
+ &loader_turnTable1,
};
MegaSet loader_megaSet2 = {
@@ -1459,7 +1459,7 @@ MegaSet loader_megaSet2 = {
sml_loader_st_left, // standLeft
sml_loader_st_right, // standRight
0, // standTalk
- loader_turnTable2,
+ &loader_turnTable2,
};
MegaSet loader_megaSet3 = {
@@ -1476,7 +1476,7 @@ MegaSet loader_megaSet3 = {
sml_loaderb_st_left, // standLeft
sml_loaderb_st_right, // standRight
0, // standTalk
- loader_turnTable3,
+ &loader_turnTable3,
};
ExtCompact loader_ext = {
diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h
index 9d6210fb9d..eafa6d24bd 100644
--- a/sky/compacts/36comp.h
+++ b/sky/compacts/36comp.h
@@ -1274,7 +1274,7 @@ uint16 babs_t_to_r[] = {
0,
};
-uint16 *sc36_babs_turnTable0[5][5] = {
+TurnTable sc36_babs_turnTable0 = {
{ // turnTableUp
0,
babs_u_to_d,
@@ -1326,7 +1326,7 @@ MegaSet sc36_babs_megaSet0 = {
babs_st_left, // standLeft
babs_st_right, // standRight
babs_st_talk, // standTalk
- sc36_babs_turnTable0,
+ &sc36_babs_turnTable0,
};
ExtCompact sc36_babs_ext = {
diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h
index 1fd7dc8851..f1515999b3 100644
--- a/sky/compacts/38comp.h
+++ b/sky/compacts/38comp.h
@@ -3172,7 +3172,7 @@ uint16 sex_u_to_l[] = {
0,
};
-uint16 *danielle_turnTable0[5][5] = {
+TurnTable danielle_turnTable0 = {
{ // turnTableUp
0,
dan_u_to_d,
@@ -3210,7 +3210,7 @@ uint16 *danielle_turnTable0[5][5] = {
},
};
-uint16 *danielle_turnTable1[5][5] = {
+TurnTable danielle_turnTable1 = {
{ // turnTableUp
0,
sex_u_to_d,
@@ -3262,7 +3262,7 @@ MegaSet danielle_megaSet0 = {
dan_st_left, // standLeft
dan_st_right, // standRight
dan_st_talk, // standTalk
- danielle_turnTable0,
+ &danielle_turnTable0,
};
MegaSet danielle_megaSet1 = {
@@ -3279,7 +3279,7 @@ MegaSet danielle_megaSet1 = {
sex_st_left, // standLeft
sex_st_right, // standRight
sex_st_talk, // standTalk
- danielle_turnTable1,
+ &danielle_turnTable1,
};
ExtCompact danielle_ext = {
@@ -3393,7 +3393,7 @@ uint16 spu_st_up[] = {
0,
};
-uint16 *spunky_turnTable0[5][5] = {
+TurnTable spunky_turnTable0 = {
{ // turnTableUp
0,
spu_u_to_d,
@@ -3445,7 +3445,7 @@ MegaSet spunky_megaSet0 = {
spu_st_left, // standLeft
spu_st_right, // standRight
spu_st_talk, // standTalk
- spunky_turnTable0,
+ &spunky_turnTable0,
};
ExtCompact spunky_ext = {
diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h
index cd45d0b17a..2b30becd9f 100644
--- a/sky/compacts/3compact.h
+++ b/sky/compacts/3compact.h
@@ -1189,7 +1189,7 @@ uint16 shades_r_to_l[] = {
0,
};
-uint16 *shades_turnTable0[5][5] = {
+TurnTable shades_turnTable0 = {
{ // turnTableUp
0,
shades_u_to_d,
@@ -1241,7 +1241,7 @@ MegaSet shades_megaSet0 = {
shades_st_left, // standLeft
shades_st_right, // standRight
shades_st_talk, // standTalk
- shades_turnTable0,
+ &shades_turnTable0,
};
ExtCompact shades_ext = {
diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h
index c618ae343f..cec3fabad5 100644
--- a/sky/compacts/71comp.h
+++ b/sky/compacts/71comp.h
@@ -394,7 +394,7 @@ uint16 medi_r_to_l[] = {
0,
};
-uint16 *medi_turnTable0[5][5] = {
+TurnTable medi_turnTable0 = {
{ // turnTableUp
0,
medi_u_to_d,
@@ -446,7 +446,7 @@ MegaSet medi_megaSet0 = {
medi_st_left, // standLeft
medi_st_right, // standRight
0, // standTalk
- medi_turnTable0,
+ &medi_turnTable0,
};
ExtCompact medi_ext = {
diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h
index 6b8165c870..b724f8ef10 100644
--- a/sky/compacts/72comp.h
+++ b/sky/compacts/72comp.h
@@ -2107,7 +2107,7 @@ uint16 wit_t_to_l[] = {
0,
};
-uint16 *witness_turnTable0[5][5] = {
+TurnTable witness_turnTable0 = {
{ // turnTableUp
0,
wit_u_to_d,
@@ -2159,7 +2159,7 @@ MegaSet witness_megaSet0 = {
wit_st_left, // standLeft
wit_st_right, // standRight
wit_st_talk, // standTalk
- witness_turnTable0,
+ &witness_turnTable0,
};
ExtCompact witness_ext = {
diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h
index 150f97671f..7482fcc520 100644
--- a/sky/compacts/73comp.h
+++ b/sky/compacts/73comp.h
@@ -406,7 +406,7 @@ uint16 gal_r_to_l[] = {
0,
};
-uint16 *gallagher_turnTable0[5][5] = {
+TurnTable gallagher_turnTable0 = {
{ // turnTableUp
0,
gal_u_to_d,
@@ -458,7 +458,7 @@ MegaSet gallagher_megaSet0 = {
gal_st_left, // standLeft
gal_st_right, // standRight
0, // standTalk
- gallagher_turnTable0,
+ &gallagher_turnTable0,
};
ExtCompact gallagher_ext = {
diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h
index 45b89eb489..d9d85e031d 100644
--- a/sky/compacts/76comp.h
+++ b/sky/compacts/76comp.h
@@ -471,7 +471,7 @@ uint16 ken_r_to_l[] = {
0,
};
-uint16 *ken_turnTable0[5][5] = {
+TurnTable ken_turnTable0 = {
{ // turnTableUp
0,
ken_u_to_d,
@@ -523,7 +523,7 @@ MegaSet ken_megaSet0 = {
ken_st_left, // standLeft
ken_st_right, // standRight
0, // standTalk
- ken_turnTable0,
+ &ken_turnTable0,
};
ExtCompact ken_ext = {
diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h
index 6c9ec877bf..61cb5e60af 100644
--- a/sky/compacts/z_compac.h
+++ b/sky/compacts/z_compac.h
@@ -1039,7 +1039,7 @@ uint16 lamb_r_to_l[] = {
0,
};
-uint16 *lamb_turnTable0[5][5] = {
+TurnTable lamb_turnTable0 = {
{ // turnTableUp
0,
lamb_u_to_d,
@@ -1091,7 +1091,7 @@ MegaSet lamb_megaSet0 = {
lamb_st_left, // standLeft
lamb_st_right, // standRight
lamb_st_talk, // standTalk
- lamb_turnTable0,
+ &lamb_turnTable0,
};
ExtCompact lamb_ext = {
@@ -3063,7 +3063,7 @@ uint16 sjoey_r_to_l[] = {
0,
};
-uint16 *joey_turnTable0[5][5] = {
+TurnTable joey_turnTable0 = {
{ // turnTableUp
0,
ljoey_u_to_d,
@@ -3101,7 +3101,7 @@ uint16 *joey_turnTable0[5][5] = {
},
};
-uint16 *joey_turnTable1[5][5] = {
+TurnTable joey_turnTable1 = {
{ // turnTableUp
0,
wjoey_u_to_d,
@@ -3139,7 +3139,7 @@ uint16 *joey_turnTable1[5][5] = {
},
};
-uint16 *joey_turnTable2[5][5] = {
+TurnTable joey_turnTable2 = {
{ // turnTableUp
0,
sjoey_u_to_d,
@@ -3191,7 +3191,7 @@ MegaSet joey_megaSet0 = {
ljoey_st_left, // standLeft
ljoey_st_right, // standRight
0, // standTalk
- joey_turnTable0,
+ &joey_turnTable0,
};
MegaSet joey_megaSet1 = {
@@ -3208,7 +3208,7 @@ MegaSet joey_megaSet1 = {
wjoey_st_left, // standLeft
wjoey_st_right, // standRight
0, // standTalk
- joey_turnTable1,
+ &joey_turnTable1,
};
MegaSet joey_megaSet2 = {
@@ -3225,7 +3225,7 @@ MegaSet joey_megaSet2 = {
sjoey_st_left, // standLeft
sjoey_st_right, // standRight
0, // standTalk
- joey_turnTable2,
+ &joey_turnTable2,
};
ExtCompact joey_ext = {
@@ -4350,7 +4350,7 @@ uint16 bfoster_l_to_r[] = {
0,
};
-uint16 *foster_turnTable0[5][5] = {
+TurnTable foster_turnTable0 = {
{ // turnTableUp
0,
mfoster_u_to_d,
@@ -4388,7 +4388,7 @@ uint16 *foster_turnTable0[5][5] = {
},
};
-uint16 *foster_turnTable1[5][5] = {
+TurnTable foster_turnTable1 = {
{ // turnTableUp
0,
foster_u_to_d,
@@ -4426,7 +4426,7 @@ uint16 *foster_turnTable1[5][5] = {
},
};
-uint16 *foster_turnTable2[5][5] = {
+TurnTable foster_turnTable2 = {
{ // turnTableUp
0,
fradman_u_to_d,
@@ -4464,7 +4464,7 @@ uint16 *foster_turnTable2[5][5] = {
},
};
-uint16 *foster_turnTable3[5][5] = {
+TurnTable foster_turnTable3 = {
{ // turnTableUp
0,
bfoster_u_to_d,
@@ -4516,7 +4516,7 @@ MegaSet foster_megaSet0 = {
mfoster_st_left, // standLeft
mfoster_st_right, // standRight
0, // standTalk
- foster_turnTable0,
+ &foster_turnTable0,
};
MegaSet foster_megaSet1 = {
@@ -4533,7 +4533,7 @@ MegaSet foster_megaSet1 = {
foster_st_left, // standLeft
foster_st_right, // standRight
foster_st_talk, // standTalk
- foster_turnTable1,
+ &foster_turnTable1,
};
MegaSet foster_megaSet2 = {
@@ -4550,7 +4550,7 @@ MegaSet foster_megaSet2 = {
fradman_st_left, // standLeft
fradman_st_right, // standRight
fradman_st_talk, // standTalk
- foster_turnTable2,
+ &foster_turnTable2,
};
MegaSet foster_megaSet3 = {
@@ -4567,7 +4567,7 @@ MegaSet foster_megaSet3 = {
bfoster_st_left, // standLeft
bfoster_st_right, // standRight
0, // standTalk
- foster_turnTable3,
+ &foster_turnTable3,
};
ExtCompact foster_ext = {
@@ -5142,7 +5142,7 @@ uint16 monitor_r_to_l[] = {
0,
};
-uint16 *monitor_turnTable0[5][5] = {
+TurnTable monitor_turnTable0 = {
{ // turnTableUp
0,
monitor_u_to_d,
@@ -5194,7 +5194,7 @@ MegaSet monitor_megaSet0 = {
monitor_st_left, // standLeft
monitor_st_right, // standRight
monitor_st_talk, // standTalk
- monitor_turnTable0,
+ &monitor_turnTable0,
};
ExtCompact monitor_ext = {