From 0e6110e78b7050a01f869dc4f3b487cf24fedf64 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 3 Nov 2024 21:10:38 +0100 Subject: [PATCH] scripts: resolve 917 instances of -Wunused-variable scripts/LEVEL0.cpp:1036:27: warning: unused variable "event_data" [-Wunused-variable] and a lot more. --- scripts/AIGame.cpp | 67 ++--------- scripts/AIGame3.cpp | 36 ++---- scripts/BatteriesIncluded.cpp | 2 - scripts/BossCamera.cpp | 2 - scripts/CanyonsCTF.cpp | 2 - scripts/CellTestLevel.cpp | 2 - scripts/ChrisTest.cpp | 4 - scripts/Geodomes.cpp | 2 - scripts/HalfPipe.cpp | 2 - scripts/InfernalBolt.cpp | 2 - scripts/Inversion.cpp | 35 ------ scripts/LEVEL0.cpp | 16 --- scripts/LEVEL15.cpp | 6 - scripts/Level12.cpp | 108 ----------------- scripts/Level16.cpp | 4 - scripts/Level6.cpp | 28 ----- scripts/Level9.cpp | 16 --- scripts/LevelS1.cpp | 4 - scripts/Merc02.cpp | 34 +----- scripts/Merc1.cpp | 212 ---------------------------------- scripts/Merc3.cpp | 80 +------------ scripts/Merc4.cpp | 7 +- scripts/Merc6.cpp | 12 -- scripts/Merc7.cpp | 108 ----------------- scripts/Mysterious_Isle.cpp | 24 ---- scripts/Paranoia.cpp | 2 - scripts/PiccuStation.cpp | 140 ---------------------- scripts/Polaris.cpp | 2 - scripts/Quadsomniac.cpp | 2 - scripts/RudeAwakening.cpp | 2 - scripts/SewerRat.cpp | 2 - scripts/TrainingMission.cpp | 36 ------ scripts/Y2K.cpp | 2 - scripts/aigame2.cpp | 10 +- scripts/aigame4.cpp | 2 - scripts/barney.cpp | 2 - scripts/clutter.cpp | 9 -- scripts/level1.cpp | 16 --- scripts/level10.cpp | 44 ------- scripts/level11.cpp | 114 ------------------ scripts/level13.cpp | 50 -------- scripts/level14.cpp | 24 ---- scripts/level17.cpp | 122 ------------------- scripts/level2.cpp | 26 ----- scripts/level3.cpp | 66 ----------- scripts/level4.cpp | 14 --- scripts/level5.cpp | 16 --- scripts/level7.cpp | 40 ------- scripts/level8.cpp | 8 -- scripts/levelS2.cpp | 126 -------------------- scripts/merc5.cpp | 52 --------- scripts/myPowerHouse.cpp | 2 - scripts/orbital.cpp | 4 - 53 files changed, 29 insertions(+), 1721 deletions(-) diff --git a/scripts/AIGame.cpp b/scripts/AIGame.cpp index f75da64ae..b329a80d5 100644 --- a/scripts/AIGame.cpp +++ b/scripts/AIGame.cpp @@ -1835,7 +1835,6 @@ bool SuperThief::DoNotify(int me, tOSIRISEVTAINOTIFY *notify) { bool SuperThief::DoSteal(int me, int it) { int max_tries = numSuperThiefableItems; - float gen_perc, perc_chance; ; int i; int count_max, count_num; @@ -2067,11 +2066,9 @@ void SuperThief::CheckAndFireSecondary(int me) { void SuperThief::DoInterval(int me) { bool f_force_ranged = false; - int target_handle; float anim_frame; float shields; int flags; - msafe_struct m; int room; vector pos; @@ -2092,7 +2089,7 @@ void SuperThief::DoInterval(int me) { end_pos += orient.fvec * 2000.0f; int fvi_flags = FQ_CHECK_OBJS | FQ_IGNORE_POWERUPS | FQ_IGNORE_WEAPONS; - int fate = FVI_RayCast(me, &pos, &end_pos, room, 0.0f, fvi_flags, &ray); + FVI_RayCast(me, &pos, &end_pos, room, 0.0f, fvi_flags, &ray); Obj_Value(memory->camera_obj, VF_SET, OBJV_I_ROOMNUM, &ray.hit_room); Obj_Value(memory->camera_obj, VF_SET, OBJV_V_POS, &ray.hit_point); @@ -2136,7 +2133,6 @@ void SuperThief::DoInterval(int me) { if (memory->last_frame < 234.0f && anim_frame >= 234.0f) { msafe_struct mstruct; - int type; memory->laser_on = true; memory->camera_obj = Obj_Create(OBJ_POWERUP, Obj_FindID("Invisiblepowerup"), room, &pos, NULL, me); @@ -3067,7 +3063,6 @@ const int16_t hm_valid_next_modes[11] = { void Humonculous::DetermineDeathPos(int me, vector *dpos, int *droom) { float best_dist = 100000000.0f; - int best_dp; vector dp[6]; int dr[6]; int i; @@ -3627,7 +3622,7 @@ void Humonculous::DoInterval(int me) { int flags = FQ_CHECK_OBJS | FQ_IGNORE_POWERUPS | FQ_IGNORE_WEAPONS | FQ_IGNORE_MOVING_OBJECTS | FQ_IGNORE_NON_LIGHTMAP_OBJECTS; - int fate = FVI_RayCast(me, &start_pos, &end_pos, start_room, 0.0f, flags, &ray); + FVI_RayCast(me, &start_pos, &end_pos, start_room, 0.0f, flags, &ray); memory->land_pos = ray.hit_point; memory->land_pos.y += memory->ground_pnt_offset; @@ -3697,7 +3692,7 @@ void Humonculous::DoInterval(int me) { int flags = FQ_CHECK_OBJS | FQ_IGNORE_POWERUPS | FQ_IGNORE_WEAPONS | FQ_IGNORE_MOVING_OBJECTS | FQ_IGNORE_NON_LIGHTMAP_OBJECTS; - int fate = FVI_RayCast(me, &start_pos, &end_pos, start_room, 0.0f, flags, &ray); + FVI_RayCast(me, &start_pos, &end_pos, start_room, 0.0f, flags, &ray); memory->land_pos = ray.hit_point; memory->land_pos.y += memory->ground_pnt_offset; @@ -4082,10 +4077,6 @@ void Jugg::SetMode(int me, char mode) { } void Jugg::DoInit(int me) { - int head_object; - int belly_object; - int turret_object; - int flame_object; int i; tOSIRISMEMCHUNK ch; @@ -4123,7 +4114,6 @@ void Jugg::DoInit(int me) { void Jugg::DoFrame(int me) { float current_anim_frame; - matrix orient; int flags; Obj_Value(me, VF_GET, OBJV_F_ANIM_FRAME, ¤t_anim_frame); @@ -4217,12 +4207,6 @@ int16_t Jugg::CallEvent(int event, tOSIRISEventInfo *data) { //--------------- void DTower::DoInit(int me) { - int head_object; - int belly_object; - int turret_object; - int flame_object; - int i; - tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(dtower_data); @@ -4997,7 +4981,6 @@ bool GuideBot::DoExternalCommands(int me, gb_com *command, int it) { int rhandle[32]; bool rdone[32]; int handle[32]; - bool done[32]; int i; int rnum_items; int num_items; @@ -5315,7 +5298,6 @@ bool GuideBot::DoExternalCommands(int me, gb_com *command, int it) { if (fate == HIT_NONE) { msafe_struct mstruct; - int type; Obj_Value(memory->me, VF_GET, OBJV_I_ROOMNUM, &mstruct.roomnum); Obj_Value(memory->me, VF_GET, OBJV_V_POS, &mstruct.pos); @@ -5431,7 +5413,6 @@ bool GuideBot::DoExternalCommands(int me, gb_com *command, int it) { } else if (command->action == COM_GET_MENU) { int i; gb_menu *menu = (gb_menu *)command->ptr; - int cur_command = 0; strcpy(menu->title, TXT_GB_MENUTITLE); @@ -5553,7 +5534,6 @@ bool GuideBot::DoExternalCommands(int me, gb_com *command, int it) { } void GuideBot::DoCollide(int me, tOSIRISEVTCOLLIDE *evt_collide) { - int obj_type; int its_parent; float rand_val; @@ -5608,7 +5588,6 @@ void GuideBot::DoCollide(int me, tOSIRISEVTCOLLIDE *evt_collide) { bool GuideBot::DoUse(int me) { int p_handle; - int sad_sound; int buddy_handle; // NOTE: Use is done on the inventory item and/or the real guidebot @@ -5639,12 +5618,6 @@ bool GuideBot::DoUse(int me) { } bool GuideBot::DoInit(int me, bool f_reinit) { - vector fvec; - vector vel; - bool f_valid; - matrix orient; - vector pos; - int room; int i; tOSIRISMEMCHUNK ch; @@ -5824,7 +5797,6 @@ void GuideBot::DoPowerupCheck(int me) { } if (f_for_me) { - tOSIRISEventInfo data; gb_com command; command.action = COM_POWERUP_NOTIFY; @@ -5839,7 +5811,6 @@ void GuideBot::DoPowerupCheck(int me) { } void GuideBot::DoFrame(int me) { - int dir_index; int flags; float anim; float last_mode_time; @@ -6605,9 +6576,6 @@ void Thief::SetMode(int me, int new_mode) { } void Thief::DoInit(int me) { - - int room; - vector pos; tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(thief_data); @@ -7074,18 +7042,10 @@ void Sickle::DoInit(int me) { void Sickle::DoFrame(int me) { vector uvec; - vector start_pos; - vector end_pos; - int flags; - int fate; - int start_room; - int ceiling_room; float anim_frame; int new_mode; - vector vel; float last_see_time; float last_hear_time; - char movement_type; float temp_time; float temp_time2; @@ -7517,10 +7477,9 @@ int16_t Tubbs::CallEvent(int event, tOSIRISEventInfo *data) { bool OldScratch::DoSteal(int me, int it) { int max_tries = numSuperThiefableItems; - float gen_perc, perc_chance; ; int i; - int count_max, count_num; + int count_max; bool *attempted_steals; attempted_steals = (bool *)malloc(numSuperThiefableItems * sizeof(bool)); @@ -7870,7 +7829,6 @@ bool BarnSwallow::SendCommand(int me, int it, char action, int value) { } void BarnSwallow::DoInit(int me) { - int i; tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(barnswallow_data); @@ -8077,7 +8035,6 @@ void BarnSwallow::DoFrame(int me) { if (rand_val > 95) // Find a remote powerup and go get it { int i; - bool f_ok = true; // for(i = 0; i < memory->num_friends; i++) // { @@ -8169,7 +8126,6 @@ bool BarnSwallow::SetMode(int me, char mode, int it) { switch (mode) { case BSM_NEST: { - int room; float max_speed; vector pos; @@ -8864,7 +8820,6 @@ void Hellion::DoFrame(int me) { vector normal; vector pos; int room; - vector end_pos; for (i = 0; i < 2; i++) { int my_room; @@ -8874,7 +8829,7 @@ void Hellion::DoFrame(int me) { Obj_Value(me, VF_GET, OBJV_I_ROOMNUM, &my_room); Obj_GetGunPos(me, i + 1, &pos, &normal); - int rfate = FVI_RayCast(me, &my_pos, &pos, my_room, 0.0f, 0, &ray); + FVI_RayCast(me, &my_pos, &pos, my_room, 0.0f, 0, &ray); room = ray.hit_room; matrix orient; @@ -10422,11 +10377,8 @@ bool EvaderModA::DoNotify(int me_handle, tOSIRISEventInfo *data) { return true; void EvaderModA::SetMode(int me, char mode) { switch (mode) { case EMA_GET_BEHIND: { - vector pos; int vec; - int flags = GF_NOTIFIES | GF_ORIENT_TARGET; - if ((rand() % 100) > 50) { vec = GST_NEG_FVEC; memory->time_till_next_mode = 7.0f * (float)rand() / (float)RAND_MAX + 2.0f; @@ -10540,11 +10492,8 @@ bool FlameRAS::DoNotify(int me_handle, tOSIRISEventInfo *data) { return true; } void FlameRAS::SetMode(int me, char mode) { switch (mode) { case EMA_GET_BEHIND: { - vector pos; int vec; - int flags = GF_NOTIFIES | GF_ORIENT_TARGET; - if ((rand() % 100) > 50) { vec = GST_NEG_FVEC; memory->time_till_next_mode = 7.0f * (float)rand() / (float)RAND_MAX + 2.0f; @@ -10805,8 +10754,8 @@ int16_t BettyBomb::CallEvent(int event, tOSIRISEventInfo *data) { if (parent != OBJECT_HANDLE_NONE && child_id != -1) { int child_handle; - matrix orient, o, otemp, o1; - vector vel, pos, v, vtemp; + matrix orient; + vector vel, pos, v; int room; Obj_Value(parent, VF_GET, OBJV_M_ORIENT, &orient); @@ -10895,7 +10844,7 @@ int16_t BettyScript::CallEvent(int event, tOSIRISEventInfo *data) { // create our memory DoInit(data->me_handle); - int parent, type; + int parent; vector vel; parent = GetObjectParent(data->me_handle); diff --git a/scripts/AIGame3.cpp b/scripts/AIGame3.cpp index 19ebd5e20..382bb1fe6 100644 --- a/scripts/AIGame3.cpp +++ b/scripts/AIGame3.cpp @@ -310,7 +310,7 @@ int CreateAndAttach(int me, const char *child_name, uint8_t child_type, char par } int FindClosestPlayer(int objhandle) { - vector objpos, playerpos; + vector objpos; float closest_dist = FLT_MAX; int closest_player = OBJECT_HANDLE_NONE; msafe_struct mstruct; @@ -2206,7 +2206,6 @@ void AlienOrganism::UpdateSquadieFormationGoal(int me) { } void AlienOrganism::SetWanderGoal(int me) { - vector pos; int room = 0; float dist = 15.0f; @@ -2546,7 +2545,6 @@ void AlienOrganism::UpdateEnergyBeams(int me) { void AlienOrganism::UpdateEnergyEffect(int me) { int room; vector pos; - int weapon_id; // See if this object has an energy charge if (memory->energy_charges > 0.0f) { @@ -2575,7 +2573,6 @@ void AlienOrganism::SetMode(int me, char mode) { int flags; char movement_type; - vector vel; // Clear out any goals AI_SafeSetType(me, AIT_AIS); @@ -2603,7 +2600,7 @@ void AlienOrganism::SetMode(int me, char mode) { ray_info ray; int fate; vector end_pos, landing_pos; - int end_room, landing_room; + int landing_room; // If currently landed, set take off velocity DoTakeoff(me, 8.0f, 3.0f); @@ -3076,7 +3073,6 @@ void AlienOrganism::DoTakeoff(int me, float takeoff_speed, float speed_variance) // Processes the AI Initialize event void AlienOrganism::DoInit(int me) { - int flags; msafe_struct m; m.objhandle = me; @@ -3200,8 +3196,8 @@ void AlienOrganism::DoInit(int me) { bool AlienOrganism::FindHome(int me) { int num_attempts; bool home_found; - vector start_pos, target_pos, landed_pos, home_dir; - int start_room, landed_room; + vector start_pos, target_pos, home_dir; + int start_room; matrix start_orient; int flags, fate; ray_info ray; @@ -3300,7 +3296,7 @@ void AlienOrganism::DoSquadieFrame(int me) { float slowdown = 1.0f; if (dist <= ALIEN_APPROACH_DIST) { matrix leader_orient; - vector dir, leader_pos; + vector dir; // See if we are in front of leader Obj_Value(memory->leader_handle, VF_GET, OBJV_M_ORIENT, &leader_orient); @@ -3337,11 +3333,8 @@ void AlienOrganism::DoSquadieFrame(int me) { // Processes the AI Frame Interval Event void AlienOrganism::DoFrame(int me) { - vector uvec; int flags; float anim_frame; - int new_mode; - vector vel; float last_see_time, last_see_game_time; float last_hear_time, last_hear_game_time; float last_perceive_time; @@ -4777,8 +4770,8 @@ bool Lifter::OkToPull(int me, bool initial_check /*=true*/) { // see if anything is in the way ray_info ray; int flags, fate; - vector start_pos, end_pos, landing_pos; - int start_room, landing_room; + vector start_pos, end_pos; + int start_room; float target_size; Obj_Value(me, VF_GET, OBJV_V_POS, &start_pos); @@ -5493,7 +5486,6 @@ bool AlienBoss::IsOnFire(int me) { return (Obj_IsEffect(me, EF_NAPALMED)); } // Sets wandering destination goal for boss void AlienBoss::SetWanderGoal(int me) { - vector pos; int room = 0; float dist = 15.0f; @@ -5722,7 +5714,6 @@ void AlienBoss::SetMode(int me, char mode) { int flags; char movement_type; - vector vel; // Clear out any goals AI_SafeSetType(me, AIT_AIS); @@ -5751,7 +5742,7 @@ void AlienBoss::SetMode(int me, char mode) { ray_info ray; int fate; vector end_pos, landing_pos; - int end_room, landing_room; + int landing_room; // If currently landed, set take off velocity DoTakeoff(me, 8.0f, 3.0f); @@ -6167,7 +6158,6 @@ void AlienBoss::DoTakeoff(int me, float takeoff_speed, float speed_variance) { // Processes the AI Initialize event void AlienBoss::DoInit(int me) { - int flags; msafe_struct m; m.objhandle = me; @@ -6351,8 +6341,8 @@ bool AlienBoss::DoStingAttack(int me) { // see if anything is in the way ray_info ray; int flags, fate; - vector start_pos, end_pos, landing_pos; - int start_room, landing_room; + vector start_pos, end_pos; + int start_room; float target_size; Obj_Value(me, VF_GET, OBJV_V_POS, &start_pos); @@ -6382,7 +6372,6 @@ bool AlienBoss::DoStingAttack(int me) { // Processes the AI Frame Interval Event void AlienBoss::DoFrame(int me) { - int flags; float anim_frame; float last_see_time, last_see_game_time; float last_hear_time, last_hear_game_time; @@ -7004,7 +6993,6 @@ bool SecurityCamera::ReceiveCommand(int me, int it, char command, void *ptr) { // Sets the Current Mode void SecurityCamera::SetMode(int me, char mode) { - int flags; float curr_anim_frame; // Get the current animation frame @@ -7111,7 +7099,7 @@ void SecurityCamera::DoFrame(int me) { vector local_vec_to_target, world_vec_to_target, dir, local_fvec; matrix orient; double theta; - float frame_offset, dot, curr_frame, dest_frame, anim_time, next_frame; + float frame_offset, dot, curr_frame, dest_frame, anim_time; // Get the vec to target in local security camera space Obj_Value(me, VF_GET, OBJV_M_ORIENT, &orient); @@ -7328,7 +7316,7 @@ void CrowdControl::DoFrame(int me) { if (!memory->disable_check && qObjExists(memory->follow_handle)) { vector my_vel, my_pos, leader_pos, leader_dir; matrix my_orient; - float my_max_speed, dist, new_speed; + float dist, new_speed; Obj_Value(me, VF_GET, OBJV_V_VELOCITY, &my_vel); Obj_Value(me, VF_GET, OBJV_V_POS, &my_pos); diff --git a/scripts/BatteriesIncluded.cpp b/scripts/BatteriesIncluded.cpp index 701ad1a36..88f47e776 100644 --- a/scripts/BatteriesIncluded.cpp +++ b/scripts/BatteriesIncluded.cpp @@ -1297,8 +1297,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/BossCamera.cpp b/scripts/BossCamera.cpp index d66d0ccfc..a82703dc1 100644 --- a/scripts/BossCamera.cpp +++ b/scripts/BossCamera.cpp @@ -534,8 +534,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); } break; diff --git a/scripts/CanyonsCTF.cpp b/scripts/CanyonsCTF.cpp index bcca7c1ce..546288e3f 100644 --- a/scripts/CanyonsCTF.cpp +++ b/scripts/CanyonsCTF.cpp @@ -518,8 +518,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); } break; diff --git a/scripts/CellTestLevel.cpp b/scripts/CellTestLevel.cpp index 5bc6d9e39..e227fec16 100644 --- a/scripts/CellTestLevel.cpp +++ b/scripts/CellTestLevel.cpp @@ -520,8 +520,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/ChrisTest.cpp b/scripts/ChrisTest.cpp index ffbd5a4fa..0d9e8a2f1 100644 --- a/scripts/ChrisTest.cpp +++ b/scripts/ChrisTest.cpp @@ -550,8 +550,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -599,8 +597,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 003: Script Description Goes Here if (1) { aStoreObjectInPositionClipboard(Object_handles[0]); diff --git a/scripts/Geodomes.cpp b/scripts/Geodomes.cpp index 4ee1f1b4a..dfe63e66d 100644 --- a/scripts/Geodomes.cpp +++ b/scripts/Geodomes.cpp @@ -601,8 +601,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/HalfPipe.cpp b/scripts/HalfPipe.cpp index 277e5c421..0224445e5 100644 --- a/scripts/HalfPipe.cpp +++ b/scripts/HalfPipe.cpp @@ -604,8 +604,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/InfernalBolt.cpp b/scripts/InfernalBolt.cpp index bfc10cd1d..60a4e4785 100644 --- a/scripts/InfernalBolt.cpp +++ b/scripts/InfernalBolt.cpp @@ -590,8 +590,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/Inversion.cpp b/scripts/Inversion.cpp index 2d9d089b8..1e7a2f85b 100644 --- a/scripts/Inversion.cpp +++ b/scripts/Inversion.cpp @@ -1002,8 +1002,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 002: BlueUnSpark if ((qUserFlag(0) == true) && (qRoomHasPlayer(Room_indexes[0]) == false)) { aSoundPlayObject(Sound_indexes[0], Object_handles[0], 1.000000f); @@ -1057,8 +1055,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1106,8 +1102,6 @@ int16_t CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 016: Switch-12 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1118,8 +1112,6 @@ int16_t CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 014: Switch-12 Off if (1) { aRoomSetWind(Room_indexes[6], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1157,8 +1149,6 @@ int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 015: Switch-11 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1169,8 +1159,6 @@ int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 013: Switch-11 Off if (1) { aRoomSetWind(Room_indexes[6], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1208,7 +1196,6 @@ int16_t CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; // Script 026: Switch-22 Initialize if (1) { @@ -1220,8 +1207,6 @@ int16_t CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 027: Switch-22 Off if (1) { aRoomSetWind(Room_indexes[7], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1259,8 +1244,6 @@ int16_t CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 023: Switch-21 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1271,8 +1254,6 @@ int16_t CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 024: Switch-21 Off if (1) { aRoomSetWind(Room_indexes[7], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1310,8 +1291,6 @@ int16_t CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 032: BSwitch-22 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1322,8 +1301,6 @@ int16_t CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 036: BSwitch-22 Off if (1) { aRoomSetWind(Room_indexes[8], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1361,8 +1338,6 @@ int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 031: BSwitch-21 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1373,8 +1348,6 @@ int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 035: BSwitch-21 Off if (1) { aRoomSetWind(Room_indexes[8], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1412,8 +1385,6 @@ int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 030: BSwitch-12 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1424,8 +1395,6 @@ int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 034: BSwitch-12 Off if (1) { aRoomSetWind(Room_indexes[9], 0.000000f, 0.000000f, 0.000000f, 1.000000f); @@ -1463,8 +1432,6 @@ int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 029: BSwitch-11 Initialize if (1) { aObjPlayAnim(data->me_handle, 3, 6, 1.000000f, 0); @@ -1475,8 +1442,6 @@ int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 033: BSwitch-11 Off if (1) { aRoomSetWind(Room_indexes[9], 0.000000f, 0.000000f, 0.000000f, 1.000000f); diff --git a/scripts/LEVEL0.cpp b/scripts/LEVEL0.cpp index a643c6a5a..a95f10b2f 100644 --- a/scripts/LEVEL0.cpp +++ b/scripts/LEVEL0.cpp @@ -1020,8 +1020,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 008: Fire Sphere Room if ((qUserFlag(2) == false) && (qUserFlag(3) == false)) { aRoomSetDamage(Room_indexes[7], 1.000000f, 1); @@ -1033,8 +1031,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1476,8 +1472,6 @@ int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 016: Goal Zero Completed & Waypoint 3 if (1) { aGoalCompleted(Goal_indexes[5], 1); @@ -1495,8 +1489,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 017: Waypoint 1 if (1) { aSetWaypoint(1); @@ -1540,8 +1532,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 019: Waypoint 4 if (1) { aSetWaypoint(4); @@ -1558,8 +1548,6 @@ int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 020: Waypoint 5 if (1) { aSetWaypoint(5); @@ -1576,8 +1564,6 @@ int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 021: Waypoint 6 Left if (1) { aSetWaypoint(6); @@ -1594,8 +1580,6 @@ int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 022: Waypoint 6 Right if (1) { aSetWaypoint(6); diff --git a/scripts/LEVEL15.cpp b/scripts/LEVEL15.cpp index 015e91187..de51823ca 100644 --- a/scripts/LEVEL15.cpp +++ b/scripts/LEVEL15.cpp @@ -2457,8 +2457,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 035: Locate Back-up Reactor Goal Completed if ((ScriptActionCtr_035 < 1) && (qRoomHasPlayer(Room_indexes[12]) == true)) { aGoalCompleted(Goal_indexes[2], 1); @@ -2469,8 +2467,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(uservars_as_int); @@ -2689,8 +2685,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 059: Music Outside Init if (1) { aMusicSetRegionAll(1); diff --git a/scripts/Level12.cpp b/scripts/Level12.cpp index d0e2c65d8..4b9af2d81 100644 --- a/scripts/Level12.cpp +++ b/scripts/Level12.cpp @@ -3140,8 +3140,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3358,8 +3356,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 003: Disable Player if ((ScriptActionCtr_003 < 1) && (1)) { aObjSaveHandle(qPlayerClosest(Object_handles[9], -1), 0); @@ -3392,8 +3388,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 149: Flamer-4 if (1) { if (qUserFlag(3) == true) { @@ -3424,8 +3418,6 @@ int16_t CustomObjectScript_09DF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 148: Flamer-3 if (1) { if (qUserFlag(2) == true) { @@ -3456,8 +3448,6 @@ int16_t CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 147: Flamer-2 if (1) { if (qUserFlag(1) == true) { @@ -3488,8 +3478,6 @@ int16_t CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 146: Flamer-1 if (1) { if (qUserFlag(0) == true) { @@ -3542,8 +3530,6 @@ int16_t CustomObjectScript_09DB::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 150: Flamer-Main if (1) { if (qUserFlag(4) == true) { @@ -3805,8 +3791,6 @@ int16_t CustomObjectScript_0880::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1077::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 046: Compactor 2 Slamming if ((ScriptActionCtr_046 < 1) && (1)) { aSoundPlayObject(Sound_indexes[3], data->me_handle, 1.000000f); @@ -3826,8 +3810,6 @@ int16_t CustomObjectScript_1077::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 005: Compactor 1 Slamming if ((ScriptActionCtr_005 < 1) && (1)) { aSoundPlayObject(Sound_indexes[3], data->me_handle, 1.000000f); @@ -3847,8 +3829,6 @@ int16_t CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 019: FlickerForcefield-1 (3) if (1) { aObjGhostSet(1, data->me_handle); @@ -3861,8 +3841,6 @@ int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 021: FlickerForcefield-2 (3) if (1) { if (qUserVarValue(5) == 0.000000f) { @@ -3887,8 +3865,6 @@ int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08B0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 018: FlickerForcefield-1 (2) if (1) { aObjGhostSet(1, data->me_handle); @@ -3901,8 +3877,6 @@ int16_t CustomObjectScript_08B0::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 020: FlickerForcefield-2 (2) if (1) { if (qUserVarValue(1) == 0.000000f) { @@ -3927,8 +3901,6 @@ int16_t CustomObjectScript_08B0::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08B1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 007: FlickerForcefield-1 (1) if (1) { aObjGhostSet(1, data->me_handle); @@ -3941,8 +3913,6 @@ int16_t CustomObjectScript_08B1::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 008: FlickerForcefield-2 (1) if (1) { if (qUserVarValue(0) == 0.000000f) { @@ -3993,8 +3963,6 @@ int16_t CustomObjectScript_107D::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 118: Arena 42 Special Timer if ((ScriptActionCtr_118 < 1) && (1)) { aSoundPlayObject(Sound_indexes[5], Object_handles[44], 1.000000f); @@ -4039,8 +4007,6 @@ int16_t CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 116: Arena 41 Special Timer if ((ScriptActionCtr_116 < 1) && (1)) { aSoundPlayObject(Sound_indexes[5], Object_handles[45], 1.000000f); @@ -4080,8 +4046,6 @@ int16_t CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 111: Arena 3 Special Timer if ((ScriptActionCtr_111 < 1) && (1)) { aSoundPlayObject(Sound_indexes[5], Object_handles[46], 1.000000f); @@ -4121,8 +4085,6 @@ int16_t CustomObjectScript_1168::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 109: Arena 2 Special Timer if ((ScriptActionCtr_109 < 1) && (1)) { aSoundPlayObject(Sound_indexes[5], Object_handles[47], 1.000000f); @@ -4141,8 +4103,6 @@ int16_t CustomObjectScript_1168::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 105: ArenaBotsINIT if (1) { aObjMakeInvuln(Object_handles[27], 999999); @@ -4210,8 +4170,6 @@ int16_t CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 106: Arena 1 Special Timer if ((ScriptActionCtr_106 < 1) && (1)) { aSoundPlayObject(Sound_indexes[5], Object_handles[48], 1.000000f); @@ -4251,8 +4209,6 @@ int16_t CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 025: RandomRedExtraSpew if (1) { aTurnOnSpew(Object_handles[51], 0, 7, 1.000000f, 0.010000f, 98304, 0, 1.200000f, 0.150000f, -1.000000f, 4.000000f, @@ -4284,8 +4240,6 @@ int16_t CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 031: ArenaSpewers if (1) { aTurnOnSpew(Object_handles[59], 0, 8, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.140000f, -1.000000f, 4.000000f, @@ -4309,8 +4263,6 @@ int16_t CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 006: Repair INIT if (1) { aUserVarSet(3, 0.000000f); @@ -4461,8 +4413,6 @@ int16_t CustomObjectScript_08C2::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 038: ToggleRepair-23 if ((ScriptActionCtr_038 < 1) && (1)) { aUserVarInc(3); @@ -4520,8 +4470,6 @@ int16_t CustomObjectScript_18C3::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 035: ToggleRepair-13 if ((ScriptActionCtr_035 < 1) && (1)) { aUserVarInc(2); @@ -4665,8 +4613,6 @@ int16_t CustomObjectScript_104E::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 049: CowardFF-22 if (1) { if (((qUserVarValue(4) == 0.000000f) || (qUserVarValue(4) == 2.000000f)) && (qUserVarValue(6) == 1.000000f)) { @@ -4711,8 +4657,6 @@ int16_t CustomObjectScript_1969::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 051: CowFF-INIT if (1) { aUserVarSet(4, 0.000000f); @@ -4724,8 +4668,6 @@ int16_t CustomObjectScript_1969::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 048: CowardFF-12 if (1) { if (((qUserVarValue(6) == 0.000000f) || (qUserVarValue(6) == 2.000000f)) && (qUserVarValue(4) == 1.000000f)) { @@ -4755,8 +4697,6 @@ int16_t CustomObjectScript_1969::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 052: CowPipe-INIT if (1) { aObjMakeInvuln(Object_handles[79], 999999); @@ -4870,8 +4810,6 @@ int16_t CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 066: Gasser INIT if (1) { aUserVarSet(7, 0.000000f); @@ -4884,8 +4822,6 @@ int16_t CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 065: Gasser (Arena3) if (1) { if (qUserVarValue(7) == 1.000000f) { @@ -4948,8 +4884,6 @@ int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 074: RedDummy-3 Explode if (1) { if (((ScriptActionCtr_073 > 0) == true) && ((ScriptActionCtr_070 > 0) == true)) { @@ -4983,8 +4917,6 @@ int16_t CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 073: RedDummy-2 Explode if (1) { if (((ScriptActionCtr_074 > 0) == true) && ((ScriptActionCtr_070 > 0) == true)) { @@ -5018,8 +4950,6 @@ int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 070: RedDummy-1 Explode if (1) { if (((ScriptActionCtr_073 > 0) == true) && ((ScriptActionCtr_074 > 0) == true)) { @@ -5068,8 +4998,6 @@ int16_t CustomObjectScript_08E9::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 075: SRepair-INIT if (1) { aUserVarSet(8, 0.000000f); @@ -5087,8 +5015,6 @@ int16_t CustomObjectScript_08E9::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 077: SRSwitch-1 Timer if (1) { aUserVarSet(8, 1.000000f); @@ -5135,8 +5061,6 @@ int16_t CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 080: SRSwitch-2 Timer if (1) { aUserVarSet(9, 1.000000f); @@ -5255,8 +5179,6 @@ int16_t CustomObjectScript_1801::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 104: EBHostile if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[151], 1.000000f); @@ -5275,8 +5197,6 @@ int16_t CustomObjectScript_1801::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 011: Level1Paths if (1) { aAIFlags(1, 32800, Object_handles[117]); @@ -5308,8 +5228,6 @@ int16_t CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0984::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 012: Level2Paths if (1) { aAIFlags(1, 32800, Object_handles[124]); @@ -5353,8 +5271,6 @@ int16_t CustomObjectScript_0984::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_098C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 113: Level3Paths if (1) { aAIFlags(1, 32800, Object_handles[115]); @@ -5382,8 +5298,6 @@ int16_t CustomObjectScript_098C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 114: Level4Paths if (1) { aAIFlags(1, 32800, Object_handles[149]); @@ -5417,8 +5331,6 @@ int16_t CustomObjectScript_20BC::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 119: Arena Waiters INIT if (1) { aAIFlags(1, 131104, Object_handles[153]); @@ -6112,8 +6024,6 @@ int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 152: Escaping Begin if ((ScriptActionCtr_152 < 1) && (1)) { aSoundPlaySteaming("VoxL12SpecificD.osf", 1.000000f); @@ -6317,8 +6227,6 @@ int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 117: Arena 42 Special Enter if ((ScriptActionCtr_117 < 1) && (1)) { aDoorLockUnlock(1, Door_handles[4]); @@ -6343,8 +6251,6 @@ int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 115: Arena 41 Special Enter if ((ScriptActionCtr_115 < 1) && (1)) { aDoorLockUnlock(1, Door_handles[5]); @@ -6369,8 +6275,6 @@ int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 014: ExitSequenceTest if (1) { aGoalCompleted(Goal_indexes[2], 1); @@ -6388,8 +6292,6 @@ int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 098: L2Migration-2 if ((ScriptActionCtr_098 < 1) && ((ScriptActionCtr_097 > 0) == false)) { aAIGoalFollowPathSimple(Object_handles[137], Path_indexes[23], 4352, -1, 3); @@ -6409,8 +6311,6 @@ int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 097: L2Migration-1 if ((ScriptActionCtr_097 < 1) && ((ScriptActionCtr_098 > 0) == false)) { aAIGoalFollowPathSimple(Object_handles[137], Path_indexes[23], 4352, -1, 3); @@ -6430,8 +6330,6 @@ int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 099: L2Surprise if ((ScriptActionCtr_099 < 1) && (1)) { aAIGoalFollowPathSimple(Object_handles[141], Path_indexes[24], 4352, -1, 3); @@ -6451,8 +6349,6 @@ int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 100: L2GenericRoomEnter if ((ScriptActionCtr_100 < 1) && (1)) { aSetObjectTimer(Object_handles[39], 5.000000f, -1); @@ -6469,8 +6365,6 @@ int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 133: MainGuardMessage-2 if ((ScriptActionCtr_133 < 1) && ((ScriptActionCtr_095 > 0) == false)) { aDoorLockUnlock(1, Door_handles[4]); @@ -6489,8 +6383,6 @@ int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 095: MainGuardMessage-1 if ((ScriptActionCtr_095 < 1) && ((ScriptActionCtr_133 > 0) == false)) { aDoorLockUnlock(1, Door_handles[4]); diff --git a/scripts/Level16.cpp b/scripts/Level16.cpp index b3de5d82a..184e9aedb 100644 --- a/scripts/Level16.cpp +++ b/scripts/Level16.cpp @@ -675,8 +675,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 011: AreasVisited if (qUserVarValueInt(4) == 3) { aSetLevelTimer(200.000000f, 3); @@ -688,8 +686,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/Level6.cpp b/scripts/Level6.cpp index 806a4ab61..996b3da7d 100644 --- a/scripts/Level6.cpp +++ b/scripts/Level6.cpp @@ -2403,8 +2403,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 009: Collectors & Builders Key Correctly Placed if ((ScriptActionCtr_009 < 1) && ((qObjRoom(Object_handles[10]) == Room_indexes[2]) && (qObjRoom(Object_handles[7]) == Room_indexes[3]))) { @@ -2479,8 +2477,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(uservars_as_int); @@ -2832,8 +2828,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 010: Voice Over Intro if ((ScriptActionCtr_010 < 1) && (1)) { aSoundPlaySteaming("VoxL06StartLevel.osf", 1.000000f); @@ -3066,8 +3060,6 @@ int16_t CustomObjectScript_206F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 087: LightningTest if (0 == true) { aLightningCreate(Object_handles[14], Object_handles[15], 10.000000f, 4.000000f, 1, Texture_indexes[0], 0.300000f, @@ -3133,8 +3125,6 @@ int16_t CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 002: DisablePlatformMovement if (1) { aObjGravityEnable(0, data->me_handle); @@ -3145,8 +3135,6 @@ int16_t CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 001: DoStuffWhenPlatformHits if ((ScriptActionCtr_001 < 1) && (qObjRoom(data->me_handle) == Room_indexes[4])) { aSetLevelTimer(0.150000f, 11); @@ -3298,8 +3286,6 @@ int16_t CustomObjectScript_2051::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 051: BlowUpSlagHeap if ((ScriptActionCtr_051 < 1) && (qObjAnimFrame(Object_handles[24]) != 126.000000f)) { aObjDestroy(Object_handles[26]); @@ -3353,8 +3339,6 @@ int16_t CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 026: MessagePlayerSeesBoss if ((ScriptActionCtr_026 < 1) && (1)) { aSetLevelTimer(3.000000f, 6); @@ -3403,8 +3387,6 @@ int16_t CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 068: Start2ndPartCinematicAlt if ((ScriptActionCtr_068 < 2) && (1)) { if (ScriptActionCtr_068 == 0) { @@ -3447,8 +3429,6 @@ int16_t CustomObjectScript_180A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_216E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 097: DroppingRocks01 if ((ScriptActionCtr_097 < 1) && (qObjectPosition(data->me_handle, 1) < -490.000000f)) { aMiscViewerShake(40.000000f); @@ -3467,8 +3447,6 @@ int16_t CustomObjectScript_216E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_3167::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 096: DroppingRocks02 if ((ScriptActionCtr_096 < 1) && (qObjectPosition(data->me_handle, 1) < -490.000000f)) { aMiscViewerShake(40.000000f); @@ -3487,8 +3465,6 @@ int16_t CustomObjectScript_3167::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1964::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 100: DroppingRocks03 if ((ScriptActionCtr_100 < 1) && (qObjectPosition(data->me_handle, 1) < -490.000000f)) { aMiscViewerShake(40.000000f); @@ -3507,8 +3483,6 @@ int16_t CustomObjectScript_1964::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_316A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 099: DroppingRocks04 if ((ScriptActionCtr_099 < 1) && (qObjectPosition(data->me_handle, 1) < -490.000000f)) { aMiscViewerShake(40.000000f); @@ -3527,8 +3501,6 @@ int16_t CustomObjectScript_316A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 098: DroppingRocks05 if ((ScriptActionCtr_098 < 1) && (qObjectPosition(data->me_handle, 1) < -490.000000f)) { aMiscViewerShake(40.000000f); diff --git a/scripts/Level9.cpp b/scripts/Level9.cpp index 8d7f65fd7..f434198ae 100644 --- a/scripts/Level9.cpp +++ b/scripts/Level9.cpp @@ -1603,8 +1603,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1745,8 +1743,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 034: Message for Transmitter if (1) { aShowHUDMessage(Message_strings[1]); @@ -1778,8 +1774,6 @@ int16_t CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 080: MEGA Init if ((ScriptActionCtr_080 < 1) && (1)) { aUserVarSet(5, 2400.000000f); @@ -2108,8 +2102,6 @@ int16_t CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 083: End Level After Camera if ((ScriptActionCtr_083 < 1) && (qUserFlag(2) == true)) { aEndLevel(); @@ -2126,8 +2118,6 @@ int16_t CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; - // Script 059: Recovery-2 Return if ((ScriptActionCtr_059 < 1) && (1)) { aAIGoalFollowPathSimple(data->me_handle, Path_indexes[12], 4352, -1, 3); @@ -2144,8 +2134,6 @@ int16_t CustomObjectScript_18D5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; - // Script 058: Recovery-1 Return if ((ScriptActionCtr_058 < 1) && (1)) { aAIGoalFollowPathSimple(data->me_handle, Path_indexes[12], 4352, -1, 3); @@ -2878,8 +2866,6 @@ int16_t CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 084: Transmitter Give if ((ScriptActionCtr_084 < 1) && (qObjType(qPlayerClosest(data->me_handle, -1)) == 4)) { aAddObjectToInventory(data->me_handle, qPlayerClosest(data->me_handle, -1), 0); @@ -2912,8 +2898,6 @@ int16_t CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 010: EndLevel-Factory if ((ScriptActionCtr_010 < 1) && (qUserFlag(4) == true)) { aStartEndlevelSequencePath(Path_indexes[13], Path_indexes[14], 12.000000f, Message_strings[8]); diff --git a/scripts/LevelS1.cpp b/scripts/LevelS1.cpp index d125ff6b8..ec94fe88e 100644 --- a/scripts/LevelS1.cpp +++ b/scripts/LevelS1.cpp @@ -718,8 +718,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 011: AreasVisited if ((ScriptActionCtr_011 < 1) && (qUserVarValueInt(4) == 3)) { aGoalCompleted(Goal_indexes[3], 1); @@ -751,8 +749,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/Merc02.cpp b/scripts/Merc02.cpp index a0df071c7..ff697725d 100644 --- a/scripts/Merc02.cpp +++ b/scripts/Merc02.cpp @@ -1111,8 +1111,8 @@ bool qBeamHittingPlayer(int beam1_handle, int beam2_handle) { // see if anything is in the way ray_info ray; int flags, fate; - vector start_pos, end_pos, landing_pos; - int start_room, landing_room; + vector start_pos, end_pos; + int start_room; if (!qObjExists(beam1_handle)) return false; @@ -2419,8 +2419,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 050: Check Laser Room 1's Beams if (qUserFlag(14) == false) { if ((qBeamHittingPlayer(Object_handles[31], Object_handles[32]) == true) || @@ -2481,8 +2479,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3604,8 +3600,6 @@ int16_t CustomObjectScript_1119::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 086: Give Closest Player the Infected Data Cartridge if ((ScriptActionCtr_086 < 1) && (qObjType(qPlayerClosest(data->me_handle, 8)) == 4)) { aAddObjectToInventoryNamed(data->me_handle, qPlayerClosest(data->me_handle, 8), Message_strings[1], 0); @@ -4483,8 +4477,6 @@ int16_t CustomObjectScript_0913::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 100: Check Restricted Access Entrance Camera if ((ScriptActionCtr_100 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aSoundPlaySteaming("VoxMerc02FPA1.osf", 1.000000f); @@ -4501,8 +4493,6 @@ int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 101: Check Restricted Hall A Camera 1 if ((ScriptActionCtr_101 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aShowHUDMessage(Message_strings[28]); @@ -4543,8 +4533,6 @@ int16_t CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1111::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 102: Check Restricted Hall A Camera 2 if ((ScriptActionCtr_102 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aShowHUDMessage(Message_strings[28]); @@ -4585,8 +4573,6 @@ int16_t CustomObjectScript_1067::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 103: Check Armory Camera if ((ScriptActionCtr_103 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aShowHUDMessage(Message_strings[28]); @@ -4627,8 +4613,6 @@ int16_t CustomObjectScript_108B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0883::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 104: Check Res Hall C Camera if ((ScriptActionCtr_104 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aShowHUDMessage(Message_strings[28]); @@ -4669,8 +4653,6 @@ int16_t CustomObjectScript_1884::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 105: Check Hall C Camera 1 if ((ScriptActionCtr_105 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aShowHUDMessage(Message_strings[28]); @@ -4711,8 +4693,6 @@ int16_t CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0894::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 106: Check Hall C Camera 2 if ((ScriptActionCtr_106 < 1) && (qSecurityCameraAlerted(data->me_handle) == true)) { aShowHUDMessage(Message_strings[28]); @@ -4826,8 +4806,6 @@ int16_t CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 051: Laser Room 1 Monitor Hit if ((ScriptActionCtr_051 < 1) && (qUserFlag(14) == true)) { aPortalRenderSet(0, 0, Room_indexes[1], 1); @@ -4846,8 +4824,6 @@ int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 040: Laser Room 2 Monitor 1 Hit if ((ScriptActionCtr_040 < 1) && (qUserFlag(13) == true)) { aUserVarInc(4); @@ -4874,8 +4850,6 @@ int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 041: Laser Room 2 Monitor 2 Hit if ((ScriptActionCtr_041 < 1) && (qUserFlag(13) == true)) { aUserVarInc(4); @@ -4902,8 +4876,6 @@ int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 012: Gate Monitor 1 Hit if ((ScriptActionCtr_012 < 1) && (qUserFlag(2) == true)) { aUserVarInc(1); @@ -4930,8 +4902,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 013: Gate Monitor 2 Hit if ((ScriptActionCtr_013 < 1) && (qUserFlag(2) == true)) { aUserVarInc(1); diff --git a/scripts/Merc1.cpp b/scripts/Merc1.cpp index 76fc2ba34..791949a74 100644 --- a/scripts/Merc1.cpp +++ b/scripts/Merc1.cpp @@ -3400,8 +3400,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 197: WallHint (Rookie or Trainee only!) if ((ScriptActionCtr_197 < 1) && ((qRoomHasPlayer(Room_indexes[0]) == true) && (qGetDifficulty() < 2))) { aShowHUDMessage(Message_strings[15]); @@ -3412,8 +3410,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -4105,8 +4101,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVEL_GOAL_COMPLETE: { - tOSIRISEVTLEVELGOALCOMPLETE *event_data = &data->evt_level_goal_complete; - // Script 001: INIT SoftWind if (qGoalCompleted(Goal_indexes[0]) == true) { aSoundPlayObject(Sound_indexes[0], Object_handles[27], 1.000000f); @@ -4207,8 +4201,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 082: INIT Random Ambient Stuff if ((ScriptActionCtr_082 < 1) && (1)) { aObjPlayAnim(Object_handles[0], 1, 3, 2.000000f, 1); @@ -4249,8 +4241,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 053: IntroCamera-1.5 if ((ScriptActionCtr_053 < 1) && (1 == true)) { aMusicSetRegionAll(1); @@ -4271,8 +4261,6 @@ int16_t CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 017: IntroCamera-2 if ((ScriptActionCtr_017 < 1) && (1 == true)) { aObjGhostSet(1, Object_handles[33]); @@ -4294,8 +4282,6 @@ int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 018: IntroCamera-3 if ((ScriptActionCtr_018 < 1) && (1 == true)) { aObjGhostSet(1, Object_handles[34]); @@ -4326,8 +4312,6 @@ int16_t CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0832::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 019: IntroCamera-4 if ((ScriptActionCtr_019 < 1) && (1 == true)) { aRoomSetFog(Room_indexes[8], 0.500000f, 0.150000f, 0.050000f, 1500.000000f); @@ -4357,8 +4341,6 @@ int16_t CustomObjectScript_0832::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0836::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 027: IntroCamera-5 (DISABLED) if ((ScriptActionCtr_027 < 1) && (0 == true)) { aObjGhostSet(0, Object_handles[32]); @@ -4401,8 +4383,6 @@ int16_t CustomObjectScript_0836::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 049: INIT Node 6 if (1) { aObjPlayAnim(data->me_handle, 1, 3, 2.000000f, 1); @@ -4422,8 +4402,6 @@ int16_t CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 048: INIT Node 5 if (1) { aObjPlayAnim(data->me_handle, 1, 3, 2.000000f, 1); @@ -4443,8 +4421,6 @@ int16_t CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0886::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 047: INIT Node 4 if (1) { aObjPlayAnim(data->me_handle, 1, 3, 2.000000f, 1); @@ -4458,8 +4434,6 @@ int16_t CustomObjectScript_0886::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 055: EF1 Part1 if ((ScriptActionCtr_055 < 1) && (1)) { aTurnOnSpew(Object_handles[102], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4481,8 +4455,6 @@ int16_t CustomObjectScript_0886::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 046: INIT Node 3 if (1) { aObjPlayAnim(data->me_handle, 1, 3, 2.000000f, 1); @@ -4496,8 +4468,6 @@ int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 167: EF1 Part2 if ((ScriptActionCtr_167 < 1) && (1)) { aTurnOnSpew(Object_handles[100], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4525,8 +4495,6 @@ int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 045: INIT Node 2 if (1) { aObjPlayAnim(data->me_handle, 1, 3, 2.000000f, 1); @@ -4540,8 +4508,6 @@ int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 168: EF1 Part3 if ((ScriptActionCtr_168 < 1) && (1)) { aTurnOnSpew(Object_handles[98], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4569,8 +4535,6 @@ int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0889::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 044: INIT Node 1 if (1) { aObjPlayAnim(data->me_handle, 1, 3, 2.000000f, 1); @@ -4584,8 +4548,6 @@ int16_t CustomObjectScript_0889::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 169: EF1 Part4 if ((ScriptActionCtr_169 < 1) && (1)) { aTurnOnSpew(Object_handles[97], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4619,8 +4581,6 @@ int16_t CustomObjectScript_188C::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 050: INIT Bomb if (1) { aUserFlagSet(0, 0); @@ -4736,8 +4696,6 @@ int16_t CustomObjectScript_188C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 056: EF1 Part5 if ((ScriptActionCtr_056 < 1) && (1)) { aTurnOnSpew(Object_handles[95], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 20.000000f, @@ -4757,8 +4715,6 @@ int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 170: EF2 Start if (1) { aSetObjectTimer(Object_handles[103], 2.000000f, -1); @@ -4789,8 +4745,6 @@ int16_t CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 179: EFPart8 if ((ScriptActionCtr_179 < 1) && (1)) { aTurnOnSpew(Object_handles[112], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.200000f, 0.200000f, 20.000000f, @@ -4808,8 +4762,6 @@ int16_t CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 178: EFPart7 if ((ScriptActionCtr_178 < 1) && (1)) { aObjKill(Object_handles[113], 1, 2, 2294000, 0.000000f, 0.200000f); @@ -4828,8 +4780,6 @@ int16_t CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 177: EFPart6 if ((ScriptActionCtr_177 < 1) && (1)) { aObjKill(Object_handles[115], 1, 2, 2294000, 0.000000f, 0.700000f); @@ -4851,8 +4801,6 @@ int16_t CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1171::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 176: EFPart5 if ((ScriptActionCtr_176 < 1) && (1)) { aDoorSetPos(Door_handles[5], 1.000000f); @@ -4878,8 +4826,6 @@ int16_t CustomObjectScript_1171::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 175: EFPart4 if ((ScriptActionCtr_175 < 1) && (1)) { aTurnOnSpew(Object_handles[125], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4899,8 +4845,6 @@ int16_t CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 174: EFPart3 if ((ScriptActionCtr_174 < 1) && (1)) { aTurnOnSpew(Object_handles[126], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4920,8 +4864,6 @@ int16_t CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 173: EFPart2 if ((ScriptActionCtr_173 < 1) && (1)) { aTurnOnSpew(Object_handles[127], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4941,8 +4883,6 @@ int16_t CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 172: EFPart1 if ((ScriptActionCtr_172 < 1) && (1)) { aTurnOnSpew(Object_handles[128], -1, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.150000f, 20.000000f, @@ -4962,8 +4902,6 @@ int16_t CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1170::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 180: EF3 Start if (1) { aSetObjectTimer(Object_handles[129], 7.400000f, -1); @@ -5001,8 +4939,6 @@ int16_t CustomObjectScript_1170::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0988::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 189: EF3Part9 if ((ScriptActionCtr_189 < 1) && (1)) { aTurnOnSpew(Object_handles[129], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.150000f, 6.000000f, @@ -5020,8 +4956,6 @@ int16_t CustomObjectScript_0988::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0981::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 188: EF3Part8 if ((ScriptActionCtr_188 < 1) && (1)) { aTurnOnSpew(Object_handles[130], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.300000f, 0.160000f, 6.000000f, @@ -5045,8 +4979,6 @@ int16_t CustomObjectScript_0981::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0980::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 187: EF3Part7 if ((ScriptActionCtr_187 < 1) && (1)) { aObjKill(Object_handles[88], 1, 1, 2162832, 0.650000f, 0.650000f); @@ -5069,8 +5001,6 @@ int16_t CustomObjectScript_0980::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 186: EF3Part6 if ((ScriptActionCtr_186 < 1) && (1)) { aTurnOnSpew(Object_handles[132], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 6.000000f, @@ -5090,8 +5020,6 @@ int16_t CustomObjectScript_097F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 185: EF3Part5 if ((ScriptActionCtr_185 < 1) && (1)) { aTurnOnSpew(Object_handles[133], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 6.000000f, @@ -5111,8 +5039,6 @@ int16_t CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 184: EF3Part4 if ((ScriptActionCtr_184 < 1) && (1)) { aTurnOnSpew(Object_handles[134], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 6.000000f, @@ -5132,8 +5058,6 @@ int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 183: EF3Part3 if ((ScriptActionCtr_183 < 1) && (1)) { aTurnOnSpew(Object_handles[135], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 6.000000f, @@ -5153,8 +5077,6 @@ int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_117B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 182: EF3Part2 if ((ScriptActionCtr_182 < 1) && (1)) { aTurnOnSpew(Object_handles[136], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 6.000000f, @@ -5174,8 +5096,6 @@ int16_t CustomObjectScript_117B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 181: EF3Part1 if ((ScriptActionCtr_181 < 1) && (1)) { aTurnOnSpew(Object_handles[137], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.200000f, 6.000000f, @@ -5195,8 +5115,6 @@ int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1984::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 198: EF4 Start if ((ScriptActionCtr_198 < 1) && (1)) { aObjSetLightingDist(Object_handles[143], 140.000000f); @@ -5223,8 +5141,6 @@ int16_t CustomObjectScript_1984::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 072: INIT LNipple 5 if (1) { aObjGhostSet(1, Object_handles[149]); @@ -5237,8 +5153,6 @@ int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 064: Lightning Nipple 5 if (1) { aMiscShakeArea(data->me_handle, 40.000000f, 250.000000f); @@ -5263,8 +5177,6 @@ int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 071: INIT LNipple 4 if (1) { aObjGhostSet(1, Object_handles[151]); @@ -5277,8 +5189,6 @@ int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 063: Lightning Nipple 4 if (1) { aMiscShakeArea(data->me_handle, 40.000000f, 250.000000f); @@ -5303,8 +5213,6 @@ int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 070: INIT LNipple 3 if (1) { aObjGhostSet(1, Object_handles[153]); @@ -5317,8 +5225,6 @@ int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 062: Lightning Nipple 3 if (1) { aMiscShakeArea(data->me_handle, 40.000000f, 250.000000f); @@ -5343,8 +5249,6 @@ int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 069: INIT LNipple 2 if (1) { aObjGhostSet(1, Object_handles[155]); @@ -5357,8 +5261,6 @@ int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 061: Lightning Nipple 2 if (1) { aMiscShakeArea(data->me_handle, 40.000000f, 250.000000f); @@ -5383,8 +5285,6 @@ int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 058: INIT LNipple 1 if (1) { aObjGhostSet(1, Object_handles[157]); @@ -5397,8 +5297,6 @@ int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 057: Lightning Nipple 1 if (1) { aMiscShakeArea(data->me_handle, 40.000000f, 250.000000f); @@ -5423,8 +5321,6 @@ int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 068: Lightning Ball 5 if (1) { if (qObjCanSeePlayerAdvancedWithStore(4, 360, data->me_handle, 160.000000f, 1024) == true) { @@ -5456,8 +5352,6 @@ int16_t CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 067: Lightning Ball 4 if (1) { if (qObjCanSeePlayerAdvancedWithStore(4, 360, data->me_handle, 160.000000f, 1024) == true) { @@ -5489,8 +5383,6 @@ int16_t CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_089F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 066: Lightning Ball 3 if (1) { if (qObjCanSeePlayerAdvancedWithStore(4, 360, data->me_handle, 160.000000f, 1024) == true) { @@ -5522,8 +5414,6 @@ int16_t CustomObjectScript_089F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_109E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 065: Lightning Ball 2 if (1) { if (qObjCanSeePlayerAdvancedWithStore(4, 360, data->me_handle, 160.000000f, 1024) == true) { @@ -5555,8 +5445,6 @@ int16_t CustomObjectScript_109E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_109C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 059: Lightning Ball 1 if (1) { if (qObjCanSeePlayerAdvancedWithStore(4, 360, data->me_handle, 160.000000f, 1024) == true) { @@ -5623,8 +5511,6 @@ int16_t CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18A6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 081: HangExplodeMe 8 if ((ScriptActionCtr_081 < 1) && (1)) { aObjKill(Object_handles[176], 1, 1, 2097392, 3.000000f, 3.000000f); @@ -5642,8 +5528,6 @@ int16_t CustomObjectScript_18A6::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 080: HangExplodeMe 7 if ((ScriptActionCtr_080 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5661,8 +5545,6 @@ int16_t CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18A4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 079: HangExplodeMe 6 if ((ScriptActionCtr_079 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5680,8 +5562,6 @@ int16_t CustomObjectScript_18A4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18A7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 078: HangExplodeMe 5 if ((ScriptActionCtr_078 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5699,8 +5579,6 @@ int16_t CustomObjectScript_18A7::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18A9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 077: HangExplodeMe 4 if ((ScriptActionCtr_077 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5718,8 +5596,6 @@ int16_t CustomObjectScript_18A9::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 076: HangExplodeMe 3 if ((ScriptActionCtr_076 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5737,8 +5613,6 @@ int16_t CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 075: HangExplodeMe 2 if ((ScriptActionCtr_075 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5756,8 +5630,6 @@ int16_t CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18A8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 074: HangExplodeMe 1 if ((ScriptActionCtr_074 < 1) && (1)) { aObjKill(data->me_handle, 1, 1, 2097392, 1.000000f, 1.000000f); @@ -5789,8 +5661,6 @@ int16_t CustomObjectScript_08DA::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 096: INIT CityHS Guard-12 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -5822,8 +5692,6 @@ int16_t CustomObjectScript_08D9::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 095: INIT CityHS Guard-11 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -5855,8 +5723,6 @@ int16_t CustomObjectScript_08D8::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 094: INIT CityHS Guard-10 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -5888,8 +5754,6 @@ int16_t CustomObjectScript_08D7::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 093: INIT CityHS Guard-9 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -5921,8 +5785,6 @@ int16_t CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 092: INIT CityHS Guard-8 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -5954,8 +5816,6 @@ int16_t CustomObjectScript_08D5::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 091: INIT CityHS Guard-7 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -5987,8 +5847,6 @@ int16_t CustomObjectScript_08D4::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 090: INIT CityHS Guard-6 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -6020,8 +5878,6 @@ int16_t CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 089: INIT CityHS Guard-5 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -6053,8 +5909,6 @@ int16_t CustomObjectScript_08D2::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 088: INIT CityHS Guard-4 if (1) { aAISetTeam(196608, data->me_handle); @@ -6086,8 +5940,6 @@ int16_t CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 087: INIT CityHS Guard-3 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -6119,8 +5971,6 @@ int16_t CustomObjectScript_08D0::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 086: INIT CityHS Guard-2 if (1) { aAISetMaxSpeed(data->me_handle, 0.000000f); @@ -6152,8 +6002,6 @@ int16_t CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 085: INIT CityHS Guard-1 if (1) { aAISetTeam(196608, data->me_handle); @@ -6417,8 +6265,6 @@ int16_t CustomObjectScript_402F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 138: Pissed off CoolGuards if ((ScriptActionCtr_138 < 1) && (1)) { aSetObjectTimer(Object_handles[241], 2.000000f, -1); @@ -6449,8 +6295,6 @@ int16_t CustomObjectScript_091A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 137: Pissed off Guard-3 if ((ScriptActionCtr_137 < 1) && (1)) { aAISetTeam(0, data->me_handle); @@ -6482,8 +6326,6 @@ int16_t CustomObjectScript_0919::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 136: Pissed off Guard-2 if ((ScriptActionCtr_136 < 1) && (1)) { aAISetTeam(0, data->me_handle); @@ -6515,8 +6357,6 @@ int16_t CustomObjectScript_0918::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 131: Pissed off Guard-1 if ((ScriptActionCtr_131 < 1) && (1)) { aAISetTeam(0, data->me_handle); @@ -6554,8 +6394,6 @@ int16_t CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0925::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 156: INIT Goofy Threshers-8 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6569,8 +6407,6 @@ int16_t CustomObjectScript_0925::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 149: Goofy Thresher Attack-8 if ((ScriptActionCtr_149 < 1) && (1)) { aObjDelete(Object_handles[244]); @@ -6592,8 +6428,6 @@ int16_t CustomObjectScript_0925::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0924::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 155: INIT Goofy Threshers-7 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6607,8 +6441,6 @@ int16_t CustomObjectScript_0924::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 148: Goofy Thresher Attack-7 if ((ScriptActionCtr_148 < 1) && (1)) { aObjDelete(Object_handles[245]); @@ -6630,8 +6462,6 @@ int16_t CustomObjectScript_0924::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 154: INIT Goofy Threshers-6 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6645,8 +6475,6 @@ int16_t CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 147: Goofy Thresher Attack-6 if ((ScriptActionCtr_147 < 1) && (1)) { aObjDelete(Object_handles[246]); @@ -6668,8 +6496,6 @@ int16_t CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0922::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 153: INIT Goofy Threshers-5 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6683,8 +6509,6 @@ int16_t CustomObjectScript_0922::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 146: Goofy Thresher Attack-5 if ((ScriptActionCtr_146 < 1) && (1)) { aObjDelete(Object_handles[247]); @@ -6706,8 +6530,6 @@ int16_t CustomObjectScript_0922::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0921::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 152: INIT Goofy Threshers-4 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6721,8 +6543,6 @@ int16_t CustomObjectScript_0921::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 145: Goofy Thresher Attack-4 if ((ScriptActionCtr_145 < 1) && (1)) { aObjDelete(Object_handles[248]); @@ -6744,8 +6564,6 @@ int16_t CustomObjectScript_0921::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1120::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 151: INIT Goofy Threshers-3 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6759,8 +6577,6 @@ int16_t CustomObjectScript_1120::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 144: Goofy Thresher Attack-3 if ((ScriptActionCtr_144 < 1) && (1)) { aObjDelete(Object_handles[249]); @@ -6782,8 +6598,6 @@ int16_t CustomObjectScript_1120::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_111F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 150: INIT Goofy Threshers-2 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6797,8 +6611,6 @@ int16_t CustomObjectScript_111F::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 143: Goofy Thresher Attack-2 if ((ScriptActionCtr_143 < 1) && (1)) { aObjDelete(Object_handles[250]); @@ -6820,8 +6632,6 @@ int16_t CustomObjectScript_111F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_111E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 139: INIT Goofy Threshers-1 if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -6835,8 +6645,6 @@ int16_t CustomObjectScript_111E::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 140: Goofy Thresher Attack-1 if ((ScriptActionCtr_140 < 1) && (1)) { aObjDelete(Object_handles[251]); @@ -6858,8 +6666,6 @@ int16_t CustomObjectScript_111E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_112E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 142: Ambush! if ((ScriptActionCtr_142 < 1) && (qObjCanSeePlayer(360, Object_handles[252], 140.000000f) == true)) { aGoalEnableDisable(1, Goal_indexes[7]); @@ -6975,8 +6781,6 @@ int16_t CustomObjectScript_0931::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 159: INIT GarbageFires if ((ScriptActionCtr_159 < 1) && ((ScriptActionCtr_142 > 0) == true)) { aObjSetLightingDist(Object_handles[143], 140.000000f); @@ -7022,8 +6826,6 @@ int16_t CustomObjectScript_0967::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 166: LastAmbush Part2 if ((ScriptActionCtr_166 < 1) && (1)) { aGoalCompleted(Goal_indexes[8], 1); @@ -7067,8 +6869,6 @@ int16_t CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 165: LastAmbush if ((ScriptActionCtr_165 < 1) && (1)) { aSoundPlayObject(Sound_indexes[14], Object_handles[269], 1.000000f); @@ -7425,8 +7225,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 199: Final Countdown 3 Alternate if ((ScriptActionCtr_199 < 1) && ((ScriptActionCtr_192 > 0) == false)) { aSoundPlaySteaming("VoxMerc1Terminated.osf", 1.000000f); @@ -7448,8 +7246,6 @@ int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 196: ReachedWasteDisposal if ((ScriptActionCtr_196 < 1) && ((qUserFlag(0) == true) && (1))) { aGoalCompleted(Goal_indexes[4], 1); @@ -7469,8 +7265,6 @@ int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 127: HiddenEntry Side12 if ((ScriptActionCtr_127 < 1) && ((ScriptActionCtr_126 > 0) == false)) { aAIGoalFollowPathSimple(Object_handles[231], Path_indexes[34], 4352, -1, 0); @@ -7489,8 +7283,6 @@ int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 126: HiddenEntry Side11 if ((ScriptActionCtr_126 < 1) && ((ScriptActionCtr_127 > 0) == false)) { aAIGoalFollowPathSimple(Object_handles[231], Path_indexes[34], 4352, -1, 0); @@ -7509,8 +7301,6 @@ int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 129: HiddenEntry Side22 if ((ScriptActionCtr_129 < 1) && ((ScriptActionCtr_128 > 0) == false)) { aAIGoalFollowPathSimple(Object_handles[230], Path_indexes[36], 4352, -1, 0); @@ -7530,8 +7320,6 @@ int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 128: HiddenEntry Side21 if ((ScriptActionCtr_128 < 1) && ((ScriptActionCtr_129 > 0) == false)) { aAIGoalFollowPathSimple(Object_handles[230], Path_indexes[36], 4352, -1, 0); diff --git a/scripts/Merc3.cpp b/scripts/Merc3.cpp index b040dd902..3f14653f5 100644 --- a/scripts/Merc3.cpp +++ b/scripts/Merc3.cpp @@ -1952,8 +1952,8 @@ bool qBeamHittingPlayer(int beam1_handle, int beam2_handle, float radius) { // see if anything is in the way ray_info ray; int flags, fate; - vector start_pos, end_pos, landing_pos; - int start_room, landing_room; + vector start_pos, end_pos; + int start_room; Obj_Value(beam1_handle, VF_GET, OBJV_V_POS, &start_pos); Obj_Value(beam1_handle, VF_GET, OBJV_I_ROOMNUM, &start_room); @@ -2007,8 +2007,8 @@ bool qBeamHittingPlayer2(int beam1_handle, int beam2_handle, float radius) { // see if anything is in the way ray_info ray; int flags, fate; - vector start_pos, end_pos, landing_pos; - int start_room, landing_room; + vector start_pos, end_pos; + int start_room; Obj_Value(beam1_handle, VF_GET, OBJV_V_POS, &start_pos); Obj_Value(beam1_handle, VF_GET, OBJV_I_ROOMNUM, &start_room); @@ -4158,8 +4158,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 013: Level INIT (Inventory) if ((ScriptActionCtr_013 < 1) && (1)) { aAddObjectToInventoryNamed(Object_handles[23], qPlayerClosest(Object_handles[23], -1), Message_strings[0], 0); @@ -4191,8 +4189,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -5912,8 +5908,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVEL_GOAL_COMPLETE: { - tOSIRISEVTLEVELGOALCOMPLETE *event_data = &data->evt_level_goal_complete; - // Script 113: Level OBJECTIVE: Check if all Bombs Planted if ((ScriptActionCtr_113 < 1) && ((qGoalCompleted(Goal_indexes[7]) == true) && (qGoalCompleted(Goal_indexes[9]) == true) && @@ -5942,8 +5936,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B83::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 133: Level START (Intro Cinematic Cut 2) if (1) { aObjPlayAnim(Object_handles[25], 0, 140, 24.000000f, 0); @@ -5968,8 +5960,6 @@ int16_t CustomObjectScript_0B83::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B85::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 134: Level START (Intro Cinematic Cut 3) if (1) { aStoreObjectInPositionClipboard(Object_handles[28]); @@ -6810,8 +6800,6 @@ int16_t CustomObjectScript_50FF::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 032: Hazardous Waste: Guard Movie Cut 2 if (1) { aUserVarInc(1); @@ -6838,8 +6826,6 @@ int16_t CustomObjectScript_50FF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0987::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 033: Hazardous Waste: Guard Movie Cut 3 if (qUserVarValueInt(1) < 5) { aUserVarInc(1); @@ -6869,8 +6855,6 @@ int16_t CustomObjectScript_0987::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0989::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 034: Hazardous Waste: Guard Movie Cut 4 if (qUserVarValueInt(1) < 6) { aUserVarInc(1); @@ -7501,8 +7485,6 @@ int16_t CustomObjectScript_0983::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 166: NewCaptain: PowerUp if ((ScriptActionCtr_166 < 1) && (1)) { aObjMakeVulnerable(Object_handles[19]); @@ -7522,8 +7504,6 @@ int16_t CustomObjectScript_0983::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1BB9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 182: New Captain: Ghost if ((qObjShields(Object_handles[19]) > 0.000000f) && (qObjExists(Object_handles[19]) == true)) { aEmitSparks(30.000000f, Object_handles[19]); @@ -7545,8 +7525,6 @@ int16_t CustomObjectScript_1BB9::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_13AD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 183: New Captain: Move to New Spot And Spark if ((qObjShields(Object_handles[19]) > 0.000000f) && (qObjExists(Object_handles[19]) == true)) { aUserVarSet(22, qRandomValue(0.000000f, 9.500000f)); @@ -7612,8 +7590,6 @@ int16_t CustomObjectScript_13AD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_13AC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 184: New Captain: UnCloak/UnGhost if ((qObjShields(Object_handles[19]) > 0.000000f) && (qObjExists(Object_handles[19]) == true)) { aMiscShakeArea(Object_handles[19], 40.000000f, 200.000000f); @@ -7634,8 +7610,6 @@ int16_t CustomObjectScript_13AC::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_13AB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 185: New Captain: FireWeapon if ((qObjShields(Object_handles[19]) > 0.000000f) && (qObjExists(Object_handles[19]) == true)) { if (qRandomChance(0.300000f) == true) { @@ -7659,8 +7633,6 @@ int16_t CustomObjectScript_13AB::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_13AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 186: New Captain: Cloak if ((qObjShields(Object_handles[19]) > 0.000000f) && (qObjExists(Object_handles[19]) == true)) { aSoundPlayObject(Sound_indexes[10], Object_handles[19], 1.000000f); @@ -7679,8 +7651,6 @@ int16_t CustomObjectScript_13AA::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0A2E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 097: Captain Gadget: Intro Cinematic Cut 3 if (1) { aStoreObjectInPositionClipboard(Object_handles[165]); @@ -7707,8 +7677,6 @@ int16_t CustomObjectScript_0A2E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0A30::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 098: Captain Gadget: Intro Cinematic Cut 4 if (1) { aStoreObjectInPositionClipboard(Object_handles[167]); @@ -7833,8 +7801,6 @@ int16_t CustomObjectScript_0982::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 196: First Mate: All Destroyed if (1) { aDoorLockUnlock(0, Door_handles[8]); @@ -7856,8 +7822,6 @@ int16_t CustomObjectScript_0982::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_12DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 187: First Mate: Entered Room if ((ScriptActionCtr_187 < 1) && (1)) { aCloakObject(Object_handles[22], 99999.000000f); @@ -7886,8 +7850,6 @@ int16_t CustomObjectScript_12DF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_12E1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 202: First Mate: Ghost (one time) if ((ScriptActionCtr_202 < 1) && (1)) { aObjGhostSet(1, Object_handles[22]); @@ -7929,8 +7891,6 @@ int16_t CustomObjectScript_12E1::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_12DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 190: First Mate: ChooseUnWiggle if (1) { aUserVarSet(24, qRandomValue(0.000000f, 5.000000f)); @@ -8005,8 +7965,6 @@ int16_t CustomObjectScript_1289::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 191: First Mate: Timer 1 if (1) { if ((qUserVarValue(24) > 1.000000f) && (1)) { @@ -8048,8 +8006,6 @@ int16_t CustomObjectScript_1290::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 195: First Mate: Timer 5 if (1) { if ((qUserVarValue(24) <= 4.000000f) && (1)) { @@ -8091,8 +8047,6 @@ int16_t CustomObjectScript_128E::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 194: First Mate: Timer 4 if (1) { if ((qUserVarValue(24) > 4.000000f) || (qUserVarValue(24) <= 3.000000f)) { @@ -8134,8 +8088,6 @@ int16_t CustomObjectScript_128C::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 193: First Mate: Timer 3 if (1) { if ((qUserVarValue(24) > 3.000000f) || (qUserVarValue(24) <= 2.000000f)) { @@ -8177,8 +8129,6 @@ int16_t CustomObjectScript_128A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 192: First Mate: Timer 2 if (1) { if ((qUserVarValue(24) > 2.000000f) || (qUserVarValue(24) <= 1.000000f)) { @@ -8254,8 +8204,6 @@ int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B86::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 130: Captain and Trooper Cinematic if (1) { aStoreObjectInPositionClipboard(Object_handles[206]); @@ -8280,8 +8228,6 @@ int16_t CustomObjectScript_0B86::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B80::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 131: Captain and Trooper Cinematic Cut 2 if (1) { aStoreObjectInPositionClipboard(Object_handles[208]); @@ -8305,8 +8251,6 @@ int16_t CustomObjectScript_0B80::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B82::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 148: Captain and Trooper Cinematic Done if (1) { aObjGhostSet(1, Object_handles[7]); @@ -8348,8 +8292,6 @@ int16_t CustomObjectScript_109F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1153::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 155: Escape Chute: Junction End Cinematic if (1) { aSetLevelTimer(1.500000f, 43); @@ -8574,8 +8516,6 @@ int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 030: Hazardous Waste: Guard Movie if ((ScriptActionCtr_030 < 1) && (1)) { aUserVarSet(1, 1.000000f); @@ -8697,8 +8637,6 @@ int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 072: Shark Security 0: Activate Guard AI if ((ScriptActionCtr_072 < 1) && (1)) { aAISetState(1, Object_handles[15]); @@ -8722,8 +8660,6 @@ int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 051: Level Sequencing: Lower Station Lockdown if ((ScriptActionCtr_051 < 1) && (1)) { aObjPlayAnim(Object_handles[101], 0, 1, qUserVarValue(6), 0); @@ -8821,8 +8757,6 @@ int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 094: Captain Gadget: Intro Cinematic Cut 1 - Old if ((ScriptActionCtr_094 < 1) && (1 == false)) { aComplexCinematicStart(); @@ -8901,8 +8835,6 @@ int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 180: First Mate: INTRO if ((ScriptActionCtr_180 < 1) && (1)) { aCinematicSimple(Path_indexes[21], Message_strings[52], Object_handles[22], 6.000000f, 1); @@ -8922,8 +8854,6 @@ int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 129: Captain and Trooper Init Cinematic if ((ScriptActionCtr_129 < 1) && (1)) { aSetLevelTimer(3.000000f, 34); @@ -9003,8 +8933,6 @@ int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 152: Exit if ((ScriptActionCtr_152 < 1) && (1)) { aStartEndlevelSequence(Object_handles[213], Path_indexes[26], 8.000000f, Message_strings[2]); diff --git a/scripts/Merc4.cpp b/scripts/Merc4.cpp index ac2c2352f..f6c2928f7 100644 --- a/scripts/Merc4.cpp +++ b/scripts/Merc4.cpp @@ -859,7 +859,7 @@ void aKillBotsNearObj(int objhandle) { int type; int scan_objs[MAX_SCAN_OBJECTS]; int n_scan; - int n, i; + int i; uint16_t id; if (!qObjExists(objhandle)) @@ -926,7 +926,6 @@ void aClearTeleporterArea(int desthandle, int objhandle) { vector pos; matrix orient; int type; - int n, i; if (!qObjExists(objhandle)) return; @@ -1872,8 +1871,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 018: Check if any Maws have been broken if (qUserFlag(18) == false) { if ((qUserFlag(3) == false) && (qPortalIsOn(1, Room_indexes[13]) == false)) { @@ -1933,8 +1930,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/Merc6.cpp b/scripts/Merc6.cpp index 70778578f..fca85abcb 100644 --- a/scripts/Merc6.cpp +++ b/scripts/Merc6.cpp @@ -1947,8 +1947,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 066: Check Number of Welders Killed if ((ScriptActionCtr_066 < 1) && (qUserVarValueInt(4) == 4)) { aGoalCompleted(Goal_indexes[0], 1); @@ -2002,8 +2000,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -2998,8 +2994,6 @@ int16_t CustomObjectScript_783F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1084::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DAMAGED: { - tOSIRISEVTDAMAGED *event_data = &data->evt_damaged; - // Script 077: Crate #1 Damaged if (qUserFlag(15) == true) { if (qRandomValue(1.000000f, 100.000000f) < 50.000000f) { @@ -3039,8 +3033,6 @@ int16_t CustomObjectScript_1084::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DAMAGED: { - tOSIRISEVTDAMAGED *event_data = &data->evt_damaged; - // Script 079: Crate #2 Damaged if (qUserFlag(15) == true) { if (qRandomValue(1.000000f, 100.000000f) < 50.000000f) { @@ -3080,8 +3072,6 @@ int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1086::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DAMAGED: { - tOSIRISEVTDAMAGED *event_data = &data->evt_damaged; - // Script 080: Crate #3 Damaged if (qUserFlag(15) == true) { if (qRandomValue(1.000000f, 100.000000f) < 50.000000f) { @@ -3376,8 +3366,6 @@ int16_t CustomObjectScript_108E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1827::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 039: Reactor dies if ((ScriptActionCtr_039 < 1) && (qObjShields(data->me_handle) <= 0.000000f)) { aObjPlayAnim(data->me_handle, 0, 0, 1.000000f, 0); diff --git a/scripts/Merc7.cpp b/scripts/Merc7.cpp index b7bfeab7c..011fa9580 100644 --- a/scripts/Merc7.cpp +++ b/scripts/Merc7.cpp @@ -3328,8 +3328,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 037: Start Bomb Sequence if ((ScriptActionCtr_037 < 1) && ((qUserFlag(7) == true) && (qRoomHasPlayer(Room_indexes[11]) == true))) { aGoalCompleted(Goal_indexes[4], 1); @@ -3343,8 +3341,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3878,8 +3874,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 088: IntroCam-2 if ((ScriptActionCtr_088 < 1) && (1)) { aCinematicSimple(Path_indexes[1], Message_strings[1], Object_handles[5], 9.000000f, 1); @@ -3896,8 +3890,6 @@ int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0884::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 089: IntroCam-3 if ((ScriptActionCtr_089 < 1) && (1)) { aTurnOnSpew(Object_handles[6], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.100000f, 0.100000f, -1.000000f, 3.000000f, @@ -4168,8 +4160,6 @@ int16_t CustomObjectScript_1031::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0833::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 018: ElevDroids MakeNew if (1) { if (qRandomChance(0.500000f) == true) { @@ -4191,8 +4181,6 @@ int16_t CustomObjectScript_0833::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 010: ElevLoPart2 if (1) { aMiscShakeArea(data->me_handle, 30.000000f, 300.000000f); @@ -4215,8 +4203,6 @@ int16_t CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 011: ElevLoPart3 if (1) { aPortalRenderSet(0, 1, Room_indexes[3], 1); @@ -4240,8 +4226,6 @@ int16_t CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 014: ElevLoPart4 if (1) { aTurnOnSpew(Object_handles[56], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 8.000000f, 3.000000f, @@ -4271,8 +4255,6 @@ int16_t CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 015: ElevLoPart5 if (1) { aPortalRenderSet(0, 1, Room_indexes[5], 1); @@ -4290,8 +4272,6 @@ int16_t CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 060: ElevHiUpPart2 if (1) { aMiscShakeArea(data->me_handle, 30.000000f, 300.000000f); @@ -4314,8 +4294,6 @@ int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 061: ElevHiUpPart3 if (1) { aPortalRenderSet(0, 1, Room_indexes[2], 1); @@ -4339,8 +4317,6 @@ int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 062: ElevHiUpPart4 if (1) { aTurnOnSpew(Object_handles[59], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 8.000000f, 3.000000f, @@ -4370,8 +4346,6 @@ int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0962::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 063: ElevHiUpPart5 if (1) { aPortalRenderSet(0, 0, Room_indexes[7], 1); @@ -4389,8 +4363,6 @@ int16_t CustomObjectScript_0962::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 067: ElevDroids Make AnotherTower if (1) { aSetObjectTimer(Object_handles[61], 40.000000f, -1); @@ -4408,8 +4380,6 @@ int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0963::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 101: ElevHiDnPart2 if (1) { aMiscShakeArea(data->me_handle, 30.000000f, 300.000000f); @@ -4432,8 +4402,6 @@ int16_t CustomObjectScript_0963::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0964::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 102: ElevHiDnPart3 if (1) { aPortalRenderSet(0, 1, Room_indexes[1], 1); @@ -4457,8 +4425,6 @@ int16_t CustomObjectScript_0964::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0965::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 103: ElevHiDnPart4 if (1) { aTurnOnSpew(Object_handles[64], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 8.000000f, 3.000000f, @@ -4488,8 +4454,6 @@ int16_t CustomObjectScript_0965::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 104: ElevHiDnPart5 if (1) { aPortalRenderSet(0, 0, Room_indexes[9], 1); @@ -4507,8 +4471,6 @@ int16_t CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0995::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 031: FIRE! if (((ScriptActionCtr_027 > 0) == true) && ((ScriptActionCtr_026 > 0) == true) && ((ScriptActionCtr_025 > 0) == true) && ((ScriptActionCtr_023 > 0) == true)) { @@ -4535,8 +4497,6 @@ int16_t CustomObjectScript_0995::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0994::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 030: Napalm Box Fire 2B if (1) { aSetObjectOnFire(data->me_handle, 99999.000000f, 0.000000f); @@ -4557,8 +4517,6 @@ int16_t CustomObjectScript_0994::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0993::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 029: Napalm Box Fire 2A if (1) { aSetObjectOnFire(data->me_handle, 99999.000000f, 0.000000f); @@ -4579,8 +4537,6 @@ int16_t CustomObjectScript_0993::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 028: Napalm Box Fire 1B if (1) { aSetObjectOnFire(data->me_handle, 99999.000000f, 0.000000f); @@ -4601,8 +4557,6 @@ int16_t CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1191::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 024: Napalm Box Fire 1A if (1) { aSetObjectOnFire(data->me_handle, 99999.000000f, 0.000000f); @@ -4723,8 +4677,6 @@ int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 112: FireOut! if (1) { aSoundStopObj(Object_handles[68]); @@ -4743,8 +4695,6 @@ int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0997::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 109: DroidsFoughtFireGoHome 2 if ((ScriptActionCtr_109 < 1) && (1)) { aSetObjectTimer(Object_handles[81], 3.000000f, -1); @@ -4806,8 +4756,6 @@ int16_t CustomObjectScript_0997::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0996::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 035: DroidsFoughtFireGoHome 1 if ((ScriptActionCtr_035 < 1) && (1)) { aSetObjectTimer(Object_handles[81], 3.000000f, -1); @@ -5059,8 +5007,6 @@ int16_t CustomObjectScript_1834::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 022: End Boss - Cinematic End if ((ScriptActionCtr_022 < 1) && (1)) { aShowHUDMessage(Message_strings[11]); @@ -5078,8 +5024,6 @@ int16_t CustomObjectScript_1834::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1877::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 046: Suzuki Cam 3 if ((ScriptActionCtr_046 < 1) && (1)) { aObjPlayAnim(Object_handles[116], 0, 54, 6.000000f, 0); @@ -5097,8 +5041,6 @@ int16_t CustomObjectScript_1877::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1078::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 049: Suzuki Cam 2 if ((ScriptActionCtr_049 < 1) && (1)) { aStoreObjectInPositionClipboard(Object_handles[120]); @@ -5118,8 +5060,6 @@ int16_t CustomObjectScript_1078::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1070::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 048: Suzuki Cam 4 if ((ScriptActionCtr_048 < 1) && (1)) { aObjGhostSet(0, Object_handles[108]); @@ -5148,8 +5088,6 @@ int16_t CustomObjectScript_1070::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2075::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 077: Suzuki Cam 4 Part0 if (1) { aEmitSparks(50.000000f, data->me_handle); @@ -5174,8 +5112,6 @@ int16_t CustomObjectScript_2075::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2076::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 057: Suzuki Cam 4 Part4 if (1) { aTurnOnSpew(Object_handles[124], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.300000f, 0.100000f, 10.000000f, @@ -5201,8 +5137,6 @@ int16_t CustomObjectScript_2076::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 056: Suzuki Cam 4 Part3 if (1) { aObjKill(data->me_handle, 1, 2, 2293876, 1.900000f, 1.900000f); @@ -5229,8 +5163,6 @@ int16_t CustomObjectScript_2863::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_207A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 055: Suzuki Cam 4 Part2 if (1) { aObjKill(data->me_handle, 1, 2, 2293876, 1.900000f, 1.900000f); @@ -5253,8 +5185,6 @@ int16_t CustomObjectScript_207A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 054: Suzuki Cam 4 Part1 if (1) { aObjSetLightingDist(Object_handles[111], 80.000000f); @@ -5275,8 +5205,6 @@ int16_t CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1079::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 047: Suzuki Cam 5 if ((ScriptActionCtr_047 < 1) && (1)) { aSetObjectTimer(Object_handles[131], 2.500000f, -1); @@ -5302,8 +5230,6 @@ int16_t CustomObjectScript_1079::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09BF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 076: Suzuki Cam 5 Part4 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.300000f, 0.100000f, 5.000000f, 8.000000f, @@ -5321,8 +5247,6 @@ int16_t CustomObjectScript_09BF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 071: Suzuki Cam 5 Part3 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.300000f, 0.100000f, 5.000000f, 10.000000f, @@ -5340,8 +5264,6 @@ int16_t CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 070: Suzuki Cam 5 Part2 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.300000f, 0.100000f, 5.000000f, 30.000000f, @@ -5361,8 +5283,6 @@ int16_t CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 069: Suzuki Cam 5 Part1 if (1) { aObjSetMovementType(Object_handles[116], 1); @@ -5385,8 +5305,6 @@ int16_t CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 051: Suzuki Cam 6 if ((ScriptActionCtr_051 < 1) && (1)) { aMiscViewerShake(100.000000f); @@ -5425,8 +5343,6 @@ int16_t CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09CA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 086: Suzuki Cam 6 Part10 if (1) { aTurnOnSpew(Object_handles[148], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 5.000000f, @@ -5450,8 +5366,6 @@ int16_t CustomObjectScript_09CA::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 085: Suzuki Cam 6 Part9 if (1) { aTurnOnSpew(Object_handles[149], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.120000f, 5.000000f, @@ -5475,8 +5389,6 @@ int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 084: Suzuki Cam 6 Part8 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.090000f, 3.000000f, 18.000000f, @@ -5496,8 +5408,6 @@ int16_t CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 083: Suzuki Cam 6 Part7 if (1) { aTurnOnSpew(Object_handles[139], -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.140000f, 4.000000f, @@ -5523,8 +5433,6 @@ int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 082: Suzuki Cam 6 Part6 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.090000f, 3.000000f, 18.000000f, @@ -5544,8 +5452,6 @@ int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 081: Suzuki Cam 6 Part5 if (1) { if ((qObjExists(qObjSavedHandle(4)) == true) && (1)) { @@ -5570,8 +5476,6 @@ int16_t CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 080: Suzuki Cam 6 Part3 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 3.000000f, 20.000000f, @@ -5591,8 +5495,6 @@ int16_t CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 079: Suzuki Cam 6 Part2 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.120000f, 3.000000f, 12.000000f, @@ -5612,8 +5514,6 @@ int16_t CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 078: Suzuki Cam 6 Part1 if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 1.300000f, 0.120000f, 4.000000f, 25.000000f, @@ -5633,8 +5533,6 @@ int16_t CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_286E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 073: Suzuki Post Production if (1) { aGoalCompleted(Goal_indexes[5], 1); @@ -5656,8 +5554,6 @@ int16_t CustomObjectScript_286E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 001: BST Patrols (Mnt) if ((ScriptActionCtr_001 < 1) && (1)) { aAIGoalFollowPathSimple(Object_handles[12], Path_indexes[7], 6295809, -1, 0); @@ -5701,8 +5597,6 @@ int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 005: ElevDroids PlayerIsHere if ((ScriptActionCtr_005 < 1) && (1)) { aSetObjectTimer(Object_handles[52], 40.000000f, 0); @@ -5720,8 +5614,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 064: ElevDroids PlayerInTower if ((ScriptActionCtr_064 < 1) && (1)) { aObjDelete(qObjSavedHandle(6)); diff --git a/scripts/Mysterious_Isle.cpp b/scripts/Mysterious_Isle.cpp index 28eea1548..555f47fa3 100644 --- a/scripts/Mysterious_Isle.cpp +++ b/scripts/Mysterious_Isle.cpp @@ -852,8 +852,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1014,8 +1012,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_481D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 011: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.500000f, 0.050000f, -1.000000f, 4.000000f, @@ -1033,8 +1029,6 @@ int16_t CustomObjectScript_481D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 010: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.500000f, 0.050000f, -1.000000f, 4.000000f, @@ -1052,8 +1046,6 @@ int16_t CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 009: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.500000f, 0.050000f, -1.000000f, 4.000000f, @@ -1071,8 +1063,6 @@ int16_t CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 012: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.500000f, 0.050000f, -1.000000f, 4.000000f, @@ -1090,8 +1080,6 @@ int16_t CustomObjectScript_1022::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 008: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.500000f, 0.050000f, -1.000000f, 4.000000f, @@ -1109,8 +1097,6 @@ int16_t CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 007: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.400000f, 0.060000f, -1.000000f, 4.000000f, @@ -1128,8 +1114,6 @@ int16_t CustomObjectScript_1020::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1823::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 006: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.400000f, 0.060000f, -1.000000f, 4.000000f, @@ -1147,8 +1131,6 @@ int16_t CustomObjectScript_1823::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 005: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.400000f, 0.060000f, -1.000000f, 4.000000f, @@ -1166,8 +1148,6 @@ int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 004: Torchlites if (1) { aTurnOnSpew(data->me_handle, -1, 2, 0.000000f, 0.000000f, 65536, 0, 0.500000f, 0.050000f, -1.000000f, 4.000000f, @@ -1185,8 +1165,6 @@ int16_t CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2828::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 021: Nemo Switch 2 Shot if (qUserVarValue(1) == 0.000000f) { aUserVarSet(1, 1.000000f); @@ -1213,8 +1191,6 @@ int16_t CustomObjectScript_2828::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 018: Nemo Switch 1 Shot if (qUserVarValue(0) == 0.000000f) { aUserVarSet(0, 1.000000f); diff --git a/scripts/Paranoia.cpp b/scripts/Paranoia.cpp index bd2335ea9..723531e0a 100644 --- a/scripts/Paranoia.cpp +++ b/scripts/Paranoia.cpp @@ -468,8 +468,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/PiccuStation.cpp b/scripts/PiccuStation.cpp index a98d79301..d4b1337f3 100644 --- a/scripts/PiccuStation.cpp +++ b/scripts/PiccuStation.cpp @@ -2152,8 +2152,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -2492,8 +2490,6 @@ int16_t CustomObjectScript_186A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 009: RadioDoorLock2 if ((ScriptActionCtr_009 < 1) && (1)) { aObjPlayAnim(data->me_handle, 0, 4, 2.000000f, 0); @@ -2520,8 +2516,6 @@ int16_t CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 017: RadioDoorLock1 if ((ScriptActionCtr_017 < 1) && (1)) { aObjPlayAnim(data->me_handle, 0, 4, 2.000000f, 0); @@ -2578,8 +2572,6 @@ int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 026: Toggle4Timer if (1) { if (qUserVarValue(3) == 2.000000f) { @@ -2630,8 +2622,6 @@ int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 025: Toggle3Timer if (1) { if (qUserVarValue(2) == 2.000000f) { @@ -2682,8 +2672,6 @@ int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 024: Toggle2Timer if (1) { if (qUserVarValue(1) == 2.000000f) { @@ -2734,8 +2722,6 @@ int16_t CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 019: Toggle1Timer if (1) { if (qUserVarValue(0) == 2.000000f) { @@ -2756,8 +2742,6 @@ int16_t CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_3072::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 028: MatcenDoorSwitch2 if ((ScriptActionCtr_028 < 1) && (1)) { aObjPlayAnim(data->me_handle, 0, 4, 2.000000f, 0); @@ -2784,8 +2768,6 @@ int16_t CustomObjectScript_3072::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 029: MatcenDoorSwitch1 if ((ScriptActionCtr_029 < 1) && (1)) { aObjPlayAnim(data->me_handle, 0, 4, 2.000000f, 0); @@ -2812,8 +2794,6 @@ int16_t CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B3C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 040: TempDestroy if ((ScriptActionCtr_040 < 1) && (qUserVarValue(5) == 12.000000f)) { aSetLevelTimer(0.000000f, 2); @@ -2824,8 +2804,6 @@ int16_t CustomObjectScript_0B3C::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 003: BunkChildDestroyed1 if (1) { aUserVarInc(5); @@ -2844,8 +2822,6 @@ int16_t CustomObjectScript_0B3C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1338::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 038: Exp8 if (1) { aTurnOnSpew(Object_handles[40], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2865,8 +2841,6 @@ int16_t CustomObjectScript_1338::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1337::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 037: Exp7 if (1) { aTurnOnSpew(Object_handles[41], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2887,8 +2861,6 @@ int16_t CustomObjectScript_1337::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1339::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 036: Exp6 if (1) { aTurnOnSpew(Object_handles[42], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2909,8 +2881,6 @@ int16_t CustomObjectScript_1339::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_133A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 035: Exp5 if (1) { aTurnOnSpew(Object_handles[43], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2931,8 +2901,6 @@ int16_t CustomObjectScript_133A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1B35::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 034: Exp4 if (1) { aTurnOnSpew(Object_handles[44], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2953,8 +2921,6 @@ int16_t CustomObjectScript_1B35::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1B34::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 033: Exp3 if (1) { aTurnOnSpew(Object_handles[45], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2975,8 +2941,6 @@ int16_t CustomObjectScript_1B34::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1B41::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 032: Exp2 if (1) { aTurnOnSpew(Object_handles[46], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -2997,8 +2961,6 @@ int16_t CustomObjectScript_1B41::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1336::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 030: Exp1 if (1) { aTurnOnSpew(Object_handles[47], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, -1.000000f, @@ -3044,8 +3006,6 @@ int16_t CustomObjectScript_6856::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B40::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 043: NowAttack if (1) { aAISetTeam(0, Object_handles[50]); @@ -3056,8 +3016,6 @@ int16_t CustomObjectScript_0B40::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 062: BunkChildDestroyed5 if (1) { aUserVarInc(5); @@ -3076,8 +3034,6 @@ int16_t CustomObjectScript_0B40::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B30::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 069: BunkChildDestroyed12 if (1) { aShowHUDMessage(Message_strings[15]); @@ -3096,8 +3052,6 @@ int16_t CustomObjectScript_0B30::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B31::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 068: BunkChildDestroyed11 if (1) { aUserVarInc(5); @@ -3116,8 +3070,6 @@ int16_t CustomObjectScript_0B31::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1B2E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 067: BunkChildDestroyed10 if (1) { aUserVarInc(5); @@ -3136,8 +3088,6 @@ int16_t CustomObjectScript_1B2E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B2F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 066: BunkChildDestroyed9 if (1) { aUserVarInc(5); @@ -3156,8 +3106,6 @@ int16_t CustomObjectScript_0B2F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B32::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 065: BunkChildDestroyed8 if (1) { aUserVarInc(5); @@ -3176,8 +3124,6 @@ int16_t CustomObjectScript_0B32::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_232D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 064: BunkChildDestroyed7 if (1) { aUserVarInc(5); @@ -3196,8 +3142,6 @@ int16_t CustomObjectScript_232D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B3F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 063: BunkChildDestroyed6 if (1) { aUserVarInc(5); @@ -3216,8 +3160,6 @@ int16_t CustomObjectScript_0B3F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B3B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 061: BunkChildDestroyed4 if (1) { aUserVarInc(5); @@ -3236,8 +3178,6 @@ int16_t CustomObjectScript_0B3B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B3D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 060: BunkChildDestroyed3 if (1) { aUserVarInc(5); @@ -3256,8 +3196,6 @@ int16_t CustomObjectScript_0B3D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0B3E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 006: BunkChildDestroyed2 if (1) { aUserVarInc(5); @@ -3299,8 +3237,6 @@ int16_t CustomObjectScript_1195::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 014: Waypoint8 if (1) { aSetWaypoint(8); @@ -3317,8 +3253,6 @@ int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 013: Waypoint7 if (1) { aSetWaypoint(7); @@ -3344,8 +3278,6 @@ int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 012: Waypoint6 if (1) { aSetWaypoint(6); @@ -3371,8 +3303,6 @@ int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 011: Waypoint5 if (1) { aSetWaypoint(5); @@ -3389,8 +3319,6 @@ int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 010: Waypoint4 if (1) { aSetWaypoint(4); @@ -3407,8 +3335,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 008: Waypoint2 if (1) { aSetWaypoint(2); @@ -3425,8 +3351,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 007: Waypoint1 if (1) { aSetWaypoint(1); @@ -3443,8 +3367,6 @@ int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 042: VirusRoomEnter Trigger if ((ScriptActionCtr_042 < 1) && ((ScriptActionCtr_031 > 0) == true)) { aObjMakeInvuln(Object_handles[11], 10); @@ -3466,8 +3388,6 @@ int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 101: CuplinkCam2 if ((ScriptActionCtr_101 < 1) && (1)) { aSetLevelTimer(0.000000f, 6); @@ -3493,8 +3413,6 @@ int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 100: CuplinkCam3 if ((ScriptActionCtr_100 < 1) && (1)) { aSetLevelTimer(0.000000f, 6); @@ -3520,8 +3438,6 @@ int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 099: CuplinkCam1 if ((ScriptActionCtr_099 < 1) && (1)) { aSetLevelTimer(0.000000f, 6); @@ -3547,8 +3463,6 @@ int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 049: EndExit4 if ((ScriptActionCtr_041 > 0) == true) { aSetLevelTimer(0.000000f, 4); @@ -3574,8 +3488,6 @@ int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 048: EndExit3 if ((ScriptActionCtr_041 > 0) == true) { aSetLevelTimer(0.000000f, 4); @@ -3601,8 +3513,6 @@ int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 047: EndExit2 if ((ScriptActionCtr_041 > 0) == true) { aSetLevelTimer(0.000000f, 4); @@ -3628,8 +3538,6 @@ int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 045: EndExit1 if ((ScriptActionCtr_041 > 0) == true) { aSetLevelTimer(0.000000f, 4); @@ -3655,8 +3563,6 @@ int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 059: Voice Trigger 10 if ((ScriptActionCtr_059 < 1) && (1)) { aSoundPlaySteaming("VoxCompIntruderB.osf", 1.000000f); @@ -3673,8 +3579,6 @@ int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 058: Voice Trigger 9 if ((ScriptActionCtr_058 < 1) && (1)) { aSoundPlaySteaming("VoxCompIntruderA.osf", 1.000000f); @@ -3691,8 +3595,6 @@ int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 057: Voice Trigger 8 if ((ScriptActionCtr_057 < 1) && (1)) { aSoundPlaySteaming("VoxMaleAnnouncementB.osf", 1.000000f); @@ -3709,8 +3611,6 @@ int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 056: Voice Trigger 7 if ((ScriptActionCtr_056 < 1) && (1)) { aSoundPlaySteaming("VoxCompPowerDamage.osf", 1.000000f); @@ -3727,8 +3627,6 @@ int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 055: Voice Computer if ((ScriptActionCtr_055 < 1) && (1)) { aSoundPlaySteaming("VoxCompComDatalink.osf", 1.000000f); @@ -3745,8 +3643,6 @@ int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 054: Voice Trigger 5 if ((ScriptActionCtr_054 < 1) && (1)) { aSoundPlaySteaming("VoxCompIrreguler.osf", 1.000000f); @@ -3772,8 +3668,6 @@ int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 053: Voice Trigger 6 if ((ScriptActionCtr_053 < 1) && (1)) { aSoundPlaySteaming("VoxCompEmergencyB.osf", 1.000000f); @@ -3790,8 +3684,6 @@ int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 052: Voice Trigger 3 if ((ScriptActionCtr_052 < 1) && (1)) { aSoundPlaySteaming("VoxCompEmergencyA.osf", 1.000000f); @@ -3808,8 +3700,6 @@ int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 051: Voice Trigger 2 if ((ScriptActionCtr_051 < 1) && (1)) { aSoundPlaySteaming("VoxCompSecurityLockdown.osf", 1.000000f); @@ -3826,8 +3716,6 @@ int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 050: Voice Trigger 1 if ((ScriptActionCtr_050 < 1) && (1)) { aSoundPlaySteaming("VoxMaleAnnouncementA.osf", 1.000000f); @@ -3844,8 +3732,6 @@ int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 091: Music-Alien if (1) { aMusicSetRegion(9, Object_handles[9]); @@ -3862,8 +3748,6 @@ int16_t TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 085: Music-Ancient2 if (1) { aMusicSetRegion(7, Object_handles[9]); @@ -3880,8 +3764,6 @@ int16_t TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 083: Music-2Out2 if (1) { aMusicSetRegion(6, Object_handles[9]); @@ -3898,8 +3780,6 @@ int16_t TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 082: Music-2Out if (1) { aMusicSetRegion(6, Object_handles[9]); @@ -3916,8 +3796,6 @@ int16_t TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 081: Music-Cave2 if (1) { aMusicSetRegion(5, Object_handles[9]); @@ -3934,8 +3812,6 @@ int16_t TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 080: Music-Cave if (1) { aMusicSetRegion(5, Object_handles[9]); @@ -3952,8 +3828,6 @@ int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 079: Music-2InPt22 if (1) { aMusicSetRegion(10, Object_handles[9]); @@ -3970,8 +3844,6 @@ int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 078: Music-2InPt2 if (1) { aMusicSetRegion(10, Object_handles[9]); @@ -3988,8 +3860,6 @@ int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 077: Music-2In2 if (1) { aMusicSetRegion(3, Object_handles[9]); @@ -4006,8 +3876,6 @@ int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 076: Music-2In1 if (1) { aMusicSetRegion(3, Object_handles[9]); @@ -4024,8 +3892,6 @@ int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 075: Music-1Out2 if (1) { aMusicSetRegion(2, Object_handles[9]); @@ -4042,8 +3908,6 @@ int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 074: Music-1Out if (1) { aMusicSetRegion(2, Object_handles[9]); @@ -4060,8 +3924,6 @@ int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 073: Music-1In if (1) { aMusicSetRegion(1, Object_handles[9]); @@ -4078,8 +3940,6 @@ int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 097: Music-2InDat if (1) { aMusicSetRegion(3, Object_handles[9]); diff --git a/scripts/Polaris.cpp b/scripts/Polaris.cpp index d699e28c9..c6b06b225 100644 --- a/scripts/Polaris.cpp +++ b/scripts/Polaris.cpp @@ -625,8 +625,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/Quadsomniac.cpp b/scripts/Quadsomniac.cpp index 3021ef8a5..8d47dd745 100644 --- a/scripts/Quadsomniac.cpp +++ b/scripts/Quadsomniac.cpp @@ -685,8 +685,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/RudeAwakening.cpp b/scripts/RudeAwakening.cpp index a190a978c..2629f10db 100644 --- a/scripts/RudeAwakening.cpp +++ b/scripts/RudeAwakening.cpp @@ -678,8 +678,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/SewerRat.cpp b/scripts/SewerRat.cpp index c4f213471..946adfc72 100644 --- a/scripts/SewerRat.cpp +++ b/scripts/SewerRat.cpp @@ -533,8 +533,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/TrainingMission.cpp b/scripts/TrainingMission.cpp index 6544434c0..b55266fb8 100644 --- a/scripts/TrainingMission.cpp +++ b/scripts/TrainingMission.cpp @@ -1345,8 +1345,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 018: Player Hit, cancel timer & restart if ((qObjShields(qGetPlayerObj(0)) < 100.000000f) && ((ScriptActionCtr_016 > 0) == true) && ((ScriptActionCtr_017 > 0) == false)) { @@ -1457,8 +1455,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1632,8 +1628,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_300D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 001: FirstGoal if ((ScriptActionCtr_001 < 1) && (1)) { aShowHUDMessage(Message_strings[0]); @@ -1666,8 +1660,6 @@ int16_t CustomObjectScript_300D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_300C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 003: Return to Start from Forward Goal if ((ScriptActionCtr_003 < 1) && ((ScriptActionCtr_001 > 0) == true)) { aShowHUDMessage(Message_strings[4]); @@ -1750,8 +1742,6 @@ int16_t CustomObjectScript_300C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_300B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 004: Left Goal if ((ScriptActionCtr_004 < 1) && (1)) { aTogglePlayerControl(0, 0, 4); @@ -1784,8 +1774,6 @@ int16_t CustomObjectScript_300B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_4809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 006: Up Goal if ((ScriptActionCtr_006 < 1) && (1)) { aShowHUDMessage(Message_strings[0]); @@ -1818,8 +1806,6 @@ int16_t CustomObjectScript_4809::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1803::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 014: Start Course if ((ScriptActionCtr_014 < 1) && (1)) { aPortalRenderSet(1, 1, Room_indexes[0], 1); @@ -1839,8 +1825,6 @@ int16_t CustomObjectScript_1803::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1806::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 015: Finish Course if ((ScriptActionCtr_015 < 1) && (1)) { aToggleAllPlayerControls(0, 0); @@ -1863,8 +1847,6 @@ int16_t CustomObjectScript_1806::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_100A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 033: Start Dodge Timer Delay if ((ScriptActionCtr_033 < 1) && (1)) { aTogglePlayerControl(0, 0, 3); @@ -1903,8 +1885,6 @@ int16_t CustomObjectScript_100A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_300E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 019: Leaving Dodging Room if ((ScriptActionCtr_019 < 1) && (1)) { aObjSetLightingDist(Object_handles[0], 50.000000f); @@ -1964,8 +1944,6 @@ int16_t CustomObjectScript_2007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 021: Enter Manuver room if ((ScriptActionCtr_021 < 1) && ((ScriptActionCtr_020 > 0) == true)) { aToggleShowPlayerControl(1, 0); @@ -2094,8 +2072,6 @@ int16_t CustomObjectScript_1817::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_USE: { - tOSIRISEVTUSE *event_data = &data->evt_use; - // Script 059: Player used camera monitor if (1) { aSoundPlaySteamingText("GuideBotD.osf", 1.000000f); @@ -2198,8 +2174,6 @@ int16_t CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 047: InvulnPowerup2 Picked up if ((ScriptActionCtr_047 < 1) && (1)) { @@ -2215,8 +2189,6 @@ int16_t CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 048: CloakPowerup2 Picked up if ((ScriptActionCtr_048 < 1) && (1)) { @@ -2337,8 +2309,6 @@ int16_t CustomObjectScript_0823::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1824::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 057: Finished! if (1) { aEndLevel(); @@ -2355,8 +2325,6 @@ int16_t CustomObjectScript_1824::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 032: Entered Gallery if ((ScriptActionCtr_032 < 1) && (1)) { aSoundPlaySteamingText("GuideBotA.osf", 1.000000f); @@ -2379,8 +2347,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 042: Entered KillBot Room if ((ScriptActionCtr_042 < 1) && (1)) { aSetLevelTimer(13.000000f, 14); @@ -2402,8 +2368,6 @@ int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 050: Entered Last Room if ((ScriptActionCtr_050 < 1) && (1)) { aObjSetLightingDist(Object_handles[3], 0.000000f); diff --git a/scripts/Y2K.cpp b/scripts/Y2K.cpp index 7479d28d6..474392e07 100644 --- a/scripts/Y2K.cpp +++ b/scripts/Y2K.cpp @@ -538,8 +538,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); diff --git a/scripts/aigame2.cpp b/scripts/aigame2.cpp index 90f480988..34704f3ef 100644 --- a/scripts/aigame2.cpp +++ b/scripts/aigame2.cpp @@ -835,7 +835,7 @@ void aiBlackStormTrooper::OnInterval(tOSIRISEventInfo *data) { int fvi_flags = FQ_CHECK_OBJS | FQ_IGNORE_POWERUPS | FQ_IGNORE_WEAPONS | FQ_IGNORE_MOVING_OBJECTS | FQ_IGNORE_NON_LIGHTMAP_OBJECTS; - int fate = FVI_RayCast(me_handle, &pos, &end_pos, room, 0.0f, fvi_flags, &ray); + FVI_RayCast(me_handle, &pos, &end_pos, room, 0.0f, fvi_flags, &ray); Obj_Value(memory->camera_obj, VF_SET, OBJV_I_ROOMNUM, &ray.hit_room); Obj_Value(memory->camera_obj, VF_SET, OBJV_V_POS, &ray.hit_point); @@ -876,8 +876,6 @@ void aiBlackStormTrooper::OnInterval(tOSIRISEventInfo *data) { case STATE_SNIPE: // snipe for a certain amount of time, then return to base. if (memory->laser_targeted == false) { - int type; - memory->camera_obj = Obj_Create(OBJ_POWERUP, Obj_FindID("Invisiblepowerup"), room, &pos, NULL, me_handle); mstruct.objhandle = memory->camera_obj; MSafe_CallFunction(MSAFE_OBJECT_NO_RENDER, &mstruct); @@ -1004,8 +1002,6 @@ bool aiBlackStormTrooper::OnNotify(int me_handle, tOSIRISEVTAINOTIFY *data) { void aiBlackStormTrooper::set_state(int me_handle, int state) { int room_number, id, i; vector pos; - char buf[64]; - char name[48]; float dist; // SafeGoalClearAll(me_handle); @@ -1330,10 +1326,8 @@ bool aiCreeper::OnNotify(int me_handle, tOSIRISEVTAINOTIFY *data) { } void aiCreeper::set_state(int me_handle, int state) { - int room_number = 0, id, i, flags; + int room_number = 0, flags; vector pos; - char buf[64]; - char name[48]; msafe_struct m; float circle_dist; char cenable; diff --git a/scripts/aigame4.cpp b/scripts/aigame4.cpp index 6c117ebf7..97687d0cd 100644 --- a/scripts/aigame4.cpp +++ b/scripts/aigame4.cpp @@ -912,8 +912,6 @@ void MercEndBoss::DoFrame(int me) { matrix orient; vector start_pos; vector end_pos; - vector collision_pos; - vector collision_normal; int num_iterations = 0; int num_ignore = 0; int ignore_list[100]; diff --git a/scripts/barney.cpp b/scripts/barney.cpp index 2e0a939e4..87e0eadb3 100644 --- a/scripts/barney.cpp +++ b/scripts/barney.cpp @@ -490,8 +490,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); } break; diff --git a/scripts/clutter.cpp b/scripts/clutter.cpp index dc3098956..d74c5a6ad 100644 --- a/scripts/clutter.cpp +++ b/scripts/clutter.cpp @@ -291,10 +291,8 @@ int16_t FragCrate::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: vector pos; - float mag; int weapon_id; int handle; - int i; int room; Obj_Value(data->me_handle, VF_GET, OBJV_I_ROOMNUM, &room); @@ -312,10 +310,8 @@ int16_t NapalmBarrel::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: vector pos; - float mag; int weapon_id; int handle; - int i; int room; matrix o, orient; @@ -392,7 +388,6 @@ float GetObjectShields(int object) { int16_t TNTMedYield::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - int i; tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(float); @@ -443,7 +438,6 @@ int16_t TNTMedYield::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TNTHighYield::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - int i; tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(tTNTHighYield); @@ -508,7 +502,6 @@ int16_t TNTHighYield::CallEvent(int event, tOSIRISEventInfo *data) { int close_obj_list[32]; int roomnum; int rockpile_id; - float amount; vector pos; Obj_Value(data->me_handle, VF_GET, OBJV_I_ROOMNUM, &roomnum); @@ -540,7 +533,6 @@ int16_t TNTHighYield::CallEvent(int event, tOSIRISEventInfo *data) { int16_t FallingRock::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - int i; tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(tFallingRock); @@ -574,7 +566,6 @@ int16_t FallingRock::CallEvent(int event, tOSIRISEventInfo *data) { int16_t LavaRock::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - int i; tOSIRISMEMCHUNK ch; ch.id = 4; ch.size = sizeof(tFallingRock); diff --git a/scripts/level1.cpp b/scripts/level1.cpp index d8de1a8a6..9a000ad67 100644 --- a/scripts/level1.cpp +++ b/scripts/level1.cpp @@ -1096,8 +1096,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1680,8 +1678,6 @@ int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 008: Fire Sphere Room if (1) { aRoomChangeFog(Room_indexes[7], 1.000000f, 0.700000f, 0.400000f, 500.000000f, 10.000000f); @@ -1718,8 +1714,6 @@ int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 016: Goal Zero Completed & Waypoint 3 if (1) { aGoalCompleted(Goal_indexes[5], 1); @@ -1737,8 +1731,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 017: Waypoint 1 if (1) { aSetWaypoint(1); @@ -1782,8 +1774,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 019: Waypoint 4 if (1) { aSetWaypoint(4); @@ -1800,8 +1790,6 @@ int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 020: Waypoint 5 if (1) { aSetWaypoint(5); @@ -1818,8 +1806,6 @@ int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 021: Waypoint 6 Left if (1) { aSetWaypoint(6); @@ -1836,8 +1822,6 @@ int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 022: Waypoint 6 Right if (1) { aSetWaypoint(6); diff --git a/scripts/level10.cpp b/scripts/level10.cpp index 54262260d..ee1975e6f 100644 --- a/scripts/level10.cpp +++ b/scripts/level10.cpp @@ -2564,8 +2564,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3287,8 +3285,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2042::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 021: Intro Landing Path if (1) { aPortalRenderSet(1, 0, Room_indexes[0], 1); @@ -3331,8 +3327,6 @@ int16_t CustomObjectScript_2042::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 040: Intro Cinematic - Parts II and III if (1) { if (ScriptActionCtr_040 == 0) { @@ -3359,8 +3353,6 @@ int16_t CustomObjectScript_2042::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10A3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 002: Space Patrol if (1) { aAIFlags(1, 32, data->me_handle); @@ -3378,8 +3370,6 @@ int16_t CustomObjectScript_10A3::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_094B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 095: Sky Patrol 2 if (1) { aAIFlags(1, 32, data->me_handle); @@ -3425,8 +3415,6 @@ int16_t CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_113E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 090: Data Vault Patrol A if (1) { aAISetFOV(data->me_handle, 70.000000f); @@ -3444,8 +3432,6 @@ int16_t CustomObjectScript_113E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_193F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 091: Data Vault Patrol B if (1) { aAISetFOV(data->me_handle, 70.000000f); @@ -3463,8 +3449,6 @@ int16_t CustomObjectScript_193F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2140::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 092: Data Vault Guard Patrol if (1) { aAIGoalFollowPath(data->me_handle, Path_indexes[10], 1, 4, 1, 0, 8392960, -1); @@ -3652,8 +3636,6 @@ int16_t CustomObjectScript_28BA::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2133::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 125: Canyon Guard Patrol if (1) { aAIGoalFollowPath(data->me_handle, Path_indexes[12], 1, 9, 1, 0, 8392960, -1); @@ -3713,8 +3695,6 @@ int16_t CustomObjectScript_2133::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1139::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 098: Setup Command Base Guard if (1) { aAIFlags(0, 33554432, data->me_handle); @@ -3766,8 +3746,6 @@ int16_t CustomObjectScript_1139::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_098A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 097: Tank Patrol if (1) { aAIGoalFollowPath(data->me_handle, Path_indexes[16], 1, 11, 1, 0, 8392704, -1); @@ -3784,8 +3762,6 @@ int16_t CustomObjectScript_098A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 003: D1 Patrol if (1) { aAIGoalFollowPath(Object_handles[61], Path_indexes[17], 1, 7, 1, 3, 8392704, -1); @@ -3802,8 +3778,6 @@ int16_t CustomObjectScript_08AA::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18BF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 099: Setup D1 Ground Guard if (1) { @@ -4740,8 +4714,6 @@ int16_t CustomObjectScript_208B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2074::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 102: Setup Hangar Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -4778,8 +4750,6 @@ int16_t CustomObjectScript_2074::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_203D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 103: Setup Prep Room Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -4811,8 +4781,6 @@ int16_t CustomObjectScript_203D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_11B1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 104: Setup Mem Plasma Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -4849,8 +4817,6 @@ int16_t CustomObjectScript_11B1::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_3898::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 106: Setup Corridor Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -4884,8 +4850,6 @@ int16_t CustomObjectScript_3898::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_303C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 107: Setup Substation 1 Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -4917,8 +4881,6 @@ int16_t CustomObjectScript_303C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2090::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 108: Setup Auxillary Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -4954,8 +4916,6 @@ int16_t CustomObjectScript_2090::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09D4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 109: Setup Control Cam if (1) { aObjPlayAnim(data->me_handle, 0, 20, 14.000000f, 1); @@ -5444,8 +5404,6 @@ int16_t CustomObjectScript_987D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; - // Script 119: Meteor1 - GoalID Explosion if (1) { aTurnOnSpew(Object_handles[109], -1, 0, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.040000f, 1.000000f, @@ -5458,8 +5416,6 @@ int16_t CustomObjectScript_09AA::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CHILD_DIED: { - tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; - // Script 117: Meteor1 - Path if (qObjIsType(Object_handles[61], 2) == false) { aAISetMaxSpeed(data->me_handle, 400.000000f); diff --git a/scripts/level11.cpp b/scripts/level11.cpp index be64132db..e71b5d86b 100644 --- a/scripts/level11.cpp +++ b/scripts/level11.cpp @@ -3531,8 +3531,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 027: All 3 Primary Controls if ((ScriptActionCtr_027 < 1) && (((ScriptActionCtr_056 > 0) == true) && ((ScriptActionCtr_055 > 0) == true) && ((ScriptActionCtr_054 > 0) == true))) { @@ -3545,8 +3543,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3625,8 +3621,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 130: Mission Message if ((ScriptActionCtr_130 < 1) && (1)) { aSoundPlaySteaming("VoxLev11StartLevel.osf", 1.000000f); @@ -3646,8 +3640,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0985::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 120: IntroCam if ((ScriptActionCtr_120 < 1) && (1 == true)) { aCinematicIntro(Path_indexes[0], Message_strings[0], Object_handles[1], Path_indexes[1], 22.000000f); @@ -4174,8 +4166,6 @@ int16_t CustomObjectScript_1919::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0911::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 017: RockWallALL Invulnerable if (1) { aObjMakeInvuln(Object_handles[78], 999999); @@ -4200,8 +4190,6 @@ int16_t CustomObjectScript_0911::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_310B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 018: RockWallTopExplode(1) if ((ScriptActionCtr_018 < 1) && (1)) { aObjMakeVulnerable(Object_handles[83]); @@ -4273,8 +4261,6 @@ int16_t CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0A12::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 125: GenericSpewer-18 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4292,8 +4278,6 @@ int16_t CustomObjectScript_0A12::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 047: GenericSpewer-17 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4311,8 +4295,6 @@ int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 046: GenericSpewer-16 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4330,8 +4312,6 @@ int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 045: GenericSpewer-15 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4349,8 +4329,6 @@ int16_t CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 044: GenericSpewer-14 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4368,8 +4346,6 @@ int16_t CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 043: GenericSpewer-13 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4387,8 +4363,6 @@ int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0976::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 042: GenericSpewer-12 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4406,8 +4380,6 @@ int16_t CustomObjectScript_0976::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 041: GenericSpewer-11 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4425,8 +4397,6 @@ int16_t CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0978::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 040: GenericSpewer-10 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4444,8 +4414,6 @@ int16_t CustomObjectScript_0978::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0979::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 039: GenericSpewer-9 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4463,8 +4431,6 @@ int16_t CustomObjectScript_0979::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0975::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 038: GenericSpewer-8 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4482,8 +4448,6 @@ int16_t CustomObjectScript_0975::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0974::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 037: GenericSpewer-7 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4501,8 +4465,6 @@ int16_t CustomObjectScript_0974::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0973::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 036: GenericSpewer-6 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4520,8 +4482,6 @@ int16_t CustomObjectScript_0973::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0972::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 035: GenericSpewer-5 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4539,8 +4499,6 @@ int16_t CustomObjectScript_0972::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0971::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 034: GenericSpewer-4 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4558,8 +4516,6 @@ int16_t CustomObjectScript_0971::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0970::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 015: GenericSpewer-3 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4577,8 +4533,6 @@ int16_t CustomObjectScript_0970::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_096F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 014: GenericSpewer-2 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4596,8 +4550,6 @@ int16_t CustomObjectScript_096F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 013: GenericSpewer-1 if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.700000f, 0.150000f, -1.000000f, 4.000000f, @@ -4657,8 +4609,6 @@ int16_t CustomObjectScript_1181::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_110A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 019: Security Alert-1 if ((ScriptActionCtr_019 < 1) && ((qObjCanSeePlayer(65, data->me_handle, 240.000000f) == true) && ((ScriptActionCtr_131 > 0) == true))) { @@ -4673,8 +4623,6 @@ int16_t CustomObjectScript_110A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 131: Security-1 Timer if ((ScriptActionCtr_131 < 1) && (1)) { @@ -4728,8 +4676,6 @@ int16_t CustomObjectScript_1108::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 078: Security Alert-F if ((ScriptActionCtr_078 < 1) && (qObjCanSeePlayer(50, data->me_handle, 150.000000f) == true)) { aAISetState(1, Object_handles[50]); @@ -4749,8 +4695,6 @@ int16_t CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 077: Security Alert-E if ((ScriptActionCtr_077 < 1) && (qObjCanSeePlayer(50, data->me_handle, 150.000000f) == true)) { aAISetState(1, Object_handles[51]); @@ -4770,8 +4714,6 @@ int16_t CustomObjectScript_10DE::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10DD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 076: Security Alert-D if ((ScriptActionCtr_076 < 1) && (qObjCanSeePlayer(50, data->me_handle, 150.000000f) == true)) { aAISetState(1, Object_handles[48]); @@ -4791,8 +4733,6 @@ int16_t CustomObjectScript_10DD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 075: Security Alert-C if ((ScriptActionCtr_075 < 1) && (qObjCanSeePlayer(65, data->me_handle, 150.000000f) == true)) { aAISetState(1, Object_handles[45]); @@ -4812,8 +4752,6 @@ int16_t CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10DB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 074: Security Alert-B if ((ScriptActionCtr_074 < 1) && (qObjCanSeePlayer(90, data->me_handle, 200.000000f) == true)) { aAISetState(1, Object_handles[31]); @@ -4835,8 +4773,6 @@ int16_t CustomObjectScript_10DB::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 073: Security Alert-A if ((ScriptActionCtr_073 < 1) && (qObjCanSeePlayer(30, data->me_handle, 60.000000f) == true)) { aAISetState(1, Object_handles[44]); @@ -4855,8 +4791,6 @@ int16_t CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 072: Security Alert-9 if ((ScriptActionCtr_072 < 1) && (qObjCanSeePlayer(50, data->me_handle, 300.000000f) == true)) { aAISetState(1, Object_handles[43]); @@ -4877,8 +4811,6 @@ int16_t CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10D8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 071: Security Alert-8 if ((ScriptActionCtr_071 < 1) && (qObjCanSeePlayer(50, data->me_handle, 300.000000f) == true)) { aAISetState(1, Object_handles[38]); @@ -4899,8 +4831,6 @@ int16_t CustomObjectScript_10D8::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_116C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 070: Security Alert-7 if ((ScriptActionCtr_070 < 1) && (qObjCanSeePlayer(90, data->me_handle, 70.000000f) == true)) { aAISetState(1, Object_handles[29]); @@ -4920,8 +4850,6 @@ int16_t CustomObjectScript_116C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 069: Security Alert-6 if ((ScriptActionCtr_069 < 1) && (qObjCanSeePlayer(55, data->me_handle, 200.000000f) == true)) { aAISetState(1, Object_handles[37]); @@ -4943,8 +4871,6 @@ int16_t CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10DA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 068: Security Alert-5 if ((ScriptActionCtr_068 < 1) && (qObjCanSeePlayer(90, data->me_handle, 80.000000f) == true)) { aAISetState(1, Object_handles[26]); @@ -4964,8 +4890,6 @@ int16_t CustomObjectScript_10DA::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18D4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 067: Security Alert-4 if ((ScriptActionCtr_067 < 1) && (qObjCanSeePlayer(70, data->me_handle, 250.000000f) == true)) { aAISetState(1, Object_handles[15]); @@ -4987,8 +4911,6 @@ int16_t CustomObjectScript_18D4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18CD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 066: Security Alert-3 if ((ScriptActionCtr_066 < 1) && (qObjCanSeePlayer(70, data->me_handle, 250.000000f) == true)) { aAISetState(1, Object_handles[21]); @@ -5010,8 +4932,6 @@ int16_t CustomObjectScript_18CD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18D3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 065: Security Alert-2 if ((ScriptActionCtr_065 < 1) && (qObjCanSeePlayer(50, data->me_handle, 220.000000f) == true)) { aAISetState(1, Object_handles[23]); @@ -5815,8 +5735,6 @@ int16_t CustomObjectScript_0A53::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 126: PrisonSwitch Create if (1) { aTurnOnSpew(Object_handles[125], -1, 16, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.070000f, -1.000000f, @@ -5839,8 +5757,6 @@ int16_t CustomObjectScript_0A53::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 136: Exit Abort Timer if (1) { aEndLevel(); @@ -6164,8 +6080,6 @@ int16_t CustomObjectScript_096B::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 166: You got all 6! if (qUserVarValue(7) == 6.000000f) { aSoundPlayObject(Sound_indexes[0], Object_handles[12], 1.000000f); @@ -6259,8 +6173,6 @@ int16_t CustomObjectScript_227E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 124: WayPoint-Last2 if (1) { aSetWaypoint(5); @@ -6277,8 +6189,6 @@ int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 123: WayPoint-Last1 if (1) { aSetWaypoint(5); @@ -6295,8 +6205,6 @@ int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 122: WayPoint-1 if ((ScriptActionCtr_122 < 1) && (1)) { aCinematicSimple(Path_indexes[2], Message_strings[1], Object_handles[55], 10.000000f, 1); @@ -6399,8 +6307,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 008: Cross (RL) Doors-1 if (0.000000f == 0.000000f) { aDoorLockUnlock(0, Door_handles[11]); @@ -6420,8 +6326,6 @@ int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 009: Cross (RL) Doors-2 if (1) { aDoorLockUnlock(0, Door_handles[13]); @@ -6441,8 +6345,6 @@ int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 010: Cross (RL) Doors-3 if (1) { aDoorLockUnlock(0, Door_handles[15]); @@ -6483,8 +6385,6 @@ int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 156: PipeDemo 2 if ((ScriptActionCtr_156 < 1) && ((qObjExists(Object_handles[3]) == true) && ((ScriptActionCtr_132 > 0) == false))) { @@ -6502,8 +6402,6 @@ int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 132: PipeDemo 1 if ((ScriptActionCtr_132 < 1) && ((qObjExists(Object_handles[3]) == true) && ((ScriptActionCtr_156 > 0) == false))) { @@ -6521,8 +6419,6 @@ int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 129: EscapeDoor-Bar if ((ScriptActionCtr_129 < 1) && ((ScriptActionCtr_127 > 0) == true)) { aDoorSetPos(Door_handles[0], 1.000000f); @@ -6539,8 +6435,6 @@ int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 153: EscapeDoor-2 if ((ScriptActionCtr_153 < 1) && ((ScriptActionCtr_127 > 0) == true)) { aDoorSetPos(Door_handles[14], 1.000000f); @@ -6557,8 +6451,6 @@ int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 118: EscapeDoor-1 if ((ScriptActionCtr_118 < 1) && ((ScriptActionCtr_127 > 0) == true)) { aDoorSetPos(Door_handles[18], 1.000000f); @@ -6899,8 +6791,6 @@ int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 155: PlayerCheat-2 if (1) { aDoorSetPos(Door_handles[14], 0.000000f); @@ -6917,8 +6807,6 @@ int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 154: PlayerCheat-1 if (1) { aDoorSetPos(Door_handles[14], 1.000000f); @@ -6935,8 +6823,6 @@ int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 170: Prison Cinema if ((ScriptActionCtr_170 < 1) && (1)) { aCinematicSimple(Path_indexes[9], Message_strings[15], Object_handles[13], 10.000000f, 1); diff --git a/scripts/level13.cpp b/scripts/level13.cpp index c3eae2845..787882384 100644 --- a/scripts/level13.cpp +++ b/scripts/level13.cpp @@ -2795,8 +2795,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3010,8 +3008,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 049: Start Level Objectives Messege if ((ScriptActionCtr_049 < 1) && (1)) { aCinematicSimple(Path_indexes[7], Message_strings[28], Object_handles[30], 10.000000f, 1); @@ -3196,8 +3192,6 @@ int16_t CustomObjectScript_0837::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 019: Acc Floor Spewer if (1) { aTurnOnSpew(Object_handles[26], -1, 7, 0.000000f, 0.000000f, 65536, 0, 2.500000f, 0.150000f, -1.000000f, @@ -3215,8 +3209,6 @@ int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 023: Turret Controller if (qObjExists(Object_handles[28]) == false) { aAISetState(0, data->me_handle); @@ -3233,8 +3225,6 @@ int16_t CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 022: Turret Controller if (qObjExists(Object_handles[28]) == false) { aAISetState(0, data->me_handle); @@ -3268,8 +3258,6 @@ int16_t CustomObjectScript_9021::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 056: Start Level Objectives Messege 2 if ((ScriptActionCtr_056 < 1) && (1)) { aCinematicSimple(Path_indexes[8], Message_strings[29], Object_handles[16], 10.000000f, 1); @@ -3681,8 +3669,6 @@ int16_t CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_18B0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 028: Bad White Cage Exists if (qObjExists(Object_handles[53]) == true) { aAISetState(0, Object_handles[52]); @@ -3701,8 +3687,6 @@ int16_t CustomObjectScript_18B0::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08B6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 029: Bad TailbotCage Exists if (qObjExists(Object_handles[53]) == true) { aAISetState(0, Object_handles[54]); @@ -3769,8 +3753,6 @@ int16_t CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10BD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 032: Air Spewers if (1) { aTurnOnSpew(data->me_handle, 0, 7, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.150000f, -1.000000f, 5.000000f, @@ -3788,8 +3770,6 @@ int16_t CustomObjectScript_10BD::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 041: Air Spewers if (1) { aTurnOnSpew(data->me_handle, 0, 7, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.150000f, -1.000000f, 5.000000f, @@ -3807,8 +3787,6 @@ int16_t CustomObjectScript_08BE::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 050: Air Spewers if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.150000f, -1.000000f, 5.000000f, @@ -3826,8 +3804,6 @@ int16_t CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 072: Air Spewers if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.150000f, -1.000000f, 10.000000f, @@ -3845,8 +3821,6 @@ int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_295F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 123: Air Spewers if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 0.900000f, 0.150000f, -1.000000f, 14.000000f, @@ -3877,8 +3851,6 @@ int16_t CustomObjectScript_295F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_182C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 064: Air Spewers if (1) { aTurnOnSpew(data->me_handle, -1, 7, 0.000000f, 0.000000f, 65536, 0, 0.900000f, 0.150000f, -1.000000f, 14.000000f, @@ -3917,8 +3889,6 @@ int16_t CustomObjectScript_2023::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 035: Jugg AI if (1) { aAISetState(0, data->me_handle); @@ -3955,8 +3925,6 @@ int16_t CustomObjectScript_30C7::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 073: Start Level Objectives Messege 3 if ((ScriptActionCtr_073 < 1) && (1)) { aSoundPlaySteaming("VoxL13StartLevel.osf", 1.000000f); @@ -4212,8 +4180,6 @@ int16_t CustomObjectScript_0A08::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 082: Spy Hunter Off if (1) { aAISetState(0, data->me_handle); @@ -4255,8 +4221,6 @@ int16_t CustomObjectScript_0A14::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 081: Sub Squid Off if (1) { aAISetState(0, data->me_handle); @@ -4290,8 +4254,6 @@ int16_t CustomObjectScript_08CB::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0A35::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 133: FlameRas Created if (1) { aObjSetMovementType(data->me_handle, 0); @@ -4308,8 +4270,6 @@ int16_t CustomObjectScript_0A35::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_9233::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 118: FlameRas Created if (1) { aObjSetMovementType(data->me_handle, 0); @@ -4326,8 +4286,6 @@ int16_t CustomObjectScript_9233::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 127: ST Monitor - Sleep if (1) { aObjSetMovementType(data->me_handle, 0); @@ -4356,8 +4314,6 @@ int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0929::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 126: ST Monitor2 - Sleep if (1) { aObjSetMovementType(data->me_handle, 0); @@ -4386,8 +4342,6 @@ int16_t CustomObjectScript_0929::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_112A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 125: ST Monitor3 - Sleep if (1) { aObjSetMovementType(data->me_handle, 0); @@ -4416,8 +4370,6 @@ int16_t CustomObjectScript_112A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0928::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 002: ST Monitor4 - Sleep if (1) { aObjSetMovementType(data->me_handle, 0); @@ -4446,8 +4398,6 @@ int16_t CustomObjectScript_0928::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_29E9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 122: DatShip1 -- Path On Creation if (1) { aAIGoalFollowPath(Object_handles[86], Path_indexes[12], 1, 19, 1, 3, 8392960, -1); diff --git a/scripts/level14.cpp b/scripts/level14.cpp index 2d91f1421..ae71a33fe 100644 --- a/scripts/level14.cpp +++ b/scripts/level14.cpp @@ -1789,8 +1789,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 067: Update Bypass Connector Display if (qUserVarValue(0) != qUserVarValue(12)) { aUserVarSet(12, qUserVarValue(0)); @@ -1806,8 +1804,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -2226,8 +2222,6 @@ int16_t CustomObjectScript_10B8::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 064: Give Closest Player the Anti-Virus Program if ((ScriptActionCtr_064 < 1) && (qObjType(qPlayerClosest(data->me_handle, 10)) == 4)) { aAddObjectToInventory(data->me_handle, qPlayerClosest(data->me_handle, 10), 0); @@ -2291,8 +2285,6 @@ int16_t CustomObjectScript_10B8::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0892::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 029: Power Conduit1 Created if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[0], 0), 0); @@ -2310,8 +2302,6 @@ int16_t CustomObjectScript_0892::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0891::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 030: Power Conduit2 Created if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[1], 0), 1); @@ -2329,8 +2319,6 @@ int16_t CustomObjectScript_0891::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0890::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 031: Power Conduit3 Created if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[2], 0), 2); @@ -2899,8 +2887,6 @@ int16_t CustomObjectScript_309C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1083::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 019: Mirror Node #1 Hit if (qUserFlag(17) == false) { if (((qObjAnimFrame(data->me_handle) == 0.000000f) || (qObjAnimFrame(data->me_handle) == 12.000000f)) && @@ -2949,8 +2935,6 @@ int16_t CustomObjectScript_1083::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 024: Mirror Node #2 Hit if (qUserFlag(17) == false) { if (((qObjAnimFrame(data->me_handle) == 0.000000f) || (qObjAnimFrame(data->me_handle) == 12.000000f)) && @@ -2999,8 +2983,6 @@ int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_188B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 025: Mirror Node #3 Hit if (qUserFlag(17) == false) { if (((qObjAnimFrame(data->me_handle) == 0.000000f) || (qObjAnimFrame(data->me_handle) == 12.000000f)) && @@ -3049,8 +3031,6 @@ int16_t CustomObjectScript_188B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 026: Mirror Node #4 Hit if (qUserFlag(17) == false) { if (((qObjAnimFrame(data->me_handle) == 0.000000f) || (qObjAnimFrame(data->me_handle) == 12.000000f)) && @@ -3099,8 +3079,6 @@ int16_t CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_088D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 027: Mirror Node #5 Hit if (qUserFlag(17) == false) { if (((qObjAnimFrame(data->me_handle) == 0.000000f) || (qObjAnimFrame(data->me_handle) == 12.000000f)) && @@ -3149,8 +3127,6 @@ int16_t CustomObjectScript_088D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_088E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 028: Mirror Node #6 Hit if (qUserFlag(17) == false) { if (((qObjAnimFrame(data->me_handle) == 0.000000f) || (qObjAnimFrame(data->me_handle) == 12.000000f)) && diff --git a/scripts/level17.cpp b/scripts/level17.cpp index 5f1d138da..b35a104c7 100644 --- a/scripts/level17.cpp +++ b/scripts/level17.cpp @@ -3203,8 +3203,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3491,8 +3489,6 @@ int16_t CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 101: MiniReactorBlue TimerChain if ((ScriptActionCtr_101 < 1) && (1)) { aSetObjectTimer(Object_handles[11], 6.000000f, -1); @@ -3575,8 +3571,6 @@ int16_t CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 100: MiniReactorWhite TimerChain if ((ScriptActionCtr_100 < 1) && (1)) { aSetObjectTimer(Object_handles[26], 6.000000f, -1); @@ -3707,8 +3701,6 @@ int16_t CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 103: MiniReactorRed-2 Timer Chain if ((ScriptActionCtr_103 < 1) && (1)) { aSetObjectTimer(Object_handles[45], 6.000000f, -1); @@ -3736,8 +3728,6 @@ int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 102: MiniReactorRed-1 Timer Chain if ((ScriptActionCtr_102 < 1) && (1)) { aSetObjectTimer(Object_handles[57], 6.000000f, -1); @@ -3789,8 +3779,6 @@ int16_t CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 073: MiniReactorRed Timer if ((ScriptActionCtr_073 < 1) && (1)) { aGoalCompleted(Goal_indexes[4], 1); @@ -3809,8 +3797,6 @@ int16_t CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 075: ReactorShake if (1) { aSetObjectTimer(data->me_handle, qRandomValue(0.500000f, 1.600000f), -1); @@ -3828,8 +3814,6 @@ int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 083: CycleFlames-5 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[72], 1.000000f); @@ -3866,8 +3850,6 @@ int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 082: CycleFlames-4 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[76], 1.000000f); @@ -3904,8 +3886,6 @@ int16_t CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 081: CycleFlames-3 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[79], 1.000000f); @@ -3942,8 +3922,6 @@ int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 080: CycleFlames-2 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[84], 1.000000f); @@ -3980,8 +3958,6 @@ int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 079: CycleFlames-1 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[87], 1.000000f); @@ -4090,8 +4066,6 @@ int16_t CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 099: Blow Up Child ACW-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4108,8 +4082,6 @@ int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 098: Blow Up Child ACW-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4126,8 +4098,6 @@ int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 097: Blow Up Child ACW-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4144,8 +4114,6 @@ int16_t CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 096: Blow Up Child ACW-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4162,8 +4130,6 @@ int16_t CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 095: Blow Up Child ACW-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4180,8 +4146,6 @@ int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 094: Blow Up Child ACW-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4198,8 +4162,6 @@ int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 093: Blow Up Child ACW-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4216,8 +4178,6 @@ int16_t CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 092: Blow Up Child ACW-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4234,8 +4194,6 @@ int16_t CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 091: Blow Up Child ACW-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4252,8 +4210,6 @@ int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 090: Blow Up Child ACW-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4270,8 +4226,6 @@ int16_t CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 089: Blow Up Child ACW-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4288,8 +4242,6 @@ int16_t CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 088: Blow Up Child ACW-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4306,8 +4258,6 @@ int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 115: Blow Up Child ACB-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4324,8 +4274,6 @@ int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 114: Blow Up Child ACB-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4342,8 +4290,6 @@ int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 113: Blow Up Child ACB-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4360,8 +4306,6 @@ int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 112: Blow Up Child ACB-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4378,8 +4322,6 @@ int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 111: Blow Up Child ACB-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4396,8 +4338,6 @@ int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 110: Blow Up Child ACB-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4414,8 +4354,6 @@ int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 109: Blow Up Child ACB-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4432,8 +4370,6 @@ int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 108: Blow Up Child ACB-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4450,8 +4386,6 @@ int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 107: Blow Up Child ACB-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4468,8 +4402,6 @@ int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 106: Blow Up Child ACB-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4486,8 +4418,6 @@ int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 105: Blow Up Child ACB-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4504,8 +4434,6 @@ int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 104: Blow Up Child ACB-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4522,8 +4450,6 @@ int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 127: Blow Up Child ACR-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4540,8 +4466,6 @@ int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 126: Blow Up Child ACR-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4558,8 +4482,6 @@ int16_t CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 125: Blow Up Child ACR-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4576,8 +4498,6 @@ int16_t CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 124: Blow Up Child ACR-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4594,8 +4514,6 @@ int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 123: Blow Up Child ACR-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4612,8 +4530,6 @@ int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 122: Blow Up Child ACR-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4630,8 +4546,6 @@ int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 121: Blow Up Child ACR-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4648,8 +4562,6 @@ int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 120: Blow Up Child ACR-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4666,8 +4578,6 @@ int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 119: Blow Up Child ACR-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4684,8 +4594,6 @@ int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 118: Blow Up Child ACR-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4702,8 +4610,6 @@ int16_t CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 117: Blow Up Child ACR-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4720,8 +4626,6 @@ int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 116: Blow Up Child ACR-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4738,8 +4642,6 @@ int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 139: Blow Up Child ACS-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4756,8 +4658,6 @@ int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 138: Blow Up Child ACS-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4774,8 +4674,6 @@ int16_t CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 137: Blow Up Child ACS-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4792,8 +4690,6 @@ int16_t CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 136: Blow Up Child ACS-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4810,8 +4706,6 @@ int16_t CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 135: Blow Up Child ACS-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4828,8 +4722,6 @@ int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 134: Blow Up Child ACS-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4846,8 +4738,6 @@ int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 133: Blow Up Child ACS-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4864,8 +4754,6 @@ int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 132: Blow Up Child ACS-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4882,8 +4770,6 @@ int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 131: Blow Up Child ACS-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4900,8 +4786,6 @@ int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 130: Blow Up Child ACS-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4918,8 +4802,6 @@ int16_t CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 129: Blow Up Child ACS-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4936,8 +4818,6 @@ int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 128: Blow Up Child ACS-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -6038,8 +5918,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0040::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 077: End Level Camera if ((ScriptActionCtr_077 < 1) && (1)) { aGoalCompleted(Goal_indexes[6], 1); diff --git a/scripts/level2.cpp b/scripts/level2.cpp index e485902bb..28d3f4b51 100644 --- a/scripts/level2.cpp +++ b/scripts/level2.cpp @@ -2189,8 +2189,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 038: Found Sweitzer in Minimum Security if ((ScriptActionCtr_038 < 1) && ((qObjCanSeePlayerAdvancedWithStore(3, 360, Object_handles[61], 80.000000f, 1048585) == true) && @@ -2279,8 +2277,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3047,8 +3043,6 @@ int16_t CustomObjectScript_2112::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_11F2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 115: Start Shuttle Tunnel Shot if (1) { aObjGhostSet(1, Object_handles[0]); @@ -3071,8 +3065,6 @@ int16_t CustomObjectScript_11F2::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_11F4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 117: Start Shuttle Arriving at Cell Shot if (1) { aObjGhostSet(1, Object_handles[0]); @@ -3094,8 +3086,6 @@ int16_t CustomObjectScript_11F4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 116: Start Shuttle In Cell Shot if (1) { aObjGhostSet(1, Object_handles[11]); @@ -3117,8 +3107,6 @@ int16_t CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_19F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 122: Start Shuttle Cell Shot Part 2 if (1) { aObjSetMovementType(Object_handles[8], 2); @@ -3156,8 +3144,6 @@ int16_t CustomObjectScript_11FB::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1211::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 118: Start Shuttle Leaving Cell Shot if (1) { aObjGhostSet(1, Object_handles[8]); @@ -3199,8 +3185,6 @@ int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 041: Shuttle Going To Sweitzer if ((ScriptActionCtr_041 < 1) && ((qUserFlag(9) == true) && (qUserFlag(8) == true) && (1 == false))) { aAIGoalFollowPathSimple(Object_handles[0], Path_indexes[2], 4096, 3, 3); @@ -3227,8 +3211,6 @@ int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 119: Start Player and Shuttle Exit Shot if (1) { aObjGhostSet(1, Object_handles[0]); @@ -4153,8 +4135,6 @@ int16_t CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 013: Supply Hangar Alarm if (1) { aAIGoalFollowPathSimple(Object_handles[25], Path_indexes[12], 2101504, 6, 3); @@ -4702,8 +4682,6 @@ int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 104: Maximum VOX Trigger if (qUserFlag(5) == false) { aSoundPlaySteaming("VoxL02SpecificA.osf", 1.000000f); @@ -4720,8 +4698,6 @@ int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 103: Medium VOX Trigger if (qUserFlag(4) == false) { aSoundPlaySteaming("VoxL02SpecificA.osf", 1.000000f); @@ -4738,8 +4714,6 @@ int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 098: Minimum VOX Trigger if (qUserFlag(3) == false) { aSoundPlaySteaming("VoxL02SpecificA.osf", 1.000000f); diff --git a/scripts/level3.cpp b/scripts/level3.cpp index 740f73198..00f651ec1 100644 --- a/scripts/level3.cpp +++ b/scripts/level3.cpp @@ -2025,8 +2025,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 095: Returned to Outside if ((ScriptActionCtr_095 < 1) && (((ScriptActionCtr_049 > 0) == true) && (qObjOnTerrain(qObjSavedHandle(17)) == true))) { @@ -2038,8 +2036,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -2318,8 +2314,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 003: LabDoors Init if ((ScriptActionCtr_003 < 1) && (1)) { aObjPlayAnim(Object_handles[27], 0, 2, 1.000000f, 0); @@ -2376,8 +2370,6 @@ int16_t CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1AE9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 069: Get LT's children if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[10], 0), 9); @@ -2551,8 +2543,6 @@ int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 026: Toggle4Timer if (1) { if (qUserVarValue(3) == 2.000000f) { @@ -2603,8 +2593,6 @@ int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 025: Toggle3Timer if (1) { if (qUserVarValue(2) == 2.000000f) { @@ -2655,8 +2643,6 @@ int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 024: Toggle2Timer if (1) { if (qUserVarValue(1) == 2.000000f) { @@ -2707,8 +2693,6 @@ int16_t CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 019: Toggle1Timer if (1) { if (qUserVarValue(0) == 2.000000f) { @@ -2760,8 +2744,6 @@ int16_t CustomObjectScript_28D9::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 088: OctaWest Timer if (1) { aUserFlagSet(4, 1); @@ -2809,8 +2791,6 @@ int16_t CustomObjectScript_38E0::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 046: OctaNorth Timer if (1) { aUserFlagSet(5, 1); @@ -2858,8 +2838,6 @@ int16_t CustomObjectScript_1995::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 045: OctaControl Timer if (1) { aUserFlagSet(3, 1); @@ -2907,8 +2885,6 @@ int16_t CustomObjectScript_11CB::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 044: OctaTrans Timer if (1) { aUserFlagSet(2, 1); @@ -3001,8 +2977,6 @@ int16_t CustomObjectScript_30D8::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 043: OctaSouth Timer if (1) { aUserFlagSet(7, 1); @@ -3095,8 +3069,6 @@ int16_t CustomObjectScript_28DA::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 042: OctaEast Timer if (1) { aUserFlagSet(6, 1); @@ -3189,8 +3161,6 @@ int16_t CustomObjectScript_21A7::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 014: OctaStore Timer if (1) { aUserFlagSet(0, 1); @@ -3283,8 +3253,6 @@ int16_t CustomObjectScript_21CA::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 033: OctaLab Timer if (1) { aUserFlagSet(1, 1); @@ -3381,8 +3349,6 @@ int16_t CustomObjectScript_202D::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 089: ThiefIntro Done if ((ScriptActionCtr_089 < 1) && (1)) { aSoundPlaySteaming("VoxL03SpecificD.osf", 1.000000f); @@ -3517,8 +3483,6 @@ int16_t CustomObjectScript_31CC::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_431E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 065: Get LTCbase1's children if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[44], 0), 5); @@ -3537,8 +3501,6 @@ int16_t CustomObjectScript_431E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1320::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 066: Get LTCbase2's children if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[45], 0), 6); @@ -3557,8 +3519,6 @@ int16_t CustomObjectScript_1320::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_131F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 067: Get LTCbase3's children if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[46], 0), 7); @@ -3577,8 +3537,6 @@ int16_t CustomObjectScript_131F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_131D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 068: Get LTCbase4's children if (1) { aObjSaveHandle(qGetAtachedChild(Object_handles[47], 0), 8); @@ -3695,8 +3653,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 011: Waypoint5 if (1) { aSetWaypoint(5); @@ -3713,8 +3669,6 @@ int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 010: Waypoint4 if (1) { aSetWaypoint(4); @@ -3731,8 +3685,6 @@ int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 008: Waypoint2 if (1) { aSetWaypoint(2); @@ -3749,8 +3701,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 007: Waypoint1 if (1) { aSetWaypoint(1); @@ -3767,8 +3717,6 @@ int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 059: Voice Trigger 10 if ((ScriptActionCtr_059 < 1) && (1)) { aSoundPlaySteaming("VoxCompIntruderB.osf", 0.500000f); @@ -3785,8 +3733,6 @@ int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 057: Voice Trigger 8 if ((ScriptActionCtr_057 < 1) && (1)) { @@ -3802,8 +3748,6 @@ int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 056: Voice Trigger 7 if ((ScriptActionCtr_056 < 1) && (1)) { aSoundPlaySteaming("VoxCompPowerDamage.osf", 0.500000f); @@ -3820,8 +3764,6 @@ int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 055: Voice Computer if ((ScriptActionCtr_055 < 1) && (1)) { aSoundPlaySteaming("VoxCompComDatalink.osf", 0.500000f); @@ -3865,8 +3807,6 @@ int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 052: Voice Trigger 3 if ((ScriptActionCtr_052 < 1) && (1)) { aSoundPlaySteaming("VoxCompEmergencyA.osf", 0.500000f); @@ -3883,8 +3823,6 @@ int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 051: Voice Trigger 2 if ((ScriptActionCtr_051 < 1) && (1)) { aSoundPlaySteaming("VoxCompSecurityLockdown.osf", 0.500000f); @@ -3901,8 +3839,6 @@ int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 050: Voice Trigger 1 if ((ScriptActionCtr_050 < 1) && (1)) { @@ -4182,8 +4118,6 @@ int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 105: Upload Node Description if ((ScriptActionCtr_105 < 1) && (1)) { aShowHUDMessage(Message_strings[21]); diff --git a/scripts/level4.cpp b/scripts/level4.cpp index 42d0be8dc..bc6c56d28 100644 --- a/scripts/level4.cpp +++ b/scripts/level4.cpp @@ -997,8 +997,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1755,8 +1753,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 054: After Intro Movie if ((ScriptActionCtr_054 < 1) && (1)) { aSoundPlaySteaming("VoxL04StartLevel.osf", 1.000000f); @@ -1786,8 +1782,6 @@ int16_t CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 030: Data Cartridge INIT if (1) { aObjGhostSet(1, Object_handles[5]); @@ -1811,8 +1805,6 @@ int16_t CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 055: Data Cartridge ADD if ((ScriptActionCtr_055 < 1) && (qObjType(qPlayerClosest(data->me_handle, -1)) == 4)) { aAddObjectToInventory(data->me_handle, qPlayerClosest(data->me_handle, -1), 0); @@ -1871,8 +1863,6 @@ int16_t CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 032: After Upload Movie if (1) { aShowHUDMessage(Message_strings[4]); @@ -1937,8 +1927,6 @@ int16_t CustomObjectScript_117D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 029: Entered Suzuki if ((ScriptActionCtr_029 < 1) && (1)) { aShowHUDMessage(Message_strings[1]); @@ -1955,8 +1943,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 035: Mercenary Intro if ((ScriptActionCtr_035 < 1) && ((ScriptActionCtr_032 > 0) == true)) { aMusicSetRegionAll(6); diff --git a/scripts/level5.cpp b/scripts/level5.cpp index 0d16e2cd9..777c99a12 100644 --- a/scripts/level5.cpp +++ b/scripts/level5.cpp @@ -1490,8 +1490,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 028: Update Reactor Display if (1) { aCustomReactorDisplayUpdate(); @@ -1513,8 +1511,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1830,8 +1826,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 009: GiveStartMessage if ((ScriptActionCtr_009 < 1) && (1)) { aSoundPlayObject(Sound_indexes[0], Object_handles[4], 1.000000f); @@ -1868,8 +1862,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_200D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 027: Reactor5Status75percent if ((ScriptActionCtr_027 < 1) && ((qObjShields(data->me_handle) < 22500.000000f) && (1))) { aShowHUDMessage(Message_strings[4]); @@ -1937,8 +1929,6 @@ int16_t CustomObjectScript_200D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_281B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 026: Reactor4Status75percent if ((ScriptActionCtr_026 < 1) && ((qObjShields(data->me_handle) < 22500.000000f) && (1))) { aShowHUDMessage(Message_strings[6]); @@ -1997,8 +1987,6 @@ int16_t CustomObjectScript_281B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_3816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 025: Reactor3Status75percent if ((ScriptActionCtr_025 < 1) && ((qObjShields(data->me_handle) < 22500.000000f) && (1))) { aShowHUDMessage(Message_strings[7]); @@ -2057,8 +2045,6 @@ int16_t CustomObjectScript_3816::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 024: Reactor2Status75percent if ((ScriptActionCtr_024 < 1) && ((qObjShields(data->me_handle) < 22500.000000f) && (1))) { aShowHUDMessage(Message_strings[8]); @@ -2117,8 +2103,6 @@ int16_t CustomObjectScript_1012::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_181C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 005: Reactor1Status75percent if ((ScriptActionCtr_005 < 1) && ((qObjShields(data->me_handle) < 22500.000000f) && (1))) { aShowHUDMessage(Message_strings[9]); diff --git a/scripts/level7.cpp b/scripts/level7.cpp index d4657d55f..875af29b4 100644 --- a/scripts/level7.cpp +++ b/scripts/level7.cpp @@ -1900,8 +1900,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -1968,8 +1966,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 035: Movie Done--Play Sounds if ((ScriptActionCtr_035 < 1) && (1)) { aSetLevelTimer(30.000000f, 2); @@ -2024,8 +2020,6 @@ int16_t CustomObjectScript_1097::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 054: Primary Control if ((ScriptActionCtr_054 < 1) && (1)) { aShowHUDMessage(Message_strings[0]); @@ -2046,8 +2040,6 @@ int16_t CustomObjectScript_1097::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 027: SmokeSpewer (2) if (1) { aTurnOnSpew(data->me_handle, 0, 7, 1.000000f, 0.100000f, 65664, 0, 1.500000f, 0.150000f, -1.000000f, 4.000000f, @@ -2065,8 +2057,6 @@ int16_t CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0895::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 026: SmokeSpewer (1) if (1) { aTurnOnSpew(data->me_handle, 0, 7, 1.000000f, 0.100000f, 65664, 0, 1.500000f, 0.150000f, -1.000000f, 4.000000f, @@ -2084,8 +2074,6 @@ int16_t CustomObjectScript_0895::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 023: FireSpewer (1) if (1) { aTurnOnSpew(data->me_handle, 0, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.150000f, -1.000000f, 5.000000f, @@ -2103,8 +2091,6 @@ int16_t CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 025: FireSpewer (2) if (1) { aTurnOnSpew(data->me_handle, 0, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.150000f, -1.000000f, 5.000000f, @@ -2122,8 +2108,6 @@ int16_t CustomObjectScript_08A2::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 024: FireSpewer (3) if (1) { aTurnOnSpew(data->me_handle, 0, 2, 0.000000f, 0.000000f, 65536, 0, 1.500000f, 0.150000f, -1.000000f, 5.000000f, @@ -2141,8 +2125,6 @@ int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1901::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 047: Do Cooler Actions if ((ScriptActionCtr_047 < 1) && (1)) { aCreatePopupView(0, Object_handles[17], 10.000000f, 1.000000f); @@ -2488,8 +2470,6 @@ int16_t CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08B4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 033: Superheater begin (1) if ((ScriptActionCtr_033 < 1) && (1)) { aTurnOnSpew(data->me_handle, 0, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.100000f, -1.000000f, 6.000000f, @@ -2508,8 +2488,6 @@ int16_t CustomObjectScript_08B4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 005: Superheater begin (2) if ((ScriptActionCtr_005 < 1) && (1)) { aTurnOnSpew(data->me_handle, 0, 2, 0.000000f, 0.000000f, 65536, 0, 2.000000f, 0.100000f, -1.000000f, 6.000000f, @@ -2640,8 +2618,6 @@ int16_t CustomObjectScript_20B1::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 037: Generic Smoke Spewer 4 if (1) { aTurnOnSpew(Object_handles[40], 0, 7, 1.000000f, 0.100000f, 65664, 0, 1.500000f, 0.120000f, -1.000000f, 6.500000f, @@ -2691,8 +2667,6 @@ int16_t CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 021: Broken Pipe Part III (1) if (qUserVarValue(0) == 1.000000f) { aObjDestroy(data->me_handle); @@ -2703,8 +2677,6 @@ int16_t CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 019: Broken Pipe Part I (1) if (1) { aUserVarSet(0, 0.000000f); @@ -2716,8 +2688,6 @@ int16_t CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 020: Broken Pipe Part II (1) if (1) { if (qUserVarValue(0) == 0.000000f) { @@ -2742,8 +2712,6 @@ int16_t CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 038: Broken Pipe Part III (2) if (qUserVarValue(1) == 1.000000f) { aObjDestroy(data->me_handle); @@ -2754,8 +2722,6 @@ int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 039: Broken Pipe Part I (2) if (1) { aUserVarSet(1, 0.000000f); @@ -2767,8 +2733,6 @@ int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 040: Broken Pipe Part II (2) if (1) { if (qUserVarValue(1) == 0.000000f) { @@ -2962,8 +2926,6 @@ int16_t CustomObjectScript_2148::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 081: TurretMessage if ((ScriptActionCtr_081 < 3) && (1)) { aShowHUDMessage(Message_strings[21]); @@ -3116,8 +3078,6 @@ int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 044: Waypoint 3 if (1) { aSetWaypoint(3); diff --git a/scripts/level8.cpp b/scripts/level8.cpp index 22e0eb9f8..3745e7ec8 100644 --- a/scripts/level8.cpp +++ b/scripts/level8.cpp @@ -1945,8 +1945,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 029: Medical Frigate Mayday! if ((qRoomHasPlayer(Room_indexes[21]) == true) && (qUserFlag(10) == false)) { aAddGameMessage(Message_strings[10], Message_strings[11]); @@ -1969,8 +1967,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -2515,8 +2511,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 050: Music OutsideInit if ((ScriptActionCtr_050 < 1) && (1)) { aMusicSetRegionAll(1); @@ -3402,8 +3396,6 @@ int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 087: Security Tower Goal Trigger if (1) { aGoalCompleted(Goal_indexes[2], 1); diff --git a/scripts/levelS2.cpp b/scripts/levelS2.cpp index 9c01aa512..17f9df648 100644 --- a/scripts/levelS2.cpp +++ b/scripts/levelS2.cpp @@ -3250,8 +3250,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -3547,8 +3545,6 @@ int16_t CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 101: MiniReactorBlue TimerChain if ((ScriptActionCtr_101 < 1) && (1)) { aSetObjectTimer(Object_handles[11], 6.000000f, -1); @@ -3631,8 +3627,6 @@ int16_t CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 100: MiniReactorWhite TimerChain if ((ScriptActionCtr_100 < 1) && (1)) { aSetObjectTimer(Object_handles[26], 6.000000f, -1); @@ -3763,8 +3757,6 @@ int16_t CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 103: MiniReactorRed-2 Timer Chain if ((ScriptActionCtr_103 < 1) && (1)) { aSetObjectTimer(Object_handles[45], 6.000000f, -1); @@ -3792,8 +3784,6 @@ int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 102: MiniReactorRed-1 Timer Chain if ((ScriptActionCtr_102 < 1) && (1)) { aSetObjectTimer(Object_handles[57], 6.000000f, -1); @@ -3821,8 +3811,6 @@ int16_t CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 073: MiniReactorRed Timer if ((ScriptActionCtr_073 < 1) && (1)) { aLightningCreate(Object_handles[69], Object_handles[70], 9999.000000f, 3.000000f, 1, Texture_indexes[0], @@ -3894,8 +3882,6 @@ int16_t CustomObjectScript_08C4::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 142: ReactorInit if (1) { aObjMakeInvuln(data->me_handle, 99999); @@ -3933,8 +3919,6 @@ int16_t CustomObjectScript_08C4::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 143: ReactorStartCharge if (1) { if (qUserVarValue(4) > 6.000000f) { @@ -3960,8 +3944,6 @@ int16_t CustomObjectScript_08C4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10CE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 075: ReactorShake if (1) { aSetObjectTimer(data->me_handle, qRandomValue(0.500000f, 1.600000f), -1); @@ -3979,8 +3961,6 @@ int16_t CustomObjectScript_10CE::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 083: CycleFlames-5 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[77], 1.000000f); @@ -4017,8 +3997,6 @@ int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 082: CycleFlames-4 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[81], 1.000000f); @@ -4055,8 +4033,6 @@ int16_t CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 081: CycleFlames-3 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[84], 1.000000f); @@ -4093,8 +4069,6 @@ int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 080: CycleFlames-2 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[89], 1.000000f); @@ -4131,8 +4105,6 @@ int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 079: CycleFlames-1 if (1) { aSoundPlayObject(Sound_indexes[5], Object_handles[92], 1.000000f); @@ -4241,8 +4213,6 @@ int16_t CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 099: Blow Up Child ACW-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4259,8 +4229,6 @@ int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 098: Blow Up Child ACW-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4277,8 +4245,6 @@ int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 097: Blow Up Child ACW-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4295,8 +4261,6 @@ int16_t CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 096: Blow Up Child ACW-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4313,8 +4277,6 @@ int16_t CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 095: Blow Up Child ACW-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4331,8 +4293,6 @@ int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 094: Blow Up Child ACW-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4349,8 +4309,6 @@ int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 093: Blow Up Child ACW-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4367,8 +4325,6 @@ int16_t CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 092: Blow Up Child ACW-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4385,8 +4341,6 @@ int16_t CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 091: Blow Up Child ACW-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4403,8 +4357,6 @@ int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 090: Blow Up Child ACW-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4421,8 +4373,6 @@ int16_t CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 089: Blow Up Child ACW-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4439,8 +4389,6 @@ int16_t CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 088: Blow Up Child ACW-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4457,8 +4405,6 @@ int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 115: Blow Up Child ACB-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4475,8 +4421,6 @@ int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 114: Blow Up Child ACB-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4493,8 +4437,6 @@ int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 113: Blow Up Child ACB-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4511,8 +4453,6 @@ int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 112: Blow Up Child ACB-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4529,8 +4469,6 @@ int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 111: Blow Up Child ACB-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4547,8 +4485,6 @@ int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 110: Blow Up Child ACB-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4565,8 +4501,6 @@ int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 109: Blow Up Child ACB-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4583,8 +4517,6 @@ int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 108: Blow Up Child ACB-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4601,8 +4533,6 @@ int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 107: Blow Up Child ACB-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4619,8 +4549,6 @@ int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 106: Blow Up Child ACB-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4637,8 +4565,6 @@ int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 105: Blow Up Child ACB-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4655,8 +4581,6 @@ int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 104: Blow Up Child ACB-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4673,8 +4597,6 @@ int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 127: Blow Up Child ACR-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4691,8 +4613,6 @@ int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 126: Blow Up Child ACR-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4709,8 +4629,6 @@ int16_t CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 125: Blow Up Child ACR-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4727,8 +4645,6 @@ int16_t CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 124: Blow Up Child ACR-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4745,8 +4661,6 @@ int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 123: Blow Up Child ACR-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4763,8 +4677,6 @@ int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 122: Blow Up Child ACR-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4781,8 +4693,6 @@ int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 121: Blow Up Child ACR-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4799,8 +4709,6 @@ int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 120: Blow Up Child ACR-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4817,8 +4725,6 @@ int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 119: Blow Up Child ACR-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4835,8 +4741,6 @@ int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 118: Blow Up Child ACR-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4853,8 +4757,6 @@ int16_t CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 117: Blow Up Child ACR-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4871,8 +4773,6 @@ int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 116: Blow Up Child ACR-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4889,8 +4789,6 @@ int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 139: Blow Up Child ACS-12 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4907,8 +4805,6 @@ int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 138: Blow Up Child ACS-11 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4925,8 +4821,6 @@ int16_t CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 137: Blow Up Child ACS-10 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4943,8 +4837,6 @@ int16_t CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 136: Blow Up Child ACS-9 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4961,8 +4853,6 @@ int16_t CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 135: Blow Up Child ACS-8 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4979,8 +4869,6 @@ int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 134: Blow Up Child ACS-7 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -4997,8 +4885,6 @@ int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 133: Blow Up Child ACS-6 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -5015,8 +4901,6 @@ int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 132: Blow Up Child ACS-5 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -5033,8 +4917,6 @@ int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 131: Blow Up Child ACS-4 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -5051,8 +4933,6 @@ int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 130: Blow Up Child ACS-3 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -5069,8 +4949,6 @@ int16_t CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 129: Blow Up Child ACS-2 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -5087,8 +4965,6 @@ int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 128: Blow Up Child ACS-1 if (1) { aObjDestroy(qGetAtachedChild(data->me_handle, 0)); @@ -6189,8 +6065,6 @@ int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { int16_t TriggerScript_0040::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 077: End Level Camera if ((ScriptActionCtr_077 < 1) && (1)) { aGoalCompleted(Goal_indexes[6], 1); diff --git a/scripts/merc5.cpp b/scripts/merc5.cpp index 0cc9c4e44..1b5e29d3c 100644 --- a/scripts/merc5.cpp +++ b/scripts/merc5.cpp @@ -2014,8 +2014,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_INTERVAL: { - tOSIRISEVTINTERVAL *event_data = &data->evt_interval; - // Script 042: Level FRAME (Left Creepers) if (qUserFlag(0) == true) { if ((qRoomHasPlayer(Room_indexes[0]) == 1) && (qUserFlag(8) == 0)) { @@ -2075,8 +2073,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -2415,8 +2411,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_LEVEL_GOAL_COMPLETE: { - tOSIRISEVTLEVELGOALCOMPLETE *event_data = &data->evt_level_goal_complete; - // Script 041: Both Hubs Infected if ((ScriptActionCtr_041 < 1) && ((qUserFlag(1) == 1) && (qUserFlag(0) == 1))) { aShowHUDMessage(Message_strings[10]); @@ -2428,8 +2422,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_PLAYER_MOVIE_END: { - tOSIRISEVTPLAYERMOVIEEND *event_data = &data->evt_player_movie_end; - // Script 026: EndMovie-2 if ((ScriptActionCtr_026 < 1) && (1)) { aObjGhostSet(0, Object_handles[15]); @@ -2455,8 +2447,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 073: IntroCam-2 if (1) { aMusicSetRegionAll(1); @@ -2481,8 +2471,6 @@ int16_t CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 077: Intro2 Spark if (1) { aTurnOnSpew(Object_handles[22], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 20.000000f, @@ -2503,8 +2491,6 @@ int16_t CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 074: IntroCam-3 if (1) { aCinematicSimple(Path_indexes[5], Message_strings[2], Object_handles[24], 9.000000f, 1); @@ -2521,8 +2507,6 @@ int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 075: IntroCam-4 if (1) { aLightningTurnOn(0.150000f, 0.080000f); @@ -2543,8 +2527,6 @@ int16_t CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { - tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; - // Script 076: IntroCam-POST if (1) { aLightningTurnOn(0.200000f, 0.080000f); @@ -2710,8 +2692,6 @@ int16_t CustomObjectScript_1A02::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1033::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 058: Crystal Complete8 if (1) { aSoundPlayObject(Sound_indexes[3], Object_handles[42], 1.000000f); @@ -2748,8 +2728,6 @@ int16_t CustomObjectScript_1033::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1200::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 057: Crystal Complete7 if (1) { aSoundStopObj(Object_handles[37]); @@ -2784,8 +2762,6 @@ int16_t CustomObjectScript_1200::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1036::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 048: Crystal Complete6 if (1) { aRoomSetWind(Room_indexes[31], 0.000000f, 1.000000f, 0.000000f, 0.500000f); @@ -2807,8 +2783,6 @@ int16_t CustomObjectScript_1036::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 046: Crystal Complete5 if (1) { aSetObjectTimer(Object_handles[56], 1.500000f, -1); @@ -2829,8 +2803,6 @@ int16_t CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_3032::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 045: Crystal Complete4 if (1) { aSetObjectTimer(Object_handles[57], 1.500000f, -1); @@ -2851,8 +2823,6 @@ int16_t CustomObjectScript_3032::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1830::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 044: Crystal Complete3 if (1) { aSetObjectTimer(Object_handles[58], 1.500000f, -1); @@ -2873,8 +2843,6 @@ int16_t CustomObjectScript_1830::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 007: Crystal Complete2 if (1) { aSoundPlayObject(Sound_indexes[6], Object_handles[37], 1.000000f); @@ -2906,8 +2874,6 @@ int16_t CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0A06::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 047: Crystal Complete1 if (((ScriptActionCtr_006 > 0) == true) && ((ScriptActionCtr_024 > 0) == true) && ((ScriptActionCtr_032 > 0) == true) && ((ScriptActionCtr_033 > 0) == true)) { @@ -3341,8 +3307,6 @@ int16_t CustomObjectScript_21DA::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_0899::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 081: Receptor NodeShutdown4 if ((ScriptActionCtr_081 < 1) && (1)) { aObjPlayAnim(Object_handles[7], 1, 2, 1.000000f, 0); @@ -3362,8 +3326,6 @@ int16_t CustomObjectScript_0899::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 080: Receptor NodeShutdown3 if ((ScriptActionCtr_080 < 1) && (1)) { aObjPlayAnim(Object_handles[6], 1, 2, 1.000000f, 0); @@ -3383,8 +3345,6 @@ int16_t CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_089B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 079: Receptor NodeShutdown2 if ((ScriptActionCtr_079 < 1) && (1)) { aObjPlayAnim(Object_handles[5], 1, 2, 1.000000f, 0); @@ -3404,8 +3364,6 @@ int16_t CustomObjectScript_089B::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1098::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 020: Receptor NodeShutdown1 if ((ScriptActionCtr_020 < 1) && (1)) { aObjPlayAnim(Object_handles[4], 1, 2, 1.000000f, 0); @@ -3457,8 +3415,6 @@ int16_t CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 088: RestorePower3 if (1) { aSetLevelTimer(4.000000f, 19); @@ -3546,8 +3502,6 @@ int16_t CustomObjectScript_19A0::CallEvent(int event, tOSIRISEventInfo *data) { } } break; case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 087: RestorePower2 if (1) { aObjPlayAnim(Object_handles[139], 0, 3, 3.000000f, 0); @@ -3571,8 +3525,6 @@ int16_t CustomObjectScript_19A0::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 025: EndMovie-1 if ((ScriptActionCtr_025 < 1) && (1)) { aSetObjectTimer(Object_handles[164], 1.200000f, -1); @@ -3598,8 +3550,6 @@ int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { - tOSIRISEVTTIMER *event_data = &data->evt_timer; - // Script 027: EndMovie-1 Door Open if (1) { aTurnOnSpew(Object_handles[166], -1, 7, 0.000000f, 0.000000f, 65536, 0, 1.200000f, 0.100000f, 10.000000f, @@ -3620,8 +3570,6 @@ int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { - tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; - // Script 015: BrokenDoor if (1) { aEmitSparks(qRandomValue(10.000000f, 50.000000f), data->me_handle); diff --git a/scripts/myPowerHouse.cpp b/scripts/myPowerHouse.cpp index faf6f5d36..64a3b5101 100644 --- a/scripts/myPowerHouse.cpp +++ b/scripts/myPowerHouse.cpp @@ -532,8 +532,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { dfRestore(event_data->fileptr); } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); } break; diff --git a/scripts/orbital.cpp b/scripts/orbital.cpp index c566fc73d..443d83404 100644 --- a/scripts/orbital.cpp +++ b/scripts/orbital.cpp @@ -750,8 +750,6 @@ int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { #endif } break; case EVT_LEVELSTART: { - tOSIRISEVTLEVELSTART *event_data = &data->evt_levelstart; - ClearGlobalActionCtrs(); dfInit(); @@ -870,8 +868,6 @@ int16_t CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { int16_t CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { - tOSIRISEVTCREATED *event_data = &data->evt_created; - // Script 006: SoundSource 1 if (1) { aSoundPlayObject(Sound_indexes[2], data->me_handle, 1.000000f);