From 69209c38968c6f4066a772e0a51a2928749217de Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 19:00:23 +0000 Subject: Re-indenting the code to use standard tabs. Yes, I know this is pretty pointless, but who cares? --- Stars45/HUDSounds.cpp | 134 +++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'Stars45/HUDSounds.cpp') diff --git a/Stars45/HUDSounds.cpp b/Stars45/HUDSounds.cpp index 86d1ec8..84c559b 100644 --- a/Stars45/HUDSounds.cpp +++ b/Stars45/HUDSounds.cpp @@ -1,15 +1,15 @@ /* Project Starshatter 4.5 - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: Stars.exe - FILE: HUDSounds.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: Stars.exe + FILE: HUDSounds.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== - HUDSounds singleton class utility implementation + OVERVIEW + ======== + HUDSounds singleton class utility implementation */ #include "MemDebug.h" @@ -36,30 +36,30 @@ static Sound* tac_reject = 0; static void LoadInterfaceSound(DataLoader* loader, const char* wave, Sound*& s) { - loader->LoadSound(wave, s, 0, true); // optional sound effect + loader->LoadSound(wave, s, 0, true); // optional sound effect } void HUDSounds::Initialize() { - DataLoader* loader = DataLoader::GetLoader(); - loader->SetDataPath("Sounds/"); - - LoadInterfaceSound(loader, "mfd_mode.wav", mfd_mode); - LoadInterfaceSound(loader, "nav_mode.wav", nav_mode); - LoadInterfaceSound(loader, "wep_mode.wav", wep_mode); - LoadInterfaceSound(loader, "wep_disp.wav", wep_disp); - LoadInterfaceSound(loader, "hud_mode.wav", hud_mode); - LoadInterfaceSound(loader, "hud_widget.wav", hud_widget); - LoadInterfaceSound(loader, "shield_level.wav", shield_level); - LoadInterfaceSound(loader, "alarm.wav", red_alert); - LoadInterfaceSound(loader, "tac_accept.wav", tac_accept); - LoadInterfaceSound(loader, "tac_reject.wav", tac_reject); - - if (red_alert) - red_alert->SetFlags(Sound::AMBIENT | Sound::LOOP | Sound::LOCKED); - - loader->SetDataPath(0); + DataLoader* loader = DataLoader::GetLoader(); + loader->SetDataPath("Sounds/"); + + LoadInterfaceSound(loader, "mfd_mode.wav", mfd_mode); + LoadInterfaceSound(loader, "nav_mode.wav", nav_mode); + LoadInterfaceSound(loader, "wep_mode.wav", wep_mode); + LoadInterfaceSound(loader, "wep_disp.wav", wep_disp); + LoadInterfaceSound(loader, "hud_mode.wav", hud_mode); + LoadInterfaceSound(loader, "hud_widget.wav", hud_widget); + LoadInterfaceSound(loader, "shield_level.wav", shield_level); + LoadInterfaceSound(loader, "alarm.wav", red_alert); + LoadInterfaceSound(loader, "tac_accept.wav", tac_accept); + LoadInterfaceSound(loader, "tac_reject.wav", tac_reject); + + if (red_alert) + red_alert->SetFlags(Sound::AMBIENT | Sound::LOOP | Sound::LOCKED); + + loader->SetDataPath(0); } // +--------------------------------------------------------------------+ @@ -67,52 +67,52 @@ HUDSounds::Initialize() void HUDSounds::Close() { - delete mfd_mode; - delete nav_mode; - delete wep_mode; - delete wep_disp; - delete hud_mode; - delete hud_widget; - delete shield_level; - delete red_alert; - delete tac_accept; - delete tac_reject; + delete mfd_mode; + delete nav_mode; + delete wep_mode; + delete wep_disp; + delete hud_mode; + delete hud_widget; + delete shield_level; + delete red_alert; + delete tac_accept; + delete tac_reject; } void HUDSounds::PlaySound(int n) { - Sound* sound = 0; - - switch (n) { - default: - case SND_MFD_MODE: if (mfd_mode) sound = mfd_mode->Duplicate(); break; - case SND_NAV_MODE: if (nav_mode) sound = nav_mode->Duplicate(); break; - case SND_WEP_MODE: if (wep_mode) sound = wep_mode->Duplicate(); break; - case SND_WEP_DISP: if (wep_disp) sound = wep_disp->Duplicate(); break; - case SND_HUD_MODE: if (hud_mode) sound = hud_mode->Duplicate(); break; - case SND_HUD_WIDGET: if (hud_widget) sound = hud_widget->Duplicate(); break; - case SND_SHIELD_LEVEL: if (shield_level) sound = shield_level->Duplicate(); break; - case SND_TAC_ACCEPT: if (tac_accept) sound = tac_accept->Duplicate(); break; - case SND_TAC_REJECT: if (tac_reject) sound = tac_reject->Duplicate(); break; - - // RED ALERT IS A SPECIAL CASE! - case SND_RED_ALERT: - if (red_alert) { - sound = red_alert; - } - break; - } - - if (sound && !sound->IsPlaying()) { - int gui_volume = AudioConfig::GuiVolume(); - sound->SetVolume(gui_volume); - sound->Play(); - } + Sound* sound = 0; + + switch (n) { + default: + case SND_MFD_MODE: if (mfd_mode) sound = mfd_mode->Duplicate(); break; + case SND_NAV_MODE: if (nav_mode) sound = nav_mode->Duplicate(); break; + case SND_WEP_MODE: if (wep_mode) sound = wep_mode->Duplicate(); break; + case SND_WEP_DISP: if (wep_disp) sound = wep_disp->Duplicate(); break; + case SND_HUD_MODE: if (hud_mode) sound = hud_mode->Duplicate(); break; + case SND_HUD_WIDGET: if (hud_widget) sound = hud_widget->Duplicate(); break; + case SND_SHIELD_LEVEL: if (shield_level) sound = shield_level->Duplicate(); break; + case SND_TAC_ACCEPT: if (tac_accept) sound = tac_accept->Duplicate(); break; + case SND_TAC_REJECT: if (tac_reject) sound = tac_reject->Duplicate(); break; + + // RED ALERT IS A SPECIAL CASE! + case SND_RED_ALERT: + if (red_alert) { + sound = red_alert; + } + break; + } + + if (sound && !sound->IsPlaying()) { + int gui_volume = AudioConfig::GuiVolume(); + sound->SetVolume(gui_volume); + sound->Play(); + } } void HUDSounds::StopSound(int n) { - if (n == SND_RED_ALERT && red_alert) { - red_alert->Stop(); - } + if (n == SND_RED_ALERT && red_alert) { + red_alert->Stop(); + } } -- cgit v1.1