Skip to content

Commit a7f7c80

Browse files
authored
Merge branch 'master' into glue_new
2 parents cde2df7 + 98b69b3 commit a7f7c80

File tree

6 files changed

+2
-5
lines changed

6 files changed

+2
-5
lines changed
Binary file not shown.

[gamemodes]/[deathmatch]/deathmatch/client/hud.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ _hud.endScreen.update = function(_, winner, draw, aborted)
8181
_hud.endScreen.announcementText:color(225, 225, 225, 225)
8282
end
8383
if not aborted then
84-
playSound("client/audio/mission_accomplished.mp3")
84+
playSFX("radio", "Beats", 9) -- mission accomplished sound
8585
end
8686
end
8787

[gamemodes]/[deathmatch]/deathmatch/meta.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<script src="client/main.lua" type="client" />
2727
<script src="client/hud.lua" type="client" />
2828
<script src="client/spectate.lua" type="client" />
29-
<file src="client/audio/mission_accomplished.mp3" />
3029

3130
<!-- EDF files -->
3231
<file src="edf/spawnpoint.png" />
-127 KB
Binary file not shown.

[gamemodes]/[race]/race/meta.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
<file src="img/travelling.png"/>
6363
<file src="img/killmessage.png"/>
6464

65-
<file src="audio/mission_accomplished.mp3"/>
66-
6765
<file src="model/nitro.dff"/>
6866
<file src="model/nitro.txd"/>
6967
<file src="model/repair.dff"/>

[gamemodes]/[race]/race/race_client.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ function checkpointReached(elem)
730730
local rc = getRadioChannel()
731731
setRadioChannel(0)
732732
addEventHandler("onClientPlayerRadioSwitch", root, onChange)
733-
playSound("audio/mission_accomplished.mp3")
733+
playSFX("radio", "Beats", 9) -- mission accomplished sound
734734
setTimer(changeRadioStation, 8000, 1, rc)
735735
if g_GUI.hurry then
736736
Animation.createAndPlay(g_GUI.hurry, Animation.presets.guiFadeOut(500), destroyElement)

0 commit comments

Comments
 (0)