Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 8a1cf9e

Browse files
garethyrgarethyr
committed
Updated GUISounds to set as immobile and attenuate away instantly (less relevant), and updated things that call them so they just have to put in the player
1 parent fe9f922 commit 8a1cf9e

File tree

6 files changed

+131
-131
lines changed

6 files changed

+131
-131
lines changed

‎Activities/GameActivity.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ bool GameActivity::CreateDelivery(int player, int mode, Vector &waypoint, Actor
786786

787787
// Go 'ding!', but only if player is human, or it may be confusing
788788
if (PlayerHuman(player))
789-
g_GUISound.ConfirmSound()->Play(0, player);
789+
g_GUISound.ConfirmSound()->Play(player);
790790

791791
// Clear out the override purchase list, whether anything was in there or not, it should not override twice.
792792
m_PurchaseOverride[player].clear();
@@ -1472,7 +1472,7 @@ void GameActivity::Update()
14721472
// Switch back to normal view
14731473
m_ViewState[player] = NORMAL;
14741474
// Play err sound to indicate cancellation
1475-
g_GUISound.UserErrorSound()->Play(0, player);
1475+
g_GUISound.UserErrorSound()->Play(player);
14761476
// Flash the same actor, jsut to show the control went back to him
14771477
m_pPieMenu[player]->DisableAnim();
14781478
}
@@ -1488,7 +1488,7 @@ void GameActivity::Update()
14881488
SwitchToActor(pMarkedActor, player, team);
14891489
// If not, boop
14901490
else
1491-
g_GUISound.UserErrorSound()->Play(0, player);
1491+
g_GUISound.UserErrorSound()->Play(player);
14921492

14931493
// Switch back to normal view
14941494
m_ViewState[player] = NORMAL;
@@ -1734,18 +1734,18 @@ void GameActivity::Update()
17341734
if (m_PlayerController[player].IsState(PRESS_DOWN))// || m_PlayerController[player].IsState(PRESS_SECONDARY))
17351735
{
17361736
if (m_AIReturnCraft[player])
1737-
g_GUISound.SelectionChangeSound()->Play(0, player);
1737+
g_GUISound.SelectionChangeSound()->Play(player);
17381738
else
1739-
g_GUISound.UserErrorSound()->Play(0, player);
1739+
g_GUISound.UserErrorSound()->Play(player);
17401740

17411741
m_AIReturnCraft[player] = false;
17421742
}
17431743
else if (m_PlayerController[player].IsState(PRESS_UP))// || m_PlayerController[player].IsState(PRESS_SECONDARY))
17441744
{
17451745
if (!m_AIReturnCraft[player])
1746-
g_GUISound.SelectionChangeSound()->Play(0, player);
1746+
g_GUISound.SelectionChangeSound()->Play(player);
17471747
else
1748-
g_GUISound.UserErrorSound()->Play(0, player);
1748+
g_GUISound.UserErrorSound()->Play(player);
17491749

17501750
m_AIReturnCraft[player] = true;
17511751
}
@@ -1758,7 +1758,7 @@ void GameActivity::Update()
17581758
// Play err sound to indicate cancellation
17591759
g_FrameMan.SetScreenText("Order canceled!", ScreenOfPlayer(player), 333);
17601760
m_MsgTimer[player].Reset();
1761-
g_GUISound.UserErrorSound()->Play(0, player);
1761+
g_GUISound.UserErrorSound()->Play(player);
17621762
// Flash the same actor, jsut to show the control went back to him
17631763
m_pPieMenu[player]->DisableAnim();
17641764
}

‎GUI/GUISound.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,74 +39,74 @@ namespace RTE {
3939
int GUISound::Create() {
4040
// Interface sounds should not be pitched to reinforce the appearance of time decoupling between simulation and UI.
4141

42-
m_SplashSound.Create("Base.rte/Sounds/GUIs/MetaStart.wav", false, 0);
42+
m_SplashSound.Create("Base.rte/Sounds/GUIs/MetaStart.wav", 0, false, 0, true);
4343

44-
m_EnterMenuSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", false, 0);
44+
m_EnterMenuSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
4545

46-
m_ExitMenuSound.Create("Base.rte/Sounds/GUIs/MenuExit1.wav", false, 0);
46+
m_ExitMenuSound.Create("Base.rte/Sounds/GUIs/MenuExit1.wav", 0, false, 0, true);
4747
m_ExitMenuSound.AddSound("Base.rte/Sounds/GUIs/MenuExit2.wav");
4848

49-
m_FocusChangeSound.Create("Base.rte/Sounds/GUIs/FocusChange.wav", false, 0);
49+
m_FocusChangeSound.Create("Base.rte/Sounds/GUIs/FocusChange.wav", 0, false, 0, true);
5050

51-
m_SelectionChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.wav", false, 0);
51+
m_SelectionChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.wav", 0, false, 0, true);
5252

53-
m_ItemChangeSound.Create("Base.rte/Sounds/GUIs/ItemChange.wav", false, 0);
53+
m_ItemChangeSound.Create("Base.rte/Sounds/GUIs/ItemChange.wav", 0, false, 0, true);
5454

55-
m_ButtonPressSound.Create("Base.rte/Sounds/GUIs/ButtonPress.wav", false, 0);
55+
m_ButtonPressSound.Create("Base.rte/Sounds/GUIs/ButtonPress.wav", 0, false, 0, true);
5656

57-
m_BackButtonPressSound.Create("Base.rte/Sounds/GUIs/BackButtonPress.wav", false, 0);
57+
m_BackButtonPressSound.Create("Base.rte/Sounds/GUIs/BackButtonPress.wav", 0, false, 0, true);
5858

59-
m_ConfirmSound.Create("Base.rte/Sounds/GUIs/MenuExit2.wav", false, 0);
59+
m_ConfirmSound.Create("Base.rte/Sounds/GUIs/MenuExit2.wav", 0, false, 0, true);
6060

61-
m_UserErrorSound.Create("Base.rte/Sounds/GUIs/UserError.wav", false, 0);
61+
m_UserErrorSound.Create("Base.rte/Sounds/GUIs/UserError.wav", 0, false, 0, true);
6262

63-
m_TestSound.Create("Base.rte/Sounds/GUIs/Test.wav", false, 0);
63+
m_TestSound.Create("Base.rte/Sounds/GUIs/Test.wav", 0, false, 0, true);
6464

65-
m_PieMenuEnterSound.Create("Base.rte/Sounds/GUIs/PieMenuEnter.wav", false, 0);
65+
m_PieMenuEnterSound.Create("Base.rte/Sounds/GUIs/PieMenuEnter.wav", 0, false, 0, true);
6666

67-
m_PieMenuExitSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.wav", false, 0);
67+
m_PieMenuExitSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.wav", 0, false, 0, true);
6868

69-
// m_HoverChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.wav", false, 0);
69+
// m_HoverChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.wav", 0, false, 0, true);
7070
m_HoverChangeSound = m_SelectionChangeSound;
7171

72-
// m_HoverDisabledSound.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", false, 0);
72+
// m_HoverDisabledSound.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", 0, false, 0, true);
7373
m_HoverDisabledSound = m_PlacementBlip;
7474

75-
m_SlicePickedSound.Create("Base.rte/Sounds/GUIs/SlicePicked.wav", false, 0);
75+
m_SlicePickedSound.Create("Base.rte/Sounds/GUIs/SlicePicked.wav", 0, false, 0, true);
7676

77-
// m_DisabledPickedSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.wav", false, 0);
77+
// m_DisabledPickedSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.wav", 0, false, 0, true);
7878
m_DisabledPickedSound = m_PieMenuExitSound;
7979

80-
m_FundsChangedSound.Create("Base.rte/Sounds/GUIs/FundsChanged1.wav", false, 0);
80+
m_FundsChangedSound.Create("Base.rte/Sounds/GUIs/FundsChanged1.wav", 0, false, 0, true);
8181
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged2.wav");
8282
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged3.wav");
8383
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged4.wav");
8484
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged5.wav");
8585
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged6.wav");
8686

87-
m_ActorSwitchSound.Create("Base.rte/Sounds/GUIs/ActorSwitch.wav", false, 0);
87+
m_ActorSwitchSound.Create("Base.rte/Sounds/GUIs/ActorSwitch.wav", 0, false, 0, true);
8888

89-
m_BrainSwitchSound.Create("Base.rte/Sounds/GUIs/BrainSwitch.wav", false, 0);
89+
m_BrainSwitchSound.Create("Base.rte/Sounds/GUIs/BrainSwitch.wav", 0, false, 0, true);
9090

91-
m_CameraTravelSound.Create("Base.rte/Sounds/GUIs/CameraTravel1.wav", false, 0);
91+
m_CameraTravelSound.Create("Base.rte/Sounds/GUIs/CameraTravel1.wav", 0, false, 0, true);
9292
m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel2.wav");
9393
m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel3.wav");
9494

95-
// m_AreaPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", false, 0);
95+
// m_AreaPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
9696
m_AreaPickedSound = m_EnterMenuSound;
9797

98-
// m_ObjectPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", false, 0);
98+
// m_ObjectPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
9999
m_ObjectPickedSound = m_EnterMenuSound;
100100

101-
// m_PurchaseMadeSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", false, 0);
101+
// m_PurchaseMadeSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
102102
m_PurchaseMadeSound = m_EnterMenuSound;
103103

104-
m_PlacementBlip.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", false, 0);
104+
m_PlacementBlip.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", 0, false, 0, true);
105105

106-
m_PlacementThud.Create("Base.rte/Sounds/GUIs/PlacementThud1.wav", false, 0);
106+
m_PlacementThud.Create("Base.rte/Sounds/GUIs/PlacementThud1.wav", 0, false, 0, true);
107107
m_PlacementThud.AddSound("Base.rte/Sounds/GUIs/PlacementThud2.wav");
108108

109-
m_PlacementGravel.Create("Base.rte/Sounds/GUIs/PlacementGravel1.wav", false, 0);
109+
m_PlacementGravel.Create("Base.rte/Sounds/GUIs/PlacementGravel1.wav", 0, false, 0, true);
110110
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel2.wav");
111111
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel3.wav");
112112
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel4.wav");

0 commit comments

Comments
 (0)