diff options
Diffstat (limited to 'engines/pegasus/neighborhood/mars')
18 files changed, 671 insertions, 671 deletions
diff --git a/engines/pegasus/neighborhood/mars/constants.h b/engines/pegasus/neighborhood/mars/constants.h index c96a8a1522..103518664c 100755 --- a/engines/pegasus/neighborhood/mars/constants.h +++ b/engines/pegasus/neighborhood/mars/constants.h @@ -32,99 +32,99 @@ namespace Pegasus { // Element Coordinates -const tCoordType kUndoHiliteLeft = kNavAreaLeft + 140; -const tCoordType kUndoHiliteTop = kNavAreaTop + 36; +const CoordType kUndoHiliteLeft = kNavAreaLeft + 140; +const CoordType kUndoHiliteTop = kNavAreaTop + 36; -const tCoordType kCurrentGuessLeft = kNavAreaLeft + 146; -const tCoordType kCurrentGuessTop = kNavAreaTop + 90; +const CoordType kCurrentGuessLeft = kNavAreaLeft + 146; +const CoordType kCurrentGuessTop = kNavAreaTop + 90; -const tCoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116; -const tCoordType kReactorChoiceHiliteTop = kNavAreaTop + 158; +const CoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116; +const CoordType kReactorChoiceHiliteTop = kNavAreaTop + 158; -const tCoordType kReactorHistoryLeft = kNavAreaLeft + 302; -const tCoordType kReactorHistoryTop = kNavAreaTop + 39; +const CoordType kReactorHistoryLeft = kNavAreaLeft + 302; +const CoordType kReactorHistoryTop = kNavAreaTop + 39; -const tCoordType kAnswerLeft = kNavAreaLeft + 304; -const tCoordType kAnswerTop = kNavAreaTop + 180; +const CoordType kAnswerLeft = kNavAreaLeft + 304; +const CoordType kAnswerTop = kNavAreaTop + 180; -const tCoordType kShuttle1Left = 0; -const tCoordType kShuttle1Top = 0; +const CoordType kShuttle1Left = 0; +const CoordType kShuttle1Top = 0; -const tCoordType kShuttle2Left = 0; -const tCoordType kShuttle2Top = 96; +const CoordType kShuttle2Left = 0; +const CoordType kShuttle2Top = 96; -const tCoordType kShuttle3Left = 500; -const tCoordType kShuttle3Top = 96; +const CoordType kShuttle3Left = 500; +const CoordType kShuttle3Top = 96; -const tCoordType kShuttle4Left = 0; -const tCoordType kShuttle4Top = 320; +const CoordType kShuttle4Left = 0; +const CoordType kShuttle4Top = 320; -const tCoordType kShuttleWindowLeft = 140; -const tCoordType kShuttleWindowTop = 96; -const tCoordType kShuttleWindowWidth = 360; -const tCoordType kShuttleWindowHeight = 224; +const CoordType kShuttleWindowLeft = 140; +const CoordType kShuttleWindowTop = 96; +const CoordType kShuttleWindowWidth = 360; +const CoordType kShuttleWindowHeight = 224; -const tCoordType kShuttleWindowMidH = (kShuttleWindowLeft * 2 + kShuttleWindowWidth) / 2; -const tCoordType kShuttleWindowMidV = (kShuttleWindowTop * 2 + kShuttleWindowHeight) / 2; +const CoordType kShuttleWindowMidH = (kShuttleWindowLeft * 2 + kShuttleWindowWidth) / 2; +const CoordType kShuttleWindowMidV = (kShuttleWindowTop * 2 + kShuttleWindowHeight) / 2; -const tCoordType kShuttleLeftLeft = 0; -const tCoordType kShuttleLeftTop = 128; +const CoordType kShuttleLeftLeft = 0; +const CoordType kShuttleLeftTop = 128; -const tCoordType kShuttleRightLeft = 506; -const tCoordType kShuttleRightTop = 128; +const CoordType kShuttleRightLeft = 506; +const CoordType kShuttleRightTop = 128; -const tCoordType kShuttleLowerLeftLeft = 74; -const tCoordType kShuttleLowerLeftTop = 358; +const CoordType kShuttleLowerLeftLeft = 74; +const CoordType kShuttleLowerLeftTop = 358; -const tCoordType kShuttleLowerRightLeft = 486; -const tCoordType kShuttleLowerRightTop = 354; +const CoordType kShuttleLowerRightLeft = 486; +const CoordType kShuttleLowerRightTop = 354; -const tCoordType kShuttleCenterLeft = 260; -const tCoordType kShuttleCenterTop = 336; +const CoordType kShuttleCenterLeft = 260; +const CoordType kShuttleCenterTop = 336; -const tCoordType kShuttleUpperLeftLeft = 30; -const tCoordType kShuttleUpperLeftTop = 32; +const CoordType kShuttleUpperLeftLeft = 30; +const CoordType kShuttleUpperLeftTop = 32; -const tCoordType kShuttleUpperRightLeft = 506; -const tCoordType kShuttleUpperRightTop = 52; +const CoordType kShuttleUpperRightLeft = 506; +const CoordType kShuttleUpperRightTop = 52; -const tCoordType kShuttleLeftEnergyLeft = 110; -const tCoordType kShuttleLeftEnergyTop = 186; +const CoordType kShuttleLeftEnergyLeft = 110; +const CoordType kShuttleLeftEnergyTop = 186; -const tCoordType kShuttleRightEnergyLeft = 510; -const tCoordType kShuttleRightEnergyTop = 186; +const CoordType kShuttleRightEnergyLeft = 510; +const CoordType kShuttleRightEnergyTop = 186; -const tCoordType kShuttleEnergyLeft = 186; -const tCoordType kShuttleEnergyTop = 60; -const tCoordType kShuttleEnergyWidth = 252; -const tCoordType kShuttleEnergyHeight = 22; +const CoordType kShuttleEnergyLeft = 186; +const CoordType kShuttleEnergyTop = 60; +const CoordType kShuttleEnergyWidth = 252; +const CoordType kShuttleEnergyHeight = 22; -const tCoordType kPlanetStartLeft = kShuttleWindowLeft; -const tCoordType kPlanetStartTop = kShuttleWindowTop + kShuttleWindowHeight; +const CoordType kPlanetStartLeft = kShuttleWindowLeft; +const CoordType kPlanetStartTop = kShuttleWindowTop + kShuttleWindowHeight; -const tCoordType kPlanetStopLeft = kShuttleWindowLeft; -const tCoordType kPlanetStopTop = kShuttleWindowTop + kShuttleWindowHeight - 100; +const CoordType kPlanetStopLeft = kShuttleWindowLeft; +const CoordType kPlanetStopTop = kShuttleWindowTop + kShuttleWindowHeight - 100; -const tCoordType kShuttleTractorLeft = kShuttleWindowLeft + 6; -const tCoordType kShuttleTractorTop = kShuttleWindowTop + 56; -const tCoordType kShuttleTractorWidth = 348; -const tCoordType kShuttleTractorHeight = 112; +const CoordType kShuttleTractorLeft = kShuttleWindowLeft + 6; +const CoordType kShuttleTractorTop = kShuttleWindowTop + 56; +const CoordType kShuttleTractorWidth = 348; +const CoordType kShuttleTractorHeight = 112; -const tCoordType kShuttleJunkLeft = kShuttleWindowLeft + 6; -const tCoordType kShuttleJunkTop = kShuttleWindowTop + 6; +const CoordType kShuttleJunkLeft = kShuttleWindowLeft + 6; +const CoordType kShuttleJunkTop = kShuttleWindowTop + 6; -const tDisplayOrder kShuttlePlanetOrder = kInterfaceLayer; -const tDisplayOrder kShuttleAlienShipOrder = kShuttlePlanetOrder + 1; -const tDisplayOrder kShuttleRobotShipOrder = kShuttleAlienShipOrder + 1; -const tDisplayOrder kShuttleTractorBeamMovieOrder = kShuttleRobotShipOrder + 1; -const tDisplayOrder kShuttleWeaponBackOrder = kShuttleTractorBeamMovieOrder + 1; -const tDisplayOrder kShuttleJunkOrder = kShuttleWeaponBackOrder + 1; -const tDisplayOrder kShuttleWeaponFrontOrder = kShuttleJunkOrder + 1; -const tDisplayOrder kShuttleTractorBeamOrder = kShuttleWeaponFrontOrder + 1; -const tDisplayOrder kShuttleHUDOrder = kShuttleTractorBeamOrder + 1; -const tDisplayOrder kShuttleBackgroundOrder = kShuttleHUDOrder + 1; -const tDisplayOrder kShuttleMonitorOrder = kShuttleBackgroundOrder + 1; -const tDisplayOrder kShuttleStatusOrder = kShuttleMonitorOrder + 1; +const DisplayOrder kShuttlePlanetOrder = kInterfaceLayer; +const DisplayOrder kShuttleAlienShipOrder = kShuttlePlanetOrder + 1; +const DisplayOrder kShuttleRobotShipOrder = kShuttleAlienShipOrder + 1; +const DisplayOrder kShuttleTractorBeamMovieOrder = kShuttleRobotShipOrder + 1; +const DisplayOrder kShuttleWeaponBackOrder = kShuttleTractorBeamMovieOrder + 1; +const DisplayOrder kShuttleJunkOrder = kShuttleWeaponBackOrder + 1; +const DisplayOrder kShuttleWeaponFrontOrder = kShuttleJunkOrder + 1; +const DisplayOrder kShuttleTractorBeamOrder = kShuttleWeaponFrontOrder + 1; +const DisplayOrder kShuttleHUDOrder = kShuttleTractorBeamOrder + 1; +const DisplayOrder kShuttleBackgroundOrder = kShuttleHUDOrder + 1; +const DisplayOrder kShuttleMonitorOrder = kShuttleBackgroundOrder + 1; +const DisplayOrder kShuttleStatusOrder = kShuttleMonitorOrder + 1; const TimeValue kShuttleSwingStart = 0; const TimeValue kShuttleSwingStop = 5 * 600; @@ -471,465 +471,465 @@ const TimeScale kMarsFrameDuration = 40; // Alternate IDs. -const tAlternateID kAltMarsNormal = 0; -const tAlternateID kAltMarsPodAtMars34 = 1; -const tAlternateID kAltMarsTookCard = 2; -const tAlternateID kAltMars35AirlockEast = 3; -const tAlternateID kAltMars35AirlockWest = 4; -const tAlternateID kAltMarsPodAtMars45 = 5; -const tAlternateID kAltMarsTookMask = 6; -const tAlternateID kAltMarsMaskOnFiller = 7; -const tAlternateID kAltMars60AirlockEast = 8; -const tAlternateID kAltMars60AirlockWest = 9; +const AlternateID kAltMarsNormal = 0; +const AlternateID kAltMarsPodAtMars34 = 1; +const AlternateID kAltMarsTookCard = 2; +const AlternateID kAltMars35AirlockEast = 3; +const AlternateID kAltMars35AirlockWest = 4; +const AlternateID kAltMarsPodAtMars45 = 5; +const AlternateID kAltMarsTookMask = 6; +const AlternateID kAltMarsMaskOnFiller = 7; +const AlternateID kAltMars60AirlockEast = 8; +const AlternateID kAltMars60AirlockWest = 9; // Room IDs. -const tRoomID kMars0A = 0; -const tRoomID kMars00 = 1; -const tRoomID kMars01 = 2; -const tRoomID kMars02 = 3; -const tRoomID kMars03 = 4; -const tRoomID kMars04 = 5; -const tRoomID kMars05 = 6; -const tRoomID kMars06 = 7; -const tRoomID kMars07 = 8; -const tRoomID kMars08 = 9; -const tRoomID kMars09 = 10; -const tRoomID kMars10 = 11; -const tRoomID kMars11 = 12; -const tRoomID kMars12 = 13; -const tRoomID kMars13 = 14; -const tRoomID kMars14 = 15; -const tRoomID kMars15 = 16; -const tRoomID kMars16 = 17; -const tRoomID kMars17 = 18; -const tRoomID kMars18 = 19; -const tRoomID kMars19 = 20; -const tRoomID kMars20 = 21; -const tRoomID kMars21 = 22; -const tRoomID kMars22 = 23; -const tRoomID kMars23 = 24; -const tRoomID kMars24 = 25; -const tRoomID kMars25 = 26; -const tRoomID kMars26 = 27; -const tRoomID kMars27 = 28; -const tRoomID kMars28 = 29; -const tRoomID kMars29 = 30; -const tRoomID kMars30 = 31; -const tRoomID kMars31 = 32; -const tRoomID kMars31South = 33; -const tRoomID kMars32 = 34; -const tRoomID kMars33 = 35; -const tRoomID kMars33North = 36; -const tRoomID kMars34 = 37; -const tRoomID kMars35 = 38; -const tRoomID kMars36 = 39; -const tRoomID kMars37 = 40; -const tRoomID kMars38 = 41; -const tRoomID kMars39 = 42; -const tRoomID kMars41 = 43; -const tRoomID kMars42 = 44; -const tRoomID kMars43 = 45; -const tRoomID kMars44 = 46; -const tRoomID kMars45 = 47; -const tRoomID kMars46 = 48; -const tRoomID kMars47 = 49; -const tRoomID kMars48 = 50; -const tRoomID kMars49 = 51; -const tRoomID kMars50 = 52; -const tRoomID kMars51 = 53; -const tRoomID kMars52 = 54; -const tRoomID kMars54 = 55; -const tRoomID kMars56 = 56; -const tRoomID kMars58 = 57; -const tRoomID kMars60 = 58; -const tRoomID kMarsRobotShuttle = 59; -const tRoomID kMarsMaze004 = 60; -const tRoomID kMarsMaze005 = 61; -const tRoomID kMarsMaze006 = 62; -const tRoomID kMarsMaze007 = 63; -const tRoomID kMarsMaze008 = 64; -const tRoomID kMarsMaze009 = 65; -const tRoomID kMarsMaze010 = 66; -const tRoomID kMarsMaze011 = 67; -const tRoomID kMarsMaze012 = 68; -const tRoomID kMarsMaze015 = 69; -const tRoomID kMarsMaze016 = 70; -const tRoomID kMarsMaze017 = 71; -const tRoomID kMarsMaze018 = 72; -const tRoomID kMarsMaze019 = 73; -const tRoomID kMarsMaze020 = 74; -const tRoomID kMarsMaze021 = 75; -const tRoomID kMarsMaze022 = 76; -const tRoomID kMarsMaze023 = 77; -const tRoomID kMarsMaze024 = 78; -const tRoomID kMarsMaze025 = 79; -const tRoomID kMarsMaze026 = 80; -const tRoomID kMarsMaze027 = 81; -const tRoomID kMarsMaze028 = 82; -const tRoomID kMarsMaze031 = 83; -const tRoomID kMarsMaze032 = 84; -const tRoomID kMarsMaze033 = 85; -const tRoomID kMarsMaze034 = 86; -const tRoomID kMarsMaze035 = 87; -const tRoomID kMarsMaze036 = 88; -const tRoomID kMarsMaze037 = 89; -const tRoomID kMarsMaze038 = 90; -const tRoomID kMarsMaze039 = 91; -const tRoomID kMarsMaze042 = 92; -const tRoomID kMarsMaze043 = 93; -const tRoomID kMarsMaze044 = 94; -const tRoomID kMarsMaze045 = 95; -const tRoomID kMarsMaze046 = 96; -const tRoomID kMarsMaze047 = 97; -const tRoomID kMarsMaze049 = 98; -const tRoomID kMarsMaze050 = 99; -const tRoomID kMarsMaze051 = 100; -const tRoomID kMarsMaze052 = 101; -const tRoomID kMarsMaze053 = 102; -const tRoomID kMarsMaze054 = 103; -const tRoomID kMarsMaze055 = 104; -const tRoomID kMarsMaze056 = 105; -const tRoomID kMarsMaze057 = 106; -const tRoomID kMarsMaze058 = 107; -const tRoomID kMarsMaze059 = 108; -const tRoomID kMarsMaze060 = 109; -const tRoomID kMarsMaze061 = 110; -const tRoomID kMarsMaze063 = 111; -const tRoomID kMarsMaze064 = 112; -const tRoomID kMarsMaze065 = 113; -const tRoomID kMarsMaze066 = 114; -const tRoomID kMarsMaze067 = 115; -const tRoomID kMarsMaze068 = 116; -const tRoomID kMarsMaze069 = 117; -const tRoomID kMarsMaze070 = 118; -const tRoomID kMarsMaze071 = 119; -const tRoomID kMarsMaze072 = 120; -const tRoomID kMarsMaze074 = 121; -const tRoomID kMarsMaze076 = 122; -const tRoomID kMarsMaze078 = 123; -const tRoomID kMarsMaze079 = 124; -const tRoomID kMarsMaze081 = 125; -const tRoomID kMarsMaze083 = 126; -const tRoomID kMarsMaze084 = 127; -const tRoomID kMarsMaze085 = 128; -const tRoomID kMarsMaze086 = 129; -const tRoomID kMarsMaze087 = 130; -const tRoomID kMarsMaze088 = 131; -const tRoomID kMarsMaze089 = 132; -const tRoomID kMarsMaze090 = 133; -const tRoomID kMarsMaze091 = 134; -const tRoomID kMarsMaze092 = 135; -const tRoomID kMarsMaze093 = 136; -const tRoomID kMarsMaze098 = 137; -const tRoomID kMarsMaze099 = 138; -const tRoomID kMarsMaze100 = 139; -const tRoomID kMarsMaze101 = 140; -const tRoomID kMarsMaze104 = 141; -const tRoomID kMarsMaze105 = 142; -const tRoomID kMarsMaze106 = 143; -const tRoomID kMarsMaze107 = 144; -const tRoomID kMarsMaze108 = 145; -const tRoomID kMarsMaze111 = 146; -const tRoomID kMarsMaze113 = 147; -const tRoomID kMarsMaze114 = 148; -const tRoomID kMarsMaze115 = 149; -const tRoomID kMarsMaze116 = 150; -const tRoomID kMarsMaze117 = 151; -const tRoomID kMarsMaze118 = 152; -const tRoomID kMarsMaze119 = 153; -const tRoomID kMarsMaze120 = 154; -const tRoomID kMarsMaze121 = 155; -const tRoomID kMarsMaze122 = 156; -const tRoomID kMarsMaze123 = 157; -const tRoomID kMarsMaze124 = 158; -const tRoomID kMarsMaze125 = 159; -const tRoomID kMarsMaze126 = 160; -const tRoomID kMarsMaze127 = 161; -const tRoomID kMarsMaze128 = 162; -const tRoomID kMarsMaze129 = 163; -const tRoomID kMarsMaze130 = 164; -const tRoomID kMarsMaze131 = 165; -const tRoomID kMarsMaze132 = 166; -const tRoomID kMarsMaze133 = 167; -const tRoomID kMarsMaze136 = 168; -const tRoomID kMarsMaze137 = 169; -const tRoomID kMarsMaze138 = 170; -const tRoomID kMarsMaze139 = 171; -const tRoomID kMarsMaze140 = 172; -const tRoomID kMarsMaze141 = 173; -const tRoomID kMarsMaze142 = 174; -const tRoomID kMarsMaze143 = 175; -const tRoomID kMarsMaze144 = 176; -const tRoomID kMarsMaze145 = 177; -const tRoomID kMarsMaze146 = 178; -const tRoomID kMarsMaze147 = 179; -const tRoomID kMarsMaze148 = 180; -const tRoomID kMarsMaze149 = 181; -const tRoomID kMarsMaze152 = 182; -const tRoomID kMarsMaze153 = 183; -const tRoomID kMarsMaze154 = 184; -const tRoomID kMarsMaze155 = 185; -const tRoomID kMarsMaze156 = 186; -const tRoomID kMarsMaze157 = 187; -const tRoomID kMarsMaze159 = 188; -const tRoomID kMarsMaze160 = 189; -const tRoomID kMarsMaze161 = 190; -const tRoomID kMarsMaze162 = 191; -const tRoomID kMarsMaze163 = 192; -const tRoomID kMarsMaze164 = 193; -const tRoomID kMarsMaze165 = 194; -const tRoomID kMarsMaze166 = 195; -const tRoomID kMarsMaze167 = 196; -const tRoomID kMarsMaze168 = 197; -const tRoomID kMarsMaze169 = 198; -const tRoomID kMarsMaze170 = 199; -const tRoomID kMarsMaze171 = 200; -const tRoomID kMarsMaze172 = 201; -const tRoomID kMarsMaze173 = 202; -const tRoomID kMarsMaze174 = 203; -const tRoomID kMarsMaze175 = 204; -const tRoomID kMarsMaze177 = 205; -const tRoomID kMarsMaze178 = 206; -const tRoomID kMarsMaze179 = 207; -const tRoomID kMarsMaze180 = 208; -const tRoomID kMarsMaze181 = 209; -const tRoomID kMarsMaze182 = 210; -const tRoomID kMarsMaze183 = 211; -const tRoomID kMarsMaze184 = 212; -const tRoomID kMarsMaze187 = 213; -const tRoomID kMarsMaze188 = 214; -const tRoomID kMarsMaze189 = 215; -const tRoomID kMarsMaze190 = 216; -const tRoomID kMarsMaze191 = 217; -const tRoomID kMarsMaze192 = 218; -const tRoomID kMarsMaze193 = 219; -const tRoomID kMarsMaze194 = 220; -const tRoomID kMarsMaze195 = 221; -const tRoomID kMarsMaze198 = 222; -const tRoomID kMarsMaze199 = 223; -const tRoomID kMarsMaze200 = 224; -const tRoomID kMarsDeathRoom = 225; +const RoomID kMars0A = 0; +const RoomID kMars00 = 1; +const RoomID kMars01 = 2; +const RoomID kMars02 = 3; +const RoomID kMars03 = 4; +const RoomID kMars04 = 5; +const RoomID kMars05 = 6; +const RoomID kMars06 = 7; +const RoomID kMars07 = 8; +const RoomID kMars08 = 9; +const RoomID kMars09 = 10; +const RoomID kMars10 = 11; +const RoomID kMars11 = 12; +const RoomID kMars12 = 13; +const RoomID kMars13 = 14; +const RoomID kMars14 = 15; +const RoomID kMars15 = 16; +const RoomID kMars16 = 17; +const RoomID kMars17 = 18; +const RoomID kMars18 = 19; +const RoomID kMars19 = 20; +const RoomID kMars20 = 21; +const RoomID kMars21 = 22; +const RoomID kMars22 = 23; +const RoomID kMars23 = 24; +const RoomID kMars24 = 25; +const RoomID kMars25 = 26; +const RoomID kMars26 = 27; +const RoomID kMars27 = 28; +const RoomID kMars28 = 29; +const RoomID kMars29 = 30; +const RoomID kMars30 = 31; +const RoomID kMars31 = 32; +const RoomID kMars31South = 33; +const RoomID kMars32 = 34; +const RoomID kMars33 = 35; +const RoomID kMars33North = 36; +const RoomID kMars34 = 37; +const RoomID kMars35 = 38; +const RoomID kMars36 = 39; +const RoomID kMars37 = 40; +const RoomID kMars38 = 41; +const RoomID kMars39 = 42; +const RoomID kMars41 = 43; +const RoomID kMars42 = 44; +const RoomID kMars43 = 45; +const RoomID kMars44 = 46; +const RoomID kMars45 = 47; +const RoomID kMars46 = 48; +const RoomID kMars47 = 49; +const RoomID kMars48 = 50; +const RoomID kMars49 = 51; +const RoomID kMars50 = 52; +const RoomID kMars51 = 53; +const RoomID kMars52 = 54; +const RoomID kMars54 = 55; +const RoomID kMars56 = 56; +const RoomID kMars58 = 57; +const RoomID kMars60 = 58; +const RoomID kMarsRobotShuttle = 59; +const RoomID kMarsMaze004 = 60; +const RoomID kMarsMaze005 = 61; +const RoomID kMarsMaze006 = 62; +const RoomID kMarsMaze007 = 63; +const RoomID kMarsMaze008 = 64; +const RoomID kMarsMaze009 = 65; +const RoomID kMarsMaze010 = 66; +const RoomID kMarsMaze011 = 67; +const RoomID kMarsMaze012 = 68; +const RoomID kMarsMaze015 = 69; +const RoomID kMarsMaze016 = 70; +const RoomID kMarsMaze017 = 71; +const RoomID kMarsMaze018 = 72; +const RoomID kMarsMaze019 = 73; +const RoomID kMarsMaze020 = 74; +const RoomID kMarsMaze021 = 75; +const RoomID kMarsMaze022 = 76; +const RoomID kMarsMaze023 = 77; +const RoomID kMarsMaze024 = 78; +const RoomID kMarsMaze025 = 79; +const RoomID kMarsMaze026 = 80; +const RoomID kMarsMaze027 = 81; +const RoomID kMarsMaze028 = 82; +const RoomID kMarsMaze031 = 83; +const RoomID kMarsMaze032 = 84; +const RoomID kMarsMaze033 = 85; +const RoomID kMarsMaze034 = 86; +const RoomID kMarsMaze035 = 87; +const RoomID kMarsMaze036 = 88; +const RoomID kMarsMaze037 = 89; +const RoomID kMarsMaze038 = 90; +const RoomID kMarsMaze039 = 91; +const RoomID kMarsMaze042 = 92; +const RoomID kMarsMaze043 = 93; +const RoomID kMarsMaze044 = 94; +const RoomID kMarsMaze045 = 95; +const RoomID kMarsMaze046 = 96; +const RoomID kMarsMaze047 = 97; +const RoomID kMarsMaze049 = 98; +const RoomID kMarsMaze050 = 99; +const RoomID kMarsMaze051 = 100; +const RoomID kMarsMaze052 = 101; +const RoomID kMarsMaze053 = 102; +const RoomID kMarsMaze054 = 103; +const RoomID kMarsMaze055 = 104; +const RoomID kMarsMaze056 = 105; +const RoomID kMarsMaze057 = 106; +const RoomID kMarsMaze058 = 107; +const RoomID kMarsMaze059 = 108; +const RoomID kMarsMaze060 = 109; +const RoomID kMarsMaze061 = 110; +const RoomID kMarsMaze063 = 111; +const RoomID kMarsMaze064 = 112; +const RoomID kMarsMaze065 = 113; +const RoomID kMarsMaze066 = 114; +const RoomID kMarsMaze067 = 115; +const RoomID kMarsMaze068 = 116; +const RoomID kMarsMaze069 = 117; +const RoomID kMarsMaze070 = 118; +const RoomID kMarsMaze071 = 119; +const RoomID kMarsMaze072 = 120; +const RoomID kMarsMaze074 = 121; +const RoomID kMarsMaze076 = 122; +const RoomID kMarsMaze078 = 123; +const RoomID kMarsMaze079 = 124; +const RoomID kMarsMaze081 = 125; +const RoomID kMarsMaze083 = 126; +const RoomID kMarsMaze084 = 127; +const RoomID kMarsMaze085 = 128; +const RoomID kMarsMaze086 = 129; +const RoomID kMarsMaze087 = 130; +const RoomID kMarsMaze088 = 131; +const RoomID kMarsMaze089 = 132; +const RoomID kMarsMaze090 = 133; +const RoomID kMarsMaze091 = 134; +const RoomID kMarsMaze092 = 135; +const RoomID kMarsMaze093 = 136; +const RoomID kMarsMaze098 = 137; +const RoomID kMarsMaze099 = 138; +const RoomID kMarsMaze100 = 139; +const RoomID kMarsMaze101 = 140; +const RoomID kMarsMaze104 = 141; +const RoomID kMarsMaze105 = 142; +const RoomID kMarsMaze106 = 143; +const RoomID kMarsMaze107 = 144; +const RoomID kMarsMaze108 = 145; +const RoomID kMarsMaze111 = 146; +const RoomID kMarsMaze113 = 147; +const RoomID kMarsMaze114 = 148; +const RoomID kMarsMaze115 = 149; +const RoomID kMarsMaze116 = 150; +const RoomID kMarsMaze117 = 151; +const RoomID kMarsMaze118 = 152; +const RoomID kMarsMaze119 = 153; +const RoomID kMarsMaze120 = 154; +const RoomID kMarsMaze121 = 155; +const RoomID kMarsMaze122 = 156; +const RoomID kMarsMaze123 = 157; +const RoomID kMarsMaze124 = 158; +const RoomID kMarsMaze125 = 159; +const RoomID kMarsMaze126 = 160; +const RoomID kMarsMaze127 = 161; +const RoomID kMarsMaze128 = 162; +const RoomID kMarsMaze129 = 163; +const RoomID kMarsMaze130 = 164; +const RoomID kMarsMaze131 = 165; +const RoomID kMarsMaze132 = 166; +const RoomID kMarsMaze133 = 167; +const RoomID kMarsMaze136 = 168; +const RoomID kMarsMaze137 = 169; +const RoomID kMarsMaze138 = 170; +const RoomID kMarsMaze139 = 171; +const RoomID kMarsMaze140 = 172; +const RoomID kMarsMaze141 = 173; +const RoomID kMarsMaze142 = 174; +const RoomID kMarsMaze143 = 175; +const RoomID kMarsMaze144 = 176; +const RoomID kMarsMaze145 = 177; +const RoomID kMarsMaze146 = 178; +const RoomID kMarsMaze147 = 179; +const RoomID kMarsMaze148 = 180; +const RoomID kMarsMaze149 = 181; +const RoomID kMarsMaze152 = 182; +const RoomID kMarsMaze153 = 183; +const RoomID kMarsMaze154 = 184; +const RoomID kMarsMaze155 = 185; +const RoomID kMarsMaze156 = 186; +const RoomID kMarsMaze157 = 187; +const RoomID kMarsMaze159 = 188; +const RoomID kMarsMaze160 = 189; +const RoomID kMarsMaze161 = 190; +const RoomID kMarsMaze162 = 191; +const RoomID kMarsMaze163 = 192; +const RoomID kMarsMaze164 = 193; +const RoomID kMarsMaze165 = 194; +const RoomID kMarsMaze166 = 195; +const RoomID kMarsMaze167 = 196; +const RoomID kMarsMaze168 = 197; +const RoomID kMarsMaze169 = 198; +const RoomID kMarsMaze170 = 199; +const RoomID kMarsMaze171 = 200; +const RoomID kMarsMaze172 = 201; +const RoomID kMarsMaze173 = 202; +const RoomID kMarsMaze174 = 203; +const RoomID kMarsMaze175 = 204; +const RoomID kMarsMaze177 = 205; +const RoomID kMarsMaze178 = 206; +const RoomID kMarsMaze179 = 207; +const RoomID kMarsMaze180 = 208; +const RoomID kMarsMaze181 = 209; +const RoomID kMarsMaze182 = 210; +const RoomID kMarsMaze183 = 211; +const RoomID kMarsMaze184 = 212; +const RoomID kMarsMaze187 = 213; +const RoomID kMarsMaze188 = 214; +const RoomID kMarsMaze189 = 215; +const RoomID kMarsMaze190 = 216; +const RoomID kMarsMaze191 = 217; +const RoomID kMarsMaze192 = 218; +const RoomID kMarsMaze193 = 219; +const RoomID kMarsMaze194 = 220; +const RoomID kMarsMaze195 = 221; +const RoomID kMarsMaze198 = 222; +const RoomID kMarsMaze199 = 223; +const RoomID kMarsMaze200 = 224; +const RoomID kMarsDeathRoom = 225; // Hot Spot Activation IDs. -const tHotSpotActivationID kActivationReadyForKiosk = 1; -const tHotSpotActivationID kActivationKioskChoice = 2; -const tHotSpotActivationID kActivationTunnelMapReady = 3; -const tHotSpotActivationID kActivateMarsPodClosed = 4; -const tHotSpotActivationID kActivateMarsPodOpen = 5; -const tHotSpotActivationID kActivateReadyToPressurizeAirlock = 6; -const tHotSpotActivationID kActivateAirlockPressurized = 7; -const tHotSpotActivationID kActivateMaskOnHolder = 8; -const tHotSpotActivationID kActivateMaskOnFiller = 9; -const tHotSpotActivationID kActivateReactorPlatformOut = 10; -const tHotSpotActivationID kActivateReactorPlatformIn = 11; -const tHotSpotActivationID kActivateReactorAskLowerScreen = 12; -const tHotSpotActivationID kActivateReactorReadyForNitrogen = 13; -const tHotSpotActivationID kActivateReactorReadyForCrowBar = 14; -const tHotSpotActivationID kActivateReactorAskOperation = 15; -const tHotSpotActivationID kActivateReactorRanEvaluation = 16; -const tHotSpotActivationID kActivateReactorRanDiagnostics = 17; -const tHotSpotActivationID kActivateReactorAnalyzed = 18; -const tHotSpotActivationID kActivateReactorInstructions = 19; -const tHotSpotActivationID kActivateReactorInGame = 20; -const tHotSpotActivationID kActivateReactorBombSafe = 21; -const tHotSpotActivationID kActivateReactorBombExposed = 22; -const tHotSpotActivationID kActivationRobotHeadClosed = 23; -const tHotSpotActivationID kActivationRobotHeadOpen = 24; +const HotSpotActivationID kActivationReadyForKiosk = 1; +const HotSpotActivationID kActivationKioskChoice = 2; +const HotSpotActivationID kActivationTunnelMapReady = 3; +const HotSpotActivationID kActivateMarsPodClosed = 4; +const HotSpotActivationID kActivateMarsPodOpen = 5; +const HotSpotActivationID kActivateReadyToPressurizeAirlock = 6; +const HotSpotActivationID kActivateAirlockPressurized = 7; +const HotSpotActivationID kActivateMaskOnHolder = 8; +const HotSpotActivationID kActivateMaskOnFiller = 9; +const HotSpotActivationID kActivateReactorPlatformOut = 10; +const HotSpotActivationID kActivateReactorPlatformIn = 11; +const HotSpotActivationID kActivateReactorAskLowerScreen = 12; +const HotSpotActivationID kActivateReactorReadyForNitrogen = 13; +const HotSpotActivationID kActivateReactorReadyForCrowBar = 14; +const HotSpotActivationID kActivateReactorAskOperation = 15; +const HotSpotActivationID kActivateReactorRanEvaluation = 16; +const HotSpotActivationID kActivateReactorRanDiagnostics = 17; +const HotSpotActivationID kActivateReactorAnalyzed = 18; +const HotSpotActivationID kActivateReactorInstructions = 19; +const HotSpotActivationID kActivateReactorInGame = 20; +const HotSpotActivationID kActivateReactorBombSafe = 21; +const HotSpotActivationID kActivateReactorBombExposed = 22; +const HotSpotActivationID kActivationRobotHeadClosed = 23; +const HotSpotActivationID kActivationRobotHeadOpen = 24; // Hot Spot IDs. -const tHotSpotID kMars11NorthKioskSpotID = 5000; -const tHotSpotID kMars11NorthKioskSightsSpotID = 5001; -const tHotSpotID kMars11NorthKioskColonySpotID = 5002; -const tHotSpotID kMars12NorthKioskSpotID = 5003; -const tHotSpotID kMars12NorthKioskSightsSpotID = 5004; -const tHotSpotID kMars12NorthKioskColonySpotID = 5005; -const tHotSpotID kMars31SouthSpotID = 5006; -const tHotSpotID kMars31SouthOutSpotID = 5007; -const tHotSpotID kMars31SouthCardSpotID = 5008; -const tHotSpotID kMars33NorthSpotID = 5009; -const tHotSpotID kMars33NorthOutSpotID = 5010; -const tHotSpotID kMars33NorthMonitorSpotID = 5011; -const tHotSpotID kMars34NorthCardDropSpotID = 5012; -const tHotSpotID kMars34SouthOpenStorageSpotID = 5013; -const tHotSpotID kMars34SouthCloseStorageSpotID = 5014; -const tHotSpotID kMars34SouthCrowbarSpotID = 5015; -const tHotSpotID kMars35EastPressurizeSpotID = 5016; -const tHotSpotID kMars35EastSpinSpotID = 5017; -const tHotSpotID kMars35WestPressurizeSpotID = 5018; -const tHotSpotID kMars35WestSpinSpotID = 5019; -const tHotSpotID kMars45NorthOpenStorageSpotID = 5020; -const tHotSpotID kMars45NorthCloseStorageSpotID = 5021; -const tHotSpotID kMars45NorthCrowbarSpotID = 5022; -const tHotSpotID kAttackRobotHotSpotID = 5023; -const tHotSpotID kMars49AirMaskSpotID = 5024; -const tHotSpotID kMars49AirMaskFilledSpotID = 5025; -const tHotSpotID kMars49AirFillingDropSpotID = 5026; -const tHotSpotID kMars52MoveLeftSpotID = 5027; -const tHotSpotID kMars52MoveRightSpotID = 5028; -const tHotSpotID kMars52ExtractSpotID = 5029; -const tHotSpotID kMars53RetractSpotID = 5030; -const tHotSpotID kMars54MoveLeftSpotID = 5031; -const tHotSpotID kMars54MoveRightSpotID = 5032; -const tHotSpotID kMars54ExtractSpotID = 5033; -const tHotSpotID kMars55RetractSpotID = 5034; -const tHotSpotID kMars56MoveLeftSpotID = 5035; -const tHotSpotID kMars56MoveRightSpotID = 5036; -const tHotSpotID kMars56ExtractSpotID = 5037; -const tHotSpotID kMars57RetractSpotID = 5038; -const tHotSpotID kMars57LowerScreenSpotID = 5039; -const tHotSpotID kMars57Retract2SpotID = 5040; -const tHotSpotID kMars57DropNitrogenSpotID = 5041; -const tHotSpotID kMars57DropCrowBarSpotID = 5042; -const tHotSpotID kMars57CantOpenPanelSpotID = 5043; -const tHotSpotID kMars57ShieldEvaluationSpotID = 5044; -const tHotSpotID kMars57MeasureOutputSpotID = 5045; -const tHotSpotID kMars57RunDiagnosticsSpotID = 5046; -const tHotSpotID kMars57BackToOperationMenuSpotID = 5047; -const tHotSpotID kMars57AnalyzeObjectSpotID = 5048; -const tHotSpotID kMars57RemoveObjectMenuSpotID = 5049; -const tHotSpotID kMars57CircuitLinkSpotID = 5050; -const tHotSpotID kMars57CancelCircuitLinkSpotID = 5051; -const tHotSpotID kMars57GameInstructionsSpotID = 5052; -const tHotSpotID kMars57UndoMoveSpotID = 5053; -const tHotSpotID kMars57RedMoveSpotID = 5054; -const tHotSpotID kMars57YellowMoveSpotID = 5055; -const tHotSpotID kMars57GreenMoveSpotID = 5056; -const tHotSpotID kMars57BlueMoveSpotID = 5057; -const tHotSpotID kMars57PurpleMoveSpotID = 5058; -const tHotSpotID kMars57LowerScreenSafelySpotID = 5059; -const tHotSpotID kMars57GrabBombSpotID = 5060; -const tHotSpotID kMars58MoveLeftSpotID = 5061; -const tHotSpotID kMars58MoveRightSpotID = 5062; -const tHotSpotID kMars58ExtractSpotID = 5063; -const tHotSpotID kMars59RetractSpotID = 5064; -const tHotSpotID kMars60EastPressurizeSpotID = 5065; -const tHotSpotID kMars60EastSpinSpotID = 5066; -const tHotSpotID kMars60WestPressurizeSpotID = 5067; -const tHotSpotID kMars60WestSpinSpotID = 5068; -const tHotSpotID kRobotShuttleOpenHeadSpotID = 5069; -const tHotSpotID kRobotShuttleMapChipSpotID = 5070; -const tHotSpotID kRobotShuttleOpticalChipSpotID = 5071; -const tHotSpotID kRobotShuttleShieldChipSpotID = 5072; +const HotSpotID kMars11NorthKioskSpotID = 5000; +const HotSpotID kMars11NorthKioskSightsSpotID = 5001; +const HotSpotID kMars11NorthKioskColonySpotID = 5002; +const HotSpotID kMars12NorthKioskSpotID = 5003; +const HotSpotID kMars12NorthKioskSightsSpotID = 5004; +const HotSpotID kMars12NorthKioskColonySpotID = 5005; +const HotSpotID kMars31SouthSpotID = 5006; +const HotSpotID kMars31SouthOutSpotID = 5007; +const HotSpotID kMars31SouthCardSpotID = 5008; +const HotSpotID kMars33NorthSpotID = 5009; +const HotSpotID kMars33NorthOutSpotID = 5010; +const HotSpotID kMars33NorthMonitorSpotID = 5011; +const HotSpotID kMars34NorthCardDropSpotID = 5012; +const HotSpotID kMars34SouthOpenStorageSpotID = 5013; +const HotSpotID kMars34SouthCloseStorageSpotID = 5014; +const HotSpotID kMars34SouthCrowbarSpotID = 5015; +const HotSpotID kMars35EastPressurizeSpotID = 5016; +const HotSpotID kMars35EastSpinSpotID = 5017; +const HotSpotID kMars35WestPressurizeSpotID = 5018; +const HotSpotID kMars35WestSpinSpotID = 5019; +const HotSpotID kMars45NorthOpenStorageSpotID = 5020; +const HotSpotID kMars45NorthCloseStorageSpotID = 5021; +const HotSpotID kMars45NorthCrowbarSpotID = 5022; +const HotSpotID kAttackRobotHotSpotID = 5023; +const HotSpotID kMars49AirMaskSpotID = 5024; +const HotSpotID kMars49AirMaskFilledSpotID = 5025; +const HotSpotID kMars49AirFillingDropSpotID = 5026; +const HotSpotID kMars52MoveLeftSpotID = 5027; +const HotSpotID kMars52MoveRightSpotID = 5028; +const HotSpotID kMars52ExtractSpotID = 5029; +const HotSpotID kMars53RetractSpotID = 5030; +const HotSpotID kMars54MoveLeftSpotID = 5031; +const HotSpotID kMars54MoveRightSpotID = 5032; +const HotSpotID kMars54ExtractSpotID = 5033; +const HotSpotID kMars55RetractSpotID = 5034; +const HotSpotID kMars56MoveLeftSpotID = 5035; +const HotSpotID kMars56MoveRightSpotID = 5036; +const HotSpotID kMars56ExtractSpotID = 5037; +const HotSpotID kMars57RetractSpotID = 5038; +const HotSpotID kMars57LowerScreenSpotID = 5039; +const HotSpotID kMars57Retract2SpotID = 5040; +const HotSpotID kMars57DropNitrogenSpotID = 5041; +const HotSpotID kMars57DropCrowBarSpotID = 5042; +const HotSpotID kMars57CantOpenPanelSpotID = 5043; +const HotSpotID kMars57ShieldEvaluationSpotID = 5044; +const HotSpotID kMars57MeasureOutputSpotID = 5045; +const HotSpotID kMars57RunDiagnosticsSpotID = 5046; +const HotSpotID kMars57BackToOperationMenuSpotID = 5047; +const HotSpotID kMars57AnalyzeObjectSpotID = 5048; +const HotSpotID kMars57RemoveObjectMenuSpotID = 5049; +const HotSpotID kMars57CircuitLinkSpotID = 5050; +const HotSpotID kMars57CancelCircuitLinkSpotID = 5051; +const HotSpotID kMars57GameInstructionsSpotID = 5052; +const HotSpotID kMars57UndoMoveSpotID = 5053; +const HotSpotID kMars57RedMoveSpotID = 5054; +const HotSpotID kMars57YellowMoveSpotID = 5055; +const HotSpotID kMars57GreenMoveSpotID = 5056; +const HotSpotID kMars57BlueMoveSpotID = 5057; +const HotSpotID kMars57PurpleMoveSpotID = 5058; +const HotSpotID kMars57LowerScreenSafelySpotID = 5059; +const HotSpotID kMars57GrabBombSpotID = 5060; +const HotSpotID kMars58MoveLeftSpotID = 5061; +const HotSpotID kMars58MoveRightSpotID = 5062; +const HotSpotID kMars58ExtractSpotID = 5063; +const HotSpotID kMars59RetractSpotID = 5064; +const HotSpotID kMars60EastPressurizeSpotID = 5065; +const HotSpotID kMars60EastSpinSpotID = 5066; +const HotSpotID kMars60WestPressurizeSpotID = 5067; +const HotSpotID kMars60WestSpinSpotID = 5068; +const HotSpotID kRobotShuttleOpenHeadSpotID = 5069; +const HotSpotID kRobotShuttleMapChipSpotID = 5070; +const HotSpotID kRobotShuttleOpticalChipSpotID = 5071; +const HotSpotID kRobotShuttleShieldChipSpotID = 5072; // Extra sequence IDs. -const tExtraID kMarsArrivalFromTSA = 0; -const tExtraID kMars0AWatchShuttleDepart = 1; -const tExtraID kRobotThrowsPlayer = 2; -const tExtraID kMarsInfoKioskIntro = 3; -const tExtraID kMarsColonyInfo = 4; -const tExtraID kMarsSightsInfo = 5; -const tExtraID kRobotOnWayToShuttle = 6; -const tExtraID kMars31SouthZoomInNoCard = 7; -const tExtraID kMars31SouthViewNoCard = 8; -const tExtraID kMars31SouthZoomOutNoCard = 9; -const tExtraID kMars31SouthZoomViewNoCard = 10; -const tExtraID kMars33SlideShow1 = 11; -const tExtraID kMars33SlideShow2 = 12; -const tExtraID kMars33SlideShow3 = 13; -const tExtraID kMars33SlideShow4 = 14; -const tExtraID kMars34SpotOpenWithBar = 15; -const tExtraID kMars34SpotCloseWithBar = 16; -const tExtraID kMars34SpotOpenNoBar = 17; -const tExtraID kMars34SpotCloseNoBar = 18; -const tExtraID kMars34ViewOpenWithBar = 19; -const tExtraID kMars34ViewOpenNoBar = 20; -const tExtraID kMars34NorthPodGreeting = 21; -const tExtraID kMarsTurnOnPod = 22; -const tExtraID kMarsTakePodToMars45 = 23; -const tExtraID kMars35WestSpinAirlockToEast = 24; -const tExtraID kMars35EastSpinAirlockToWest = 25; -const tExtraID kMars45SpotOpenWithBar = 26; -const tExtraID kMars45SpotCloseWithBar = 27; -const tExtraID kMars45SpotOpenNoBar = 28; -const tExtraID kMars45SpotCloseNoBar = 29; -const tExtraID kMars45ViewOpenWithBar = 30; -const tExtraID kMars45ViewOpenNoBar = 31; -const tExtraID kMars48RobotApproaches = 32; -const tExtraID kMars48RobotKillsPlayer = 33; -const tExtraID kMars48RobotLoops = 34; -const tExtraID kMars48RobotView = 35; -const tExtraID kMars48RobotDefends = 36; -const tExtraID kMars49SouthViewMaskFilling = 37; -const tExtraID kMars52SpinLeft = 38; -const tExtraID kMars52SpinRight = 39; -const tExtraID kMars52Extend = 40; -const tExtraID kMars53Retract = 41; -const tExtraID kMars54SpinLeft = 42; -const tExtraID kMars54SpinRight = 43; -const tExtraID kMars54Extend = 44; -const tExtraID kMars55Retract = 45; -const tExtraID kMars56SpinLeft = 46; -const tExtraID kMars56SpinRight = 47; -const tExtraID kMars56ExtendWithBomb = 48; -const tExtraID kMars56ExtendNoBomb = 49; -const tExtraID kMars57RetractWithBomb = 50; -const tExtraID kMars57RetractNoBomb = 51; -const tExtraID kMars57LowerScreenClosed = 52; -const tExtraID kMars57CantOpenPanel = 53; -const tExtraID kMars57FreezeLock = 54; -const tExtraID kMars57BreakLock = 55; -const tExtraID kMars57LockFrozenView = 56; -const tExtraID kMars57ThawLock = 57; -const tExtraID kMars57OpenPanel = 58; -const tExtraID kMars57OpenPanelChoices = 59; -const tExtraID kMars57ShieldEvaluation = 60; -const tExtraID kMars57MeasureOutput = 61; -const tExtraID kMars57ShieldOkayLoop = 62; -const tExtraID kMars57RunDiagnostics = 63; -const tExtraID kMars57BombExplodes = 64; -const tExtraID kMars57BombAnalysis = 65; -const tExtraID kMars57DontLink = 66; -const tExtraID kMars57CircuitLink = 67; -const tExtraID kMars57GameLevel1 = 68; -const tExtraID kMars57GameLevel2 = 69; -const tExtraID kMars57GameLevel3 = 70; -const tExtraID kMars57BombExplodesInGame = 71; -const tExtraID kMars57GameSolved = 72; -const tExtraID kMars57ExposeBomb = 73; -const tExtraID kMars57BackToNormal = 74; -const tExtraID kMars57ViewOpenNoBomb = 75; -const tExtraID kMars58SpinLeft = 76; -const tExtraID kMars58SpinRight = 77; -const tExtraID kMars58Extend = 78; -const tExtraID kMars59Retract = 79; -const tExtraID kMars60WestSpinAirlockToEast = 80; -const tExtraID kMars60EastSpinAirlockToWest = 81; -const tExtraID kMarsRobotHeadOpen = 82; -const tExtraID kMarsRobotHeadClose = 83; -const tExtraID kMarsRobotHead000 = 84; -const tExtraID kMarsRobotHead001 = 85; -const tExtraID kMarsRobotHead010 = 86; -const tExtraID kMarsRobotHead011 = 87; -const tExtraID kMarsRobotHead100 = 88; -const tExtraID kMarsRobotHead101 = 89; -const tExtraID kMarsRobotHead110 = 90; -const tExtraID kMarsRobotHead111 = 91; -const tExtraID kMarsMaze007RobotApproach = 92; -const tExtraID kMarsMaze007RobotLoop = 93; -const tExtraID kMarsMaze007RobotDeath = 94; -const tExtraID kMarsMaze015SouthRobotApproach = 95; -const tExtraID kMarsMaze015SouthRobotLoop = 96; -const tExtraID kMarsMaze015SouthRobotDeath = 97; -const tExtraID kMarsMaze101EastRobotApproach = 98; -const tExtraID kMarsMaze101EastRobotLoop = 99; -const tExtraID kMarsMaze101EastRobotDeath = 100; -const tExtraID kMarsMaze104WestLoop = 101; -const tExtraID kMarsMaze104WestDeath = 102; -const tExtraID kMarsMaze133SouthApproach = 103; -const tExtraID kMarsMaze133SouthLoop = 104; -const tExtraID kMarsMaze133SouthDeath = 105; -const tExtraID kMarsMaze136NorthApproach = 106; -const tExtraID kMarsMaze136NorthLoop = 107; -const tExtraID kMarsMaze136NorthDeath = 108; -const tExtraID kMarsMaze184WestLoop = 109; -const tExtraID kMarsMaze184WestDeath = 110; -const tExtraID kMars200DeathInBucket = 111; - -const tResIDType kReactorUndoHilitePICTID = 900; +const ExtraID kMarsArrivalFromTSA = 0; +const ExtraID kMars0AWatchShuttleDepart = 1; +const ExtraID kRobotThrowsPlayer = 2; +const ExtraID kMarsInfoKioskIntro = 3; +const ExtraID kMarsColonyInfo = 4; +const ExtraID kMarsSightsInfo = 5; +const ExtraID kRobotOnWayToShuttle = 6; +const ExtraID kMars31SouthZoomInNoCard = 7; +const ExtraID kMars31SouthViewNoCard = 8; +const ExtraID kMars31SouthZoomOutNoCard = 9; +const ExtraID kMars31SouthZoomViewNoCard = 10; +const ExtraID kMars33SlideShow1 = 11; +const ExtraID kMars33SlideShow2 = 12; +const ExtraID kMars33SlideShow3 = 13; +const ExtraID kMars33SlideShow4 = 14; +const ExtraID kMars34SpotOpenWithBar = 15; +const ExtraID kMars34SpotCloseWithBar = 16; +const ExtraID kMars34SpotOpenNoBar = 17; +const ExtraID kMars34SpotCloseNoBar = 18; +const ExtraID kMars34ViewOpenWithBar = 19; +const ExtraID kMars34ViewOpenNoBar = 20; +const ExtraID kMars34NorthPodGreeting = 21; +const ExtraID kMarsTurnOnPod = 22; +const ExtraID kMarsTakePodToMars45 = 23; +const ExtraID kMars35WestSpinAirlockToEast = 24; +const ExtraID kMars35EastSpinAirlockToWest = 25; +const ExtraID kMars45SpotOpenWithBar = 26; +const ExtraID kMars45SpotCloseWithBar = 27; +const ExtraID kMars45SpotOpenNoBar = 28; +const ExtraID kMars45SpotCloseNoBar = 29; +const ExtraID kMars45ViewOpenWithBar = 30; +const ExtraID kMars45ViewOpenNoBar = 31; +const ExtraID kMars48RobotApproaches = 32; +const ExtraID kMars48RobotKillsPlayer = 33; +const ExtraID kMars48RobotLoops = 34; +const ExtraID kMars48RobotView = 35; +const ExtraID kMars48RobotDefends = 36; +const ExtraID kMars49SouthViewMaskFilling = 37; +const ExtraID kMars52SpinLeft = 38; +const ExtraID kMars52SpinRight = 39; +const ExtraID kMars52Extend = 40; +const ExtraID kMars53Retract = 41; +const ExtraID kMars54SpinLeft = 42; +const ExtraID kMars54SpinRight = 43; +const ExtraID kMars54Extend = 44; +const ExtraID kMars55Retract = 45; +const ExtraID kMars56SpinLeft = 46; +const ExtraID kMars56SpinRight = 47; +const ExtraID kMars56ExtendWithBomb = 48; +const ExtraID kMars56ExtendNoBomb = 49; +const ExtraID kMars57RetractWithBomb = 50; +const ExtraID kMars57RetractNoBomb = 51; +const ExtraID kMars57LowerScreenClosed = 52; +const ExtraID kMars57CantOpenPanel = 53; +const ExtraID kMars57FreezeLock = 54; +const ExtraID kMars57BreakLock = 55; +const ExtraID kMars57LockFrozenView = 56; +const ExtraID kMars57ThawLock = 57; +const ExtraID kMars57OpenPanel = 58; +const ExtraID kMars57OpenPanelChoices = 59; +const ExtraID kMars57ShieldEvaluation = 60; +const ExtraID kMars57MeasureOutput = 61; +const ExtraID kMars57ShieldOkayLoop = 62; +const ExtraID kMars57RunDiagnostics = 63; +const ExtraID kMars57BombExplodes = 64; +const ExtraID kMars57BombAnalysis = 65; +const ExtraID kMars57DontLink = 66; +const ExtraID kMars57CircuitLink = 67; +const ExtraID kMars57GameLevel1 = 68; +const ExtraID kMars57GameLevel2 = 69; +const ExtraID kMars57GameLevel3 = 70; +const ExtraID kMars57BombExplodesInGame = 71; +const ExtraID kMars57GameSolved = 72; +const ExtraID kMars57ExposeBomb = 73; +const ExtraID kMars57BackToNormal = 74; +const ExtraID kMars57ViewOpenNoBomb = 75; +const ExtraID kMars58SpinLeft = 76; +const ExtraID kMars58SpinRight = 77; +const ExtraID kMars58Extend = 78; +const ExtraID kMars59Retract = 79; +const ExtraID kMars60WestSpinAirlockToEast = 80; +const ExtraID kMars60EastSpinAirlockToWest = 81; +const ExtraID kMarsRobotHeadOpen = 82; +const ExtraID kMarsRobotHeadClose = 83; +const ExtraID kMarsRobotHead000 = 84; +const ExtraID kMarsRobotHead001 = 85; +const ExtraID kMarsRobotHead010 = 86; +const ExtraID kMarsRobotHead011 = 87; +const ExtraID kMarsRobotHead100 = 88; +const ExtraID kMarsRobotHead101 = 89; +const ExtraID kMarsRobotHead110 = 90; +const ExtraID kMarsRobotHead111 = 91; +const ExtraID kMarsMaze007RobotApproach = 92; +const ExtraID kMarsMaze007RobotLoop = 93; +const ExtraID kMarsMaze007RobotDeath = 94; +const ExtraID kMarsMaze015SouthRobotApproach = 95; +const ExtraID kMarsMaze015SouthRobotLoop = 96; +const ExtraID kMarsMaze015SouthRobotDeath = 97; +const ExtraID kMarsMaze101EastRobotApproach = 98; +const ExtraID kMarsMaze101EastRobotLoop = 99; +const ExtraID kMarsMaze101EastRobotDeath = 100; +const ExtraID kMarsMaze104WestLoop = 101; +const ExtraID kMarsMaze104WestDeath = 102; +const ExtraID kMarsMaze133SouthApproach = 103; +const ExtraID kMarsMaze133SouthLoop = 104; +const ExtraID kMarsMaze133SouthDeath = 105; +const ExtraID kMarsMaze136NorthApproach = 106; +const ExtraID kMarsMaze136NorthLoop = 107; +const ExtraID kMarsMaze136NorthDeath = 108; +const ExtraID kMarsMaze184WestLoop = 109; +const ExtraID kMarsMaze184WestDeath = 110; +const ExtraID kMars200DeathInBucket = 111; + +const ResIDType kReactorUndoHilitePICTID = 900; const int16 kMars52Compass = 90; const int16 kMars54Compass = 180; diff --git a/engines/pegasus/neighborhood/mars/energybeam.cpp b/engines/pegasus/neighborhood/mars/energybeam.cpp index 6a30c48dfb..85a1596b94 100755 --- a/engines/pegasus/neighborhood/mars/energybeam.cpp +++ b/engines/pegasus/neighborhood/mars/energybeam.cpp @@ -30,8 +30,8 @@ namespace Pegasus { const TimeValue kEnergyBeamTime = kOneSecond * kShuttleWeaponScale / 2; -const tCoordType kEnergyBeamOriginH = kShuttleWindowMidH; -const tCoordType kEnergyBeamOriginV = kShuttleWindowTop + kShuttleWindowHeight; +const CoordType kEnergyBeamOriginH = kShuttleWindowMidH; +const CoordType kEnergyBeamOriginV = kShuttleWindowTop + kShuttleWindowHeight; const float kBeamXOrigin = convertScreenHToSpaceX(kEnergyBeamOriginH, kEnergyBeamMinDistance); const float kBeamYOrigin = convertScreenVToSpaceY(kEnergyBeamOriginV, kEnergyBeamMinDistance); diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp index e56fddc51f..d383cc34ab 100755 --- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp +++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp @@ -31,16 +31,16 @@ namespace Pegasus { const TimeValue kGravitonTime = kOneSecond * kShuttleWeaponScale; -const tCoordType kGravitonOriginH = kShuttleWindowLeft - 1; -const tCoordType kGravitonOriginV = kShuttleWindowMidV; +const CoordType kGravitonOriginH = kShuttleWindowLeft - 1; +const CoordType kGravitonOriginV = kShuttleWindowMidV; const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, kGravitonMinDistance); const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance); const float kGravitonZOrigin = kGravitonMinDistance; // Width of graviton sprite... -const tCoordType kGravitonMaxScreenWidth = 78; -const tCoordType kGravitonMaxScreenHeight = 46; +const CoordType kGravitonMaxScreenWidth = 78; +const CoordType kGravitonMaxScreenHeight = 46; const float kGravitonWidth = convertScreenHToSpaceX(kShuttleWindowMidH + kGravitonMaxScreenWidth / 2, kGravitonMinDistance) - convertScreenHToSpaceX(kShuttleWindowMidH - kGravitonMaxScreenWidth / 2, kGravitonMinDistance); diff --git a/engines/pegasus/neighborhood/mars/hermite.cpp b/engines/pegasus/neighborhood/mars/hermite.cpp index 814e92ff53..dc4a2c5fc2 100755 --- a/engines/pegasus/neighborhood/mars/hermite.cpp +++ b/engines/pegasus/neighborhood/mars/hermite.cpp @@ -27,17 +27,17 @@ namespace Pegasus { -tCoordType hermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 time, int32 duration) { +CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) { float t = (float)time / duration; float tsq = t * t; float tcu = t * tsq; float tcu2 = tcu + tcu; float tsq2 = tsq + tsq; float tsq3 = tsq2 + tsq; - return (tCoordType)((tcu2 - tsq3 + 1) * p1 + (tsq3 - tcu2) * p4 + (tcu - tsq2 + t) * r1 + (tcu - tsq) * r4); + return (CoordType)((tcu2 - tsq3 + 1) * p1 + (tsq3 - tcu2) * p4 + (tcu - tsq2 + t) * r1 + (tcu - tsq) * r4); } -tCoordType dHermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 time, int32 duration) { +CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) { float t = (float)time / duration; float t2 = t + t; float t4 = t2 + t2; @@ -45,7 +45,7 @@ tCoordType dHermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, float tsq = t * t; float tsq3 = tsq + tsq + tsq; float tsq6 = tsq3 + tsq3; - return (tCoordType)((tsq6 - t6) * p1 + (t6 - tsq6) * p4 + (tsq3 - t4 + 1) * r1 + (tsq3 - t2) * r4); + return (CoordType)((tsq6 - t6) * p1 + (t6 - tsq6) * p4 + (tsq3 - t4 + 1) * r1 + (tsq3 - t2) * r4); } void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 time, int32 duration, Common::Point &result) { diff --git a/engines/pegasus/neighborhood/mars/hermite.h b/engines/pegasus/neighborhood/mars/hermite.h index de0122f84b..44cb3a5a11 100755 --- a/engines/pegasus/neighborhood/mars/hermite.h +++ b/engines/pegasus/neighborhood/mars/hermite.h @@ -31,8 +31,8 @@ namespace Pegasus { -tCoordType hermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 t, int32 duration); -tCoordType dHermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 t, int32 duration); +CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 t, int32 duration); +CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 t, int32 duration); void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 t, int32 duration, Common::Point &result); void dHermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 t, int32 duration, Common::Point &result); diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp index 3a9273e91e..93f99904d7 100755 --- a/engines/pegasus/neighborhood/mars/mars.cpp +++ b/engines/pegasus/neighborhood/mars/mars.cpp @@ -42,13 +42,13 @@ namespace Pegasus { // Probably no one will know the difference. const int16 kMarsShieldPanelOffsetAngle = 22; -const tCanMoveForwardReason kCantMoveRobotBlocking = kCantMoveLastReason + 1; +const CanMoveForwardReason kCantMoveRobotBlocking = kCantMoveLastReason + 1; -const tNotificationFlags kTimeForCanyonChaseFlag = kLastNeighborhoodNotificationFlag << 1; -const tNotificationFlags kExplosionFinishedFlag = kTimeForCanyonChaseFlag << 1; -const tNotificationFlags kTimeToTransportFlag = kExplosionFinishedFlag << 1; +const NotificationFlags kTimeForCanyonChaseFlag = kLastNeighborhoodNotificationFlag << 1; +const NotificationFlags kExplosionFinishedFlag = kTimeForCanyonChaseFlag << 1; +const NotificationFlags kTimeToTransportFlag = kExplosionFinishedFlag << 1; -const tNotificationFlags kMarsNotificationFlags = kTimeForCanyonChaseFlag | +const NotificationFlags kMarsNotificationFlags = kTimeForCanyonChaseFlag | kExplosionFinishedFlag | kTimeToTransportFlag; @@ -264,7 +264,7 @@ uint16 Mars::getDateResID() const { return kDate2185ID; } -TimeValue Mars::getViewTime(const tRoomID room, const tDirectionConstant direction) { +TimeValue Mars::getViewTime(const RoomID room, const DirectionConstant direction) { ExtraTable::Entry extra; SpotTable::Entry spotEntry; uint32 extraID = 0xffffffff; @@ -342,7 +342,7 @@ TimeValue Mars::getViewTime(const tRoomID room, const tDirectionConstant directi return extra.movieEnd - 1; } -void Mars::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) { +void Mars::getZoomEntry(const HotSpotID spotID, ZoomTable::Entry &entry) { Neighborhood::getZoomEntry(spotID, entry); uint32 extraID = 0xffffffff; @@ -366,7 +366,7 @@ void Mars::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) { } } -void Mars::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) { +void Mars::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) { Neighborhood::findSpotEntry(room, direction, flags, entry); if ((flags & (kSpotOnArrivalMask | kSpotOnTurnMask)) != 0) { @@ -387,8 +387,8 @@ void Mars::findSpotEntry(const tRoomID room, const tDirectionConstant direction, } } -tCanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) { - tCanMoveForwardReason reason = Neighborhood::canMoveForward(entry); +CanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) { + CanMoveForwardReason reason = Neighborhood::canMoveForward(entry); switch (GameState.getCurrentRoomAndView()) { case MakeRoomView(kMars48, kEast): @@ -404,7 +404,7 @@ tCanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) { return reason; } -void Mars::cantMoveThatWay(tCanMoveForwardReason reason) { +void Mars::cantMoveThatWay(CanMoveForwardReason reason) { if (reason == kCantMoveRobotBlocking) { startExtraSequence(kMars48RobotKillsPlayer, kExtraCompletedFlag, kFilterNoInput); loadLoopSound2(""); @@ -425,7 +425,7 @@ void Mars::bumpIntoWall() { Neighborhood::bumpIntoWall(); } -tCanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) { +CanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) { switch (GameState.getCurrentRoomAndView()) { case MakeRoomView(kMars05, kEast): case MakeRoomView(kMars06, kEast): @@ -468,7 +468,7 @@ tCanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) { return Neighborhood::canOpenDoor(entry); } -void Mars::cantOpenDoor(tCanOpenDoorReason reason) { +void Mars::cantOpenDoor(CanOpenDoorReason reason) { switch (GameState.getCurrentRoom()) { case kMars05: case kMars06: @@ -611,7 +611,7 @@ void Mars::setUpReactorEnergyDrain() { } } -void Mars::closeDoorOffScreen(const tRoomID room, const tDirectionConstant direction) { +void Mars::closeDoorOffScreen(const RoomID room, const DirectionConstant direction) { switch (room) { case kMars51: playSpotSoundSync(kMarsGantryDoorCloseIn, kMarsGantryDoorCloseOut); @@ -727,7 +727,7 @@ void Mars::checkAirlockDoors() { } } -int16 Mars::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) { +int16 Mars::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) { int16 angle = Neighborhood::getStaticCompassAngle(room, dir); switch (MakeRoomView(room, dir)) { @@ -895,7 +895,7 @@ void Mars::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec &co } void Mars::loadAmbientLoops() { - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); if ((room >= kMars0A && room <= kMars21) || (room >= kMars41 && room <= kMars43)) { if (GameState.getMarsSeenTimeStream()) @@ -1044,7 +1044,7 @@ void Mars::loadAmbientLoops() { } } -void Mars::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) { +void Mars::checkContinuePoint(const RoomID room, const DirectionConstant direction) { switch (MakeRoomView(room, direction)) { case MakeRoomView(kMars02, kSouth): case MakeRoomView(kMars19, kEast): @@ -1143,7 +1143,7 @@ void Mars::timerExpired(const uint32 eventType) { } } -void Mars::arriveAt(const tRoomID room, const tDirectionConstant direction) { +void Mars::arriveAt(const RoomID room, const DirectionConstant direction) { switch (MakeRoomView(room, direction)) { case MakeRoomView(kMars18, kNorth): if (GameState.getMarsPodAtUpperPlatform()) @@ -1462,7 +1462,7 @@ void Mars::shieldOff() { setUpReactorEnergyDrain(); } -void Mars::turnTo(const tDirectionConstant direction) { +void Mars::turnTo(const DirectionConstant direction) { switch (MakeRoomView(GameState.getCurrentRoom(), direction)) { case MakeRoomView(kMars27, kNorth): case MakeRoomView(kMars27, kSouth): @@ -1788,8 +1788,8 @@ void Mars::clickInHotspot(const Input &input, const Hotspot *clickedSpot) { } } -tInputBits Mars::getInputFilter() { - tInputBits result = Neighborhood::getInputFilter(); +InputBits Mars::getInputFilter() { + InputBits result = Neighborhood::getInputFilter(); switch (GameState.getCurrentRoomAndView()) { case MakeRoomView(kMars49, kSouth): @@ -1830,7 +1830,7 @@ tInputBits Mars::getInputFilter() { // the inventory is too full or because the player lets go of the item before // dropping it into the inventory). Hotspot *Mars::getItemScreenSpot(Item *item, DisplayElement *element) { - tHotSpotID destSpotID; + HotSpotID destSpotID; switch (item->getObjectID()) { case kCardBomb: @@ -2095,7 +2095,7 @@ void Mars::turnRight() { } } -void Mars::receiveNotification(Notification *notification, const tNotificationFlags flag) { +void Mars::receiveNotification(Notification *notification, const NotificationFlags flag) { InventoryItem *item; Neighborhood::receiveNotification(notification, flag); @@ -3062,7 +3062,7 @@ const int kRobotTooStrong = 1; const int kTractorTooWeak = 2; const int kCapturedRobotShip = 3; -void Mars::spaceChaseClick(const Input &input, const tHotSpotID id) { +void Mars::spaceChaseClick(const Input &input, const HotSpotID id) { Common::Point pt; switch (id) { @@ -3217,7 +3217,7 @@ void Mars::spaceChaseClick(const Input &input, const tHotSpotID id) { } } -void Mars::showBigExplosion(const Common::Rect &r, const tDisplayOrder order) { +void Mars::showBigExplosion(const Common::Rect &r, const DisplayOrder order) { if (_explosions.isMovieValid()) { _explosions.setDisplayOrder(order); @@ -3239,7 +3239,7 @@ void Mars::showBigExplosion(const Common::Rect &r, const tDisplayOrder order) { } } -void Mars::showLittleExplosion(const Common::Rect &r, const tDisplayOrder order) { +void Mars::showLittleExplosion(const Common::Rect &r, const DisplayOrder order) { if (_explosions.isMovieValid()) { _explosions.setDisplayOrder(order); @@ -3331,7 +3331,7 @@ void Mars::updateCursor(const Common::Point cursorLocation, const Hotspot *curso } } -tAirQuality Mars::getAirQuality(const tRoomID room) { +AirQuality Mars::getAirQuality(const RoomID room) { if ((room >= kMars36 && room <= kMars39) || (room >= kMarsMaze004 && room <= kMarsMaze200)) return kAirQualityVacuum; if (room == kMars35 && !GameState.getMarsAirlockOpen()) @@ -3553,7 +3553,7 @@ Common::String Mars::getEnvScanMovie() { Common::String movieName = Neighborhood::getEnvScanMovie(); if (movieName.empty()) { - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); if (room >= kMars0A && room <= kMars21) return "Images/AI/Mars/XME1"; @@ -3624,7 +3624,7 @@ uint Mars::getNumHints() { break; case MakeRoomView(kMars56, kEast): if (getCurrentActivation() == kActivateReactorReadyForNitrogen) { - if ((tExtraID)_lastExtra == kMars57LowerScreenClosed) + if ((ExtraID)_lastExtra == kMars57LowerScreenClosed) numHints = 3; } else if (getCurrentActivation() == kActivateReactorPlatformOut) { if (!GameState.getShieldOn()) { diff --git a/engines/pegasus/neighborhood/mars/mars.h b/engines/pegasus/neighborhood/mars/mars.h index 01474ab831..9aca10a703 100755 --- a/engines/pegasus/neighborhood/mars/mars.h +++ b/engines/pegasus/neighborhood/mars/mars.h @@ -77,12 +77,12 @@ public: virtual uint16 getDateResID() const; - virtual tAirQuality getAirQuality(const tRoomID); + virtual AirQuality getAirQuality(const RoomID); void checkAirMask(); - void showBigExplosion(const Common::Rect &, const tDisplayOrder); - void showLittleExplosion(const Common::Rect &, const tDisplayOrder); + void showBigExplosion(const Common::Rect &, const DisplayOrder); + void showLittleExplosion(const Common::Rect &, const DisplayOrder); void hitByJunk(); void decreaseRobotShuttleEnergy(const int, Common::Point impactPoint); void setUpNextDropTime(); @@ -95,7 +95,7 @@ public: virtual void shieldOn(); virtual void shieldOff(); - void checkContinuePoint(const tRoomID, const tDirectionConstant); + void checkContinuePoint(const RoomID, const DirectionConstant); void setSoundFXLevel(const uint16); @@ -123,25 +123,25 @@ protected: void init(); void start(); void setUpAIRules(); - void arriveAt(const tRoomID, const tDirectionConstant); + void arriveAt(const RoomID, const DirectionConstant); void takeItemFromRoom(Item *); void dropItemIntoRoom(Item *, Hotspot *); void activateHotspots(); void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *); void clickInHotspot(const Input &, const Hotspot *); - tInputBits getInputFilter(); + InputBits getInputFilter(); - TimeValue getViewTime(const tRoomID, const tDirectionConstant); - void getZoomEntry(const tHotSpotID, ZoomTable::Entry &); - void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &); - tCanOpenDoorReason canOpenDoor(DoorTable::Entry &); + TimeValue getViewTime(const RoomID, const DirectionConstant); + void getZoomEntry(const HotSpotID, ZoomTable::Entry &); + void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &); + CanOpenDoorReason canOpenDoor(DoorTable::Entry &); void openDoor(); - void closeDoorOffScreen(const tRoomID, const tDirectionConstant); - int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant); + void closeDoorOffScreen(const RoomID, const DirectionConstant); + int16 getStaticCompassAngle(const RoomID, const DirectionConstant); void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &); void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &); - void turnTo(const tDirectionConstant); - void receiveNotification(Notification *, const tNotificationFlags); + void turnTo(const DirectionConstant); + void receiveNotification(Notification *, const NotificationFlags); void doorOpened(); void setUpReactorEnergyDrain(); Hotspot *getItemScreenSpot(Item *, DisplayElement *); @@ -155,8 +155,8 @@ protected: void doReactorGuess(int32 guess); void bombExplodesInGame(); void didntFindBomb(); - tCanMoveForwardReason canMoveForward(ExitTable::Entry &); - void cantMoveThatWay(tCanMoveForwardReason); + CanMoveForwardReason canMoveForward(ExitTable::Entry &); + void cantMoveThatWay(CanMoveForwardReason); void moveForward(); void bumpIntoWall(); void turnLeft(); @@ -165,7 +165,7 @@ protected: void loadAmbientLoops(); void checkAirlockDoors(); void pickedUpItem(Item *item); - void cantOpenDoor(tCanOpenDoorReason); + void cantOpenDoor(CanOpenDoorReason); void launchMaze007Robot(); void launchMaze015Robot(); void launchMaze101Robot(); @@ -183,7 +183,7 @@ protected: void startUpFromFinishedSpaceChase(); void startUpFromSpaceChase(); void transportToRobotShip(); - void spaceChaseClick(const Input &, const tHotSpotID); + void spaceChaseClick(const Input &, const HotSpotID); void updateCursor(const Common::Point, const Hotspot *); Common::String getSoundSpotsName(); diff --git a/engines/pegasus/neighborhood/mars/planetmover.cpp b/engines/pegasus/neighborhood/mars/planetmover.cpp index 2b287547b5..7a43c188f7 100755 --- a/engines/pegasus/neighborhood/mars/planetmover.cpp +++ b/engines/pegasus/neighborhood/mars/planetmover.cpp @@ -36,7 +36,7 @@ const TimeScale kRovingScale = kTractorBeamScale; const TimeValue kRovingTime = kTenSeconds * kRovingScale; const TimeValue kRovingSlop = kTwoSeconds * kRovingScale; -const tCoordType kMaxVelocity = 20; +const CoordType kMaxVelocity = 20; PlanetMover::PlanetMover() { setScale(kRovingScale); @@ -59,8 +59,8 @@ void PlanetMover::stopMoving() { void PlanetMover::dropPlanetOutOfSight() { stop(); - tCoordType currentLoc = hermite(_p1, _p4, _r1, _r4, _lastTime, _duration); - tCoordType currentV = dHermite(_p1, _p4, _r1, _r4, _lastTime, _duration); + CoordType currentLoc = hermite(_p1, _p4, _r1, _r4, _lastTime, _duration); + CoordType currentV = dHermite(_p1, _p4, _r1, _r4, _lastTime, _duration); _p1 = currentLoc; _r1 = currentV; _p4 = kPlanetStartTop; diff --git a/engines/pegasus/neighborhood/mars/planetmover.h b/engines/pegasus/neighborhood/mars/planetmover.h index faf76cd9fa..cc2c412548 100755 --- a/engines/pegasus/neighborhood/mars/planetmover.h +++ b/engines/pegasus/neighborhood/mars/planetmover.h @@ -47,7 +47,7 @@ protected: virtual void timeChanged(const TimeValue); Movie *_planetMovie; - tCoordType _p1, _p4, _r1, _r4; + CoordType _p1, _p4, _r1, _r4; TimeValue _duration; bool _dropping; }; diff --git a/engines/pegasus/neighborhood/mars/reactor.cpp b/engines/pegasus/neighborhood/mars/reactor.cpp index dd44fc49e1..b044fc9f4b 100755 --- a/engines/pegasus/neighborhood/mars/reactor.cpp +++ b/engines/pegasus/neighborhood/mars/reactor.cpp @@ -28,18 +28,18 @@ namespace Pegasus { -static const tCoordType kCurrentGuessWidth = 121; -static const tCoordType kCurrentGuessHeight = 23; +static const CoordType kCurrentGuessWidth = 121; +static const CoordType kCurrentGuessHeight = 23; -static const tCoordType kOneGuessWidth = 25; -static const tCoordType kOneGuessHeight = 23; +static const CoordType kOneGuessWidth = 25; +static const CoordType kOneGuessHeight = 23; -static const tResIDType kReactorChoicesPICTID = 905; +static const ResIDType kReactorChoicesPICTID = 905; -static const tCoordType kCurrentGuessLeft = kNavAreaLeft + 146; -static const tCoordType kCurrentGuessTop = kNavAreaTop + 90; +static const CoordType kCurrentGuessLeft = kNavAreaLeft + 146; +static const CoordType kCurrentGuessTop = kNavAreaTop + 90; -ReactorGuess::ReactorGuess(const tDisplayElementID id) : DisplayElement(id) { +ReactorGuess::ReactorGuess(const DisplayElementID id) : DisplayElement(id) { setBounds(kCurrentGuessLeft, kCurrentGuessTop, kCurrentGuessLeft + kCurrentGuessWidth, kCurrentGuessTop + kCurrentGuessHeight); setDisplayOrder(kMonitorLayer); @@ -81,10 +81,10 @@ void ReactorGuess::draw(const Common::Rect &) { } } -static const tCoordType kReactorChoiceHiliteWidth = 166; -static const tCoordType kReactorChoiceHiliteHeight = 26; +static const CoordType kReactorChoiceHiliteWidth = 166; +static const CoordType kReactorChoiceHiliteHeight = 26; -static const tCoordType kChoiceHiliteLefts[6] = { +static const CoordType kChoiceHiliteLefts[6] = { 0, 34, 34 + 34, @@ -93,12 +93,12 @@ static const tCoordType kChoiceHiliteLefts[6] = { 34 + 34 + 32 + 34 + 32 }; -static const tResIDType kReactorChoiceHilitePICTID = 901; +static const ResIDType kReactorChoiceHilitePICTID = 901; -static const tCoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116; -static const tCoordType kReactorChoiceHiliteTop = kNavAreaTop + 158; +static const CoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116; +static const CoordType kReactorChoiceHiliteTop = kNavAreaTop + 158; -ReactorChoiceHighlight::ReactorChoiceHighlight(const tDisplayElementID id) : DisplayElement(id) { +ReactorChoiceHighlight::ReactorChoiceHighlight(const DisplayElementID id) : DisplayElement(id) { setBounds(kReactorChoiceHiliteLeft, kReactorChoiceHiliteTop, kReactorChoiceHiliteLeft + kReactorChoiceHiliteWidth, kReactorChoiceHiliteTop + kReactorChoiceHiliteHeight); setDisplayOrder(kMonitorLayer); @@ -129,14 +129,14 @@ void ReactorChoiceHighlight::draw(const Common::Rect &) { } } -static const tCoordType kReactorHistoryWidth = 128; -static const tCoordType kReactorHistoryHeight = 168; +static const CoordType kReactorHistoryWidth = 128; +static const CoordType kReactorHistoryHeight = 168; -static const tCoordType kColorWidths[5] = {24, 25, 25, 26, 27}; -static const tCoordType kColorHeights[5] = {14, 15, 17, 17, 19}; +static const CoordType kColorWidths[5] = { 24, 25, 25, 26, 27 }; +static const CoordType kColorHeights[5] = { 14, 15, 17, 17, 19}; // TODO: Remove global construction -static const tCoordType kColorTops[5] = { +static const CoordType kColorTops[5] = { 0, kColorHeights[0], kColorHeights[0] + kColorHeights[1], @@ -144,7 +144,7 @@ static const tCoordType kColorTops[5] = { kColorHeights[0] + kColorHeights[1] + kColorHeights[2] + kColorHeights[3], }; -static const tCoordType kHistoryLefts[5][3] = { +static const CoordType kHistoryLefts[5][3] = { { 302 + kNavAreaLeft, 329 + kNavAreaLeft, 357 + kNavAreaLeft }, { 302 + kNavAreaLeft, 331 + kNavAreaLeft, 360 + kNavAreaLeft }, { 303 + kNavAreaLeft, 333 + kNavAreaLeft, 363 + kNavAreaLeft }, @@ -152,7 +152,7 @@ static const tCoordType kHistoryLefts[5][3] = { { 305 + kNavAreaLeft, 337 + kNavAreaLeft, 369 + kNavAreaLeft } }; -static const tCoordType kHistoryTops[5] = { +static const CoordType kHistoryTops[5] = { 39 + kNavAreaTop, 61 + kNavAreaTop, 84 + kNavAreaTop, @@ -160,13 +160,13 @@ static const tCoordType kHistoryTops[5] = { 137 + kNavAreaTop }; -static const tCoordType kOneAnswerWidth = 35; -static const tCoordType kOneAnswerHeight = 27; +static const CoordType kOneAnswerWidth = 35; +static const CoordType kOneAnswerHeight = 27; -static const tCoordType kDigitWidth = 16; -static const tCoordType kDigitHeight = 12; +static const CoordType kDigitWidth = 16; +static const CoordType kDigitHeight = 12; -static const tCoordType kCorrectCountLefts[5] = { +static const CoordType kCorrectCountLefts[5] = { 388 + kNavAreaLeft, 392 + kNavAreaLeft, 398 + kNavAreaLeft, @@ -174,7 +174,7 @@ static const tCoordType kCorrectCountLefts[5] = { 406 + kNavAreaLeft }; -static const tCoordType kCorrectCountTops[5] = { +static const CoordType kCorrectCountTops[5] = { 40 + kNavAreaTop, 62 + kNavAreaTop, 86 + kNavAreaTop, @@ -182,17 +182,17 @@ static const tCoordType kCorrectCountTops[5] = { 140 + kNavAreaTop }; -static const tResIDType kReactorDigitsPICTID = 902; -static const tResIDType kReactorHistoryPICTID = 903; -static const tResIDType kReactorAnswerPICTID = 904; +static const ResIDType kReactorDigitsPICTID = 902; +static const ResIDType kReactorHistoryPICTID = 903; +static const ResIDType kReactorAnswerPICTID = 904; -static const tCoordType kReactorHistoryLeft = kNavAreaLeft + 302; -static const tCoordType kReactorHistoryTop = kNavAreaTop + 39; +static const CoordType kReactorHistoryLeft = kNavAreaLeft + 302; +static const CoordType kReactorHistoryTop = kNavAreaTop + 39; -static const tCoordType kAnswerLeft = kNavAreaLeft + 304; -static const tCoordType kAnswerTop = kNavAreaTop + 180; +static const CoordType kAnswerLeft = kNavAreaLeft + 304; +static const CoordType kAnswerTop = kNavAreaTop + 180; -ReactorHistory::ReactorHistory(const tDisplayElementID id) : DisplayElement(id) { +ReactorHistory::ReactorHistory(const DisplayElementID id) : DisplayElement(id) { setBounds(kReactorHistoryLeft, kReactorHistoryTop, kReactorHistoryLeft + kReactorHistoryWidth, kReactorHistoryTop + kReactorHistoryHeight); setDisplayOrder(kMonitorLayer); diff --git a/engines/pegasus/neighborhood/mars/reactor.h b/engines/pegasus/neighborhood/mars/reactor.h index 671970102b..86338f8266 100755 --- a/engines/pegasus/neighborhood/mars/reactor.h +++ b/engines/pegasus/neighborhood/mars/reactor.h @@ -34,7 +34,7 @@ namespace Pegasus { class ReactorGuess : public DisplayElement { public: - ReactorGuess(const tDisplayElementID); + ReactorGuess(const DisplayElementID); virtual ~ReactorGuess() {} void initReactorGuess(); @@ -52,7 +52,7 @@ protected: class ReactorChoiceHighlight : public DisplayElement { public: - ReactorChoiceHighlight(const tDisplayElementID); + ReactorChoiceHighlight(const DisplayElementID); virtual ~ReactorChoiceHighlight() {} void initReactorChoiceHighlight(); @@ -79,7 +79,7 @@ protected: class ReactorHistory : public DisplayElement { public: - ReactorHistory(const tDisplayElementID); + ReactorHistory(const DisplayElementID); virtual ~ReactorHistory() {} void initReactorHistory(); diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp index 862a8b2edd..b1ecdde008 100755 --- a/engines/pegasus/neighborhood/mars/robotship.cpp +++ b/engines/pegasus/neighborhood/mars/robotship.cpp @@ -40,18 +40,18 @@ const TimeValue kRovingSlop = kThreeSeconds * kRovingScale; const int kNumSpriteColumns = 15; const int kNumSpriteRows = 16; -const tCoordType kInitialLocationLeft = kShuttleWindowLeft - 50; -const tCoordType kInitialLocationTop = kShuttleWindowTop - 50; -const tCoordType kInitialLocationWidth = kShuttleWindowWidth + 100; -const tCoordType kInitialLocationHeight = kShuttleWindowHeight + 100; +const CoordType kInitialLocationLeft = kShuttleWindowLeft - 50; +const CoordType kInitialLocationTop = kShuttleWindowTop - 50; +const CoordType kInitialLocationWidth = kShuttleWindowWidth + 100; +const CoordType kInitialLocationHeight = kShuttleWindowHeight + 100; -const tCoordType kVelocityVectorLength = 100; -const tCoordType kVelocityVectorSlop = 50; +const CoordType kVelocityVectorLength = 100; +const CoordType kVelocityVectorSlop = 50; -const tCoordType kRovingLeft = kShuttleWindowLeft + 20; -const tCoordType kRovingTop = kShuttleWindowTop + 20; -const tCoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft; -const tCoordType kRovingHeight = kShuttleWindowMidV - kRovingTop; +const CoordType kRovingLeft = kShuttleWindowLeft + 20; +const CoordType kRovingTop = kShuttleWindowTop + 20; +const CoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft; +const CoordType kRovingHeight = kShuttleWindowMidV - kRovingTop; RobotShip* g_robotShip = 0; @@ -129,7 +129,7 @@ void RobotShip::setUpNextDropTime() { void RobotShip::timeToDropJunk() { if (g_spaceJunk) { - tCoordType x, y; + CoordType x, y; _spritesMovie.getCenter(x, y); g_spaceJunk->launchJunk(((PegasusEngine *)g_engine)->getRandomNumber(24), x, y); } @@ -169,7 +169,7 @@ void RobotShip::newDestination() { start(); } -void RobotShip::moveRobotTo(tCoordType x, tCoordType y) { +void RobotShip::moveRobotTo(CoordType x, CoordType y) { _currentLocation.x = x; _currentLocation.y = y; @@ -258,8 +258,8 @@ void RobotShip::timeChanged(const TimeValue) { } } -void RobotShip::makeVelocityVector(tCoordType x1, tCoordType y1, tCoordType x2, tCoordType y2, Common::Point &vector) { - tCoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength; +void RobotShip::makeVelocityVector(CoordType x1, CoordType y1, CoordType x2, CoordType y2, Common::Point &vector) { + CoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength; vector.x = x2 - x1; vector.y = y2 - y1; float oldLength = sqrt(vector.x * vector.x + vector.y * vector.y); diff --git a/engines/pegasus/neighborhood/mars/robotship.h b/engines/pegasus/neighborhood/mars/robotship.h index 7c6d996566..7921198d48 100755 --- a/engines/pegasus/neighborhood/mars/robotship.h +++ b/engines/pegasus/neighborhood/mars/robotship.h @@ -30,8 +30,8 @@ namespace Pegasus { -const tCoordType kShuttleMovieWidth = 114; -const tCoordType kShuttleMovieHeight = 42; +const CoordType kShuttleMovieWidth = 114; +const CoordType kShuttleMovieHeight = 42; class RobotShip : IdlerTimeBase { friend void timeToDropJunkFunction(FunctionPtr *, void *); @@ -65,10 +65,10 @@ public: protected: void newDestination(); - void moveRobotTo(tCoordType, tCoordType); + void moveRobotTo(CoordType, CoordType); void timeToDropJunk(); virtual void timeChanged(const TimeValue); - void makeVelocityVector(tCoordType, tCoordType, tCoordType, tCoordType, Common::Point &); + void makeVelocityVector(CoordType, CoordType, CoordType, CoordType, Common::Point &); GlowingMovie _spritesMovie; Common::Rect _shipRange; diff --git a/engines/pegasus/neighborhood/mars/shuttlehud.cpp b/engines/pegasus/neighborhood/mars/shuttlehud.cpp index 1850926ef3..cac188e01e 100755 --- a/engines/pegasus/neighborhood/mars/shuttlehud.cpp +++ b/engines/pegasus/neighborhood/mars/shuttlehud.cpp @@ -30,26 +30,26 @@ namespace Pegasus { -const tCoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16; -const tCoordType kHUDTargetGridTop = kShuttleWindowTop + 8; -const tCoordType kHUDTargetGridWidth = 328; -const tCoordType kHUDTargetGridHeight = 206; - -const tCoordType kHUDRS232Left = kHUDTargetGridLeft + 264; -const tCoordType kHUDRS232Top = kHUDTargetGridTop + 2; - -const tCoordType kHUDLockLeft = kShuttleWindowLeft + 101; -const tCoordType kHUDLockTop = kShuttleWindowTop + 49; -const tCoordType kHUDLockWidth = 145; -const tCoordType kHUDLockHeight = 124; - -const tCoordType kTractorLockWidth = 50; -const tCoordType kTractorLockHeight = 30; - -const tCoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2; -const tCoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2; -const tCoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth; -const tCoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight; +const CoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16; +const CoordType kHUDTargetGridTop = kShuttleWindowTop + 8; +const CoordType kHUDTargetGridWidth = 328; +const CoordType kHUDTargetGridHeight = 206; + +const CoordType kHUDRS232Left = kHUDTargetGridLeft + 264; +const CoordType kHUDRS232Top = kHUDTargetGridTop + 2; + +const CoordType kHUDLockLeft = kShuttleWindowLeft + 101; +const CoordType kHUDLockTop = kShuttleWindowTop + 49; +const CoordType kHUDLockWidth = 145; +const CoordType kHUDLockHeight = 124; + +const CoordType kTractorLockWidth = 50; +const CoordType kTractorLockHeight = 30; + +const CoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2; +const CoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2; +const CoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth; +const CoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight; static const uint16 s_RS232Data[] = { 0xF0E1, 0xCE70, diff --git a/engines/pegasus/neighborhood/mars/shuttleweapon.cpp b/engines/pegasus/neighborhood/mars/shuttleweapon.cpp index 14614d1c87..0151a26f29 100755 --- a/engines/pegasus/neighborhood/mars/shuttleweapon.cpp +++ b/engines/pegasus/neighborhood/mars/shuttleweapon.cpp @@ -53,7 +53,7 @@ bool ShuttleWeapon::canFireWeapon() { return !isRunning(); } -void ShuttleWeapon::fireWeapon(const tCoordType hStop, const tCoordType vStop) { +void ShuttleWeapon::fireWeapon(const CoordType hStop, const CoordType vStop) { if (!isRunning()) { stop(); setTime(0); diff --git a/engines/pegasus/neighborhood/mars/shuttleweapon.h b/engines/pegasus/neighborhood/mars/shuttleweapon.h index c62cee1acc..30e42face8 100755 --- a/engines/pegasus/neighborhood/mars/shuttleweapon.h +++ b/engines/pegasus/neighborhood/mars/shuttleweapon.h @@ -45,7 +45,7 @@ public: virtual void initShuttleWeapon(); virtual void cleanUpShuttleWeapon(); - virtual void fireWeapon(const tCoordType, const tCoordType); + virtual void fireWeapon(const CoordType, const CoordType); bool canFireWeapon(); diff --git a/engines/pegasus/neighborhood/mars/spacejunk.cpp b/engines/pegasus/neighborhood/mars/spacejunk.cpp index a751dc2a71..28847136f6 100755 --- a/engines/pegasus/neighborhood/mars/spacejunk.cpp +++ b/engines/pegasus/neighborhood/mars/spacejunk.cpp @@ -31,9 +31,9 @@ namespace Pegasus { //const TimeValue kWeaponReboundTime = kTwoSeconds * kJunkTimeScale; //const TimeValue kCollisionReboundTime = kOneSecond * kJunkTimeScale; -const tCoordType kMaxBounceSize = 90; -const tCoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2; -const tCoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2; +const CoordType kMaxBounceSize = 90; +const CoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2; +const CoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2; const float kJunkXTarget = 0; const float kJunkYTarget = 0; @@ -41,7 +41,7 @@ const float kJunkZTarget = kJunkMinDistance; SpaceJunk *g_spaceJunk = 0; -SpaceJunk::SpaceJunk(const tDisplayElementID id) : ScalingMovie(id) { +SpaceJunk::SpaceJunk(const DisplayElementID id) : ScalingMovie(id) { _timer.setScale(kJunkTimeScale); _bouncing = false; g_spaceJunk = this; @@ -51,7 +51,7 @@ SpaceJunk::~SpaceJunk() { g_spaceJunk = 0; } -void SpaceJunk::launchJunk(int16 whichJunk, tCoordType xOrigin, tCoordType yOrigin) { +void SpaceJunk::launchJunk(int16 whichJunk, CoordType xOrigin, CoordType yOrigin) { _bouncing = false; TimeValue startTime = whichJunk * 16 * 40; TimeValue stopTime = startTime + 16 * 40; @@ -76,7 +76,7 @@ void SpaceJunk::launchJunk(int16 whichJunk, tCoordType xOrigin, tCoordType yOrig _timer.start(); } -void SpaceJunk::setCenter(const tCoordType centerX, const tCoordType centerY) { +void SpaceJunk::setCenter(const CoordType centerX, const CoordType centerY) { _center.x = centerX; _center.y = centerY; @@ -86,7 +86,7 @@ void SpaceJunk::setCenter(const tCoordType centerX, const tCoordType centerY) { setBounds(r); } -void SpaceJunk::setScaleSize(const tCoordType size) { +void SpaceJunk::setScaleSize(const CoordType size) { Common::Rect r; r.left = _center.x - (size >> 1); r.top = _center.y - (size >> 1); @@ -101,7 +101,7 @@ void SpaceJunk::useIdleTime() { Common::Point pt; pt.x = linearInterp(0, _bounceTime, time, _bounceStart.x, _bounceStop.x); pt.y = linearInterp(0, _bounceTime, time, _bounceStart.y, _bounceStop.y); - tCoordType size = linearInterp(0, _bounceTime, time, _bounceSizeStart, _bounceSizeStop); + CoordType size = linearInterp(0, _bounceTime, time, _bounceSizeStart, _bounceSizeStop); setCenter(pt.x, pt.y); setScaleSize(size); diff --git a/engines/pegasus/neighborhood/mars/spacejunk.h b/engines/pegasus/neighborhood/mars/spacejunk.h index ba5aa753e0..03943b92c9 100755 --- a/engines/pegasus/neighborhood/mars/spacejunk.h +++ b/engines/pegasus/neighborhood/mars/spacejunk.h @@ -32,22 +32,22 @@ namespace Pegasus { -const tCoordType kJunkMaxScreenSize = 250; +const CoordType kJunkMaxScreenSize = 250; const float kJunkSize = convertScreenVToSpaceY(kShuttleWindowMidV - kJunkMaxScreenSize / 2, kJunkMinDistance) - convertScreenVToSpaceY(kShuttleWindowMidV + kJunkMaxScreenSize / 2, kJunkMinDistance); class SpaceJunk : public ScalingMovie, public Idler { public: - SpaceJunk(const tDisplayElementID); + SpaceJunk(const DisplayElementID); virtual ~SpaceJunk(); - void setCenter(const tCoordType, const tCoordType); - void setScaleSize(const tCoordType); + void setCenter(const CoordType, const CoordType); + void setScaleSize(const CoordType); void useIdleTime(); - void launchJunk(int16, tCoordType, tCoordType); + void launchJunk(int16, CoordType, CoordType); void getJunkPosition(Point3D &); bool isJunkFlying(); @@ -67,7 +67,7 @@ protected: Common::Point _center; bool _bouncing; Common::Point _bounceStart, _bounceStop; - tCoordType _bounceSizeStart, _bounceSizeStop; + CoordType _bounceSizeStart, _bounceSizeStop; TimeValue _bounceTime; }; |