diff options
Diffstat (limited to 'Stars45/MissionEvent.cpp')
| -rw-r--r-- | Stars45/MissionEvent.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Stars45/MissionEvent.cpp b/Stars45/MissionEvent.cpp index 1ef3308..92b5d0f 100644 --- a/Stars45/MissionEvent.cpp +++ b/Stars45/MissionEvent.cpp @@ -170,7 +170,7 @@ MissionEvent::CheckTrigger() if (ship) { double damage = 100.0 * (ship->Design()->integrity - ship->Integrity()) / (ship->Design()->integrity); - + if (damage >= trigger_param[0]) Activate(); } @@ -180,7 +180,7 @@ MissionEvent::CheckTrigger() case TRIGGER_DETECT: { Ship* ship = sim->FindShip(trigger_ship); Ship* tgt = sim->FindShip(trigger_target); - + if (ship && tgt) { if (ship->FindContact(tgt)) Activate(); @@ -194,7 +194,7 @@ MissionEvent::CheckTrigger() case TRIGGER_RANGE: { Ship* ship = sim->FindShip(trigger_ship); Ship* tgt = sim->FindShip(trigger_target); - + if (ship && tgt) { double range = (ship->Location() - tgt->Location()).length(); double min_range = 0; @@ -369,7 +369,7 @@ MissionEvent::Execute(bool silent) } break; - case OBJECTIVE: + case OBJECTIVE: if (elem) { if (event_param[0]) { elem->ClearInstructions(); @@ -504,7 +504,7 @@ MissionEvent::Execute(bool silent) cam_dir->SetShip(player); switch (event_param[0]) { - case 1: + case 1: if (cam_dir->GetMode() != CameraDirector::MODE_COCKPIT) cam_dir->SetMode(CameraDirector::MODE_COCKPIT, event_rect.x); break; @@ -528,7 +528,7 @@ MissionEvent::Execute(bool silent) if (event_target.length()) { ::Print("Mission Event %d: setting camera target to %s\n", id, (const char*) event_target); Ship* s_tgt = 0; - + if (event_target.indexOf("body:") < 0) s_tgt = sim->FindShip(event_target); @@ -683,7 +683,7 @@ MissionEvent::Execute(bool silent) if (!silent && !sound && event_sound.length()) { DataLoader* loader = DataLoader::GetLoader(); bool use_fs = loader->IsFileSystemEnabled(); - DWORD flags = pan ? Sound::LOCKED|Sound::LOCALIZED : + DWORD flags = pan ? Sound::LOCKED|Sound::LOCALIZED : Sound::LOCKED|Sound::AMBIENT; loader->UseFileSystem(true); @@ -817,9 +817,9 @@ MissionEvent::NumTriggerParams() const // +--------------------------------------------------------------------+ static const char* event_names[] = { - "Message", + "Message", "Objective", - "Instruction", + "Instruction", "IFF", "Damage", "Jump", @@ -838,7 +838,7 @@ static const char* event_names[] = { static const char* trigger_names[] = { "Time", "Damage", - "Destroyed", + "Destroyed", "Jump", "Launch", "Dock", |