author | Wuzzy <Wuzzy2@mail.ru> |
Fri, 04 May 2018 01:01:40 +0200 | |
changeset 13376 | f7631fb4c584 |
parent 13288 | ee8c6eb0ab47 |
child 13495 | f725701ca529 |
permissions | -rw-r--r-- |
4 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
4 | 4 |
* |
183 | 5 |
* This program is free software; you can redistribute it and/or modify |
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
4 | 8 |
* |
183 | 9 |
* This program is distributed in the hope that it will be useful, |
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
4 | 13 |
* |
183 | 14 |
* You should have received a copy of the GNU General Public License |
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10015
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
4 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
4 | 21 |
unit uSound; |
5134 | 22 |
(* |
23 |
* This unit controls the sounds and music of the game. |
|
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
24 |
* Doesn't really do anything if isSoundEnabled = false and isMusicEnabled = false |
5134 | 25 |
* |
26 |
* There are three basic types of sound controls: |
|
27 |
* Music - The background music of the game: |
|
28 |
* * will only be played if isMusicEnabled = true |
|
29 |
* * can be started, changed, paused and resumed |
|
30 |
* Sound - Can be started and stopped |
|
31 |
* Looped Sound - Subtype of sound: plays in a loop using a |
|
32 |
* "channel", of which the id is returned on start. |
|
33 |
* The channel id can be used to stop a specific sound loop. |
|
34 |
*) |
|
4 | 35 |
interface |
11823
0fba6cb098a1
drop SysUtils inclusion from 5 files where it is not needed anymore
sheepluva
parents:
11776
diff
changeset
|
36 |
uses SDLh, uConsts, uTypes; |
4 | 37 |
|
7896
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
38 |
procedure preInitModule; |
3038 | 39 |
procedure initModule; |
40 |
procedure freeModule; |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
41 |
|
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
42 |
procedure InitSound; // Initiates sound-system if isSoundEnabled. |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
43 |
procedure ReleaseSound(complete: boolean); // Releases sound-system and used resources. |
7061 | 44 |
procedure ResetSound; // Reset sound state to the previous state. |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
45 |
procedure SetSound(enabled: boolean); // Enable/disable sound-system and backup status. |
5134 | 46 |
|
47 |
// MUSIC |
|
48 |
||
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
49 |
// Obvious music commands for music track |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
50 |
procedure SetMusic(enabled: boolean); // Enable/disable music. |
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
51 |
procedure SetMusicName(musicname: shortstring); // Set name of the file to play. |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
52 |
procedure PlayMusic; // Play music from the start. |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
53 |
procedure PauseMusic; // Pause music. |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
54 |
procedure ResumeMusic; // Resume music from pause point. |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
55 |
procedure ChangeMusic(musicname: shortstring); // Replaces music track with musicname and plays it. |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
56 |
procedure StopMusic; // Stops and releases the current track. |
5134 | 57 |
|
58 |
||
59 |
// SOUNDS |
|
60 |
||
61 |
// Plays the sound snd [from a given voicepack], |
|
62 |
// if keepPlaying is given and true, |
|
63 |
// then the sound's playback won't be interrupted if asked to play again. |
|
2745 | 64 |
procedure PlaySound(snd: TSound); |
3202 | 65 |
procedure PlaySound(snd: TSound; keepPlaying: boolean); |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
66 |
procedure PlaySound(snd: TSound; keepPlaying: boolean; ignoreMask: boolean); |
7053 | 67 |
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack); |
68 |
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean); |
|
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
69 |
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean; ignoreMask: boolean); |
5134 | 70 |
|
71 |
// Plays sound snd [of voicepack] in a loop, but starts with fadems milliseconds of fade-in. |
|
72 |
// Returns sound channel of the looped sound. |
|
3529 | 73 |
function LoopSound(snd: TSound): LongInt; |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
74 |
function LoopSound(snd: TSound; fadems: LongInt): LongInt; |
10995
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
75 |
function LoopSoundV(snd: TSound; voicepack: PVoicepack): LongInt; |
7053 | 76 |
function LoopSoundV(snd: TSound; voicepack: PVoicepack; fadems: LongInt): LongInt; |
5134 | 77 |
|
78 |
// Stops the normal/looped sound of the given type/in the given channel |
|
79 |
// [with a fade-out effect for fadems milliseconds]. |
|
282 | 80 |
procedure StopSound(snd: TSound); |
7053 | 81 |
procedure StopSoundChan(chn: LongInt); |
82 |
procedure StopSoundChan(chn, fadems: LongInt); |
|
5134 | 83 |
|
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
84 |
procedure AddVoice(snd: TSound; voicepack: PVoicepack); |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
85 |
procedure AddVoice(snd: TSound; voicepack: PVoicepack; ignoreMask: boolean); |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
86 |
procedure PlayNextVoice; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
87 |
|
5134 | 88 |
|
7403 | 89 |
// GLOBAL FUNCTIONS |
90 |
||
91 |
// Drastically lower the volume when we lose focus (and restore the previous value). |
|
92 |
procedure DampenAudio; |
|
93 |
procedure UndampenAudio; |
|
94 |
||
95 |
// Mute/Unmute audio |
|
96 |
procedure MuteAudio; |
|
97 |
||
98 |
||
5134 | 99 |
// MISC |
100 |
||
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
101 |
// Set the initial volume |
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
102 |
procedure SetVolume(vol: LongInt); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
103 |
|
5134 | 104 |
// Modifies the sound volume of the game by voldelta and returns the new volume level. |
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
105 |
function ChangeVolume(voldelta: LongInt): LongInt; |
5134 | 106 |
|
13039
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
107 |
// Returns the current volume in percent |
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
108 |
function GetVolumePercent(): LongInt; |
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
109 |
|
5134 | 110 |
// Returns a pointer to the voicepack with the given name. |
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
111 |
function AskForVoicepack(name: shortstring): Pointer; |
4 | 112 |
|
10254 | 113 |
var MusicFN: shortstring; // music file name |
114 |
SDMusicFN: shortstring; // SD music file name |
|
12915 | 115 |
FallbackMusicFN: shortstring; // fallback music file name |
116 |
FallbackSDMusicFN: shortstring; // fallback SD music fille name |
|
1097 | 117 |
|
8471
7681d14b9f01
Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents:
8370
diff
changeset
|
118 |
var Volume: LongInt; |
7681d14b9f01
Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents:
8370
diff
changeset
|
119 |
SoundTimerTicks: Longword; |
4 | 120 |
implementation |
12621 | 121 |
uses uVariables, uConsole, uCommands, uDebug, uPhysFSLayer; |
564 | 122 |
|
3418 | 123 |
const chanTPU = 32; |
8471
7681d14b9f01
Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents:
8370
diff
changeset
|
124 |
var cInitVolume: LongInt; |
7403 | 125 |
previousVolume: LongInt; // cached volume value |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
126 |
lastChan: array [TSound] of LongInt; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
127 |
voicepacks: array[0..cMaxTeams] of TVoicepack; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
128 |
defVoicepack: PVoicepack; |
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
129 |
Mus: PMixMusic; // music pointer |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
130 |
isMusicEnabled: boolean; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
131 |
isSoundEnabled: boolean; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
132 |
isSEBackup: boolean; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
133 |
VoiceList : array[0..7] of TVoice = ( |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
134 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
135 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
136 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
137 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
138 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
139 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
140 |
( snd: sndNone; voicepack: nil), |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
141 |
( snd: sndNone; voicepack: nil)); |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
142 |
Soundz: array[TSound] of record |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
143 |
FileName: string[31]; |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
144 |
Path, AltPath : TPathType; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
145 |
end = ( |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
146 |
(FileName: ''; Path: ptNone; AltPath: ptNone),// sndNone |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
147 |
(FileName: 'grenadeimpact.ogg'; Path: ptSounds; AltPath: ptNone),// sndGrenadeImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
148 |
(FileName: 'explosion.ogg'; Path: ptSounds; AltPath: ptNone),// sndExplosion |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
149 |
(FileName: 'throwpowerup.ogg'; Path: ptSounds; AltPath: ptNone),// sndThrowPowerUp |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
150 |
(FileName: 'throwrelease.ogg'; Path: ptSounds; AltPath: ptNone),// sndThrowRelease |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
151 |
(FileName: 'splash.ogg'; Path: ptCurrTheme; AltPath: ptSounds),// sndSplash |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
152 |
(FileName: 'shotgunreload.ogg'; Path: ptSounds; AltPath: ptNone),// sndShotgunReload |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
153 |
(FileName: 'shotgunfire.ogg'; Path: ptSounds; AltPath: ptNone),// sndShotgunFire |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
154 |
(FileName: 'graveimpact.ogg'; Path: ptSounds; AltPath: ptNone),// sndGraveImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
155 |
(FileName: 'mineimpact.ogg'; Path: ptSounds; AltPath: ptNone),// sndMineImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
156 |
(FileName: 'minetick.ogg'; Path: ptSounds; AltPath: ptNone),// sndMineTicks |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
157 |
(FileName: 'Droplet1.ogg'; Path: ptSounds; AltPath: ptNone),// sndMudballImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
158 |
(FileName: 'pickhammer.ogg'; Path: ptSounds; AltPath: ptNone),// sndPickhammer |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
159 |
(FileName: 'gun.ogg'; Path: ptSounds; AltPath: ptNone),// sndGun |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
160 |
(FileName: 'bee.ogg'; Path: ptSounds; AltPath: ptNone),// sndBee |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
161 |
(FileName: 'Jump1.ogg'; Path: ptVoices; AltPath: ptNone),// sndJump1 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
162 |
(FileName: 'Jump2.ogg'; Path: ptVoices; AltPath: ptNone),// sndJump2 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
163 |
(FileName: 'Jump3.ogg'; Path: ptVoices; AltPath: ptNone),// sndJump3 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
164 |
(FileName: 'Yessir.ogg'; Path: ptVoices; AltPath: ptNone),// sndYesSir |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
165 |
(FileName: 'Laugh.ogg'; Path: ptVoices; AltPath: ptNone),// sndLaugh |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
166 |
(FileName: 'Illgetyou.ogg'; Path: ptVoices; AltPath: ptNone),// sndIllGetYou |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
167 |
(FileName: 'Justyouwait.ogg'; Path: ptVoices; AltPath: ptNone),// sndJustyouwait |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
168 |
(FileName: 'Incoming.ogg'; Path: ptVoices; AltPath: ptNone),// sndIncoming |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
169 |
(FileName: 'Missed.ogg'; Path: ptVoices; AltPath: ptNone),// sndMissed |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
170 |
(FileName: 'Stupid.ogg'; Path: ptVoices; AltPath: ptNone),// sndStupid |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
171 |
(FileName: 'Firstblood.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirstBlood |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
172 |
(FileName: 'Boring.ogg'; Path: ptVoices; AltPath: ptNone),// sndBoring |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
173 |
(FileName: 'Byebye.ogg'; Path: ptVoices; AltPath: ptNone),// sndByeBye |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
174 |
(FileName: 'Sameteam.ogg'; Path: ptVoices; AltPath: ptNone),// sndSameTeam |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
175 |
(FileName: 'Nutter.ogg'; Path: ptVoices; AltPath: ptNone),// sndNutter |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
176 |
(FileName: 'Reinforcements.ogg'; Path: ptVoices; AltPath: ptNone),// sndReinforce |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
177 |
(FileName: 'Traitor.ogg'; Path: ptVoices; AltPath: ptNone),// sndTraitor |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
178 |
(FileName: 'Youllregretthat.ogg'; Path: ptVoices; AltPath: ptNone),// sndRegret |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
179 |
(FileName: 'Enemydown.ogg'; Path: ptVoices; AltPath: ptNone),// sndEnemyDown |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
180 |
(FileName: 'Coward.ogg'; Path: ptVoices; AltPath: ptNone),// sndCoward |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
181 |
(FileName: 'Hurry.ogg'; Path: ptVoices; AltPath: ptNone),// sndHurry |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
182 |
(FileName: 'Watchit.ogg'; Path: ptVoices; AltPath: ptNone),// sndWatchIt |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
183 |
(FileName: 'Kamikaze.ogg'; Path: ptVoices; AltPath: ptNone),// sndKamikaze |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
184 |
(FileName: 'cake2.ogg'; Path: ptSounds; AltPath: ptNone),// sndCake |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
185 |
(FileName: 'Ow1.ogg'; Path: ptVoices; AltPath: ptNone),// sndOw1 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
186 |
(FileName: 'Ow2.ogg'; Path: ptVoices; AltPath: ptNone),// sndOw2 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
187 |
(FileName: 'Ow3.ogg'; Path: ptVoices; AltPath: ptNone),// sndOw3 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
188 |
(FileName: 'Ow4.ogg'; Path: ptVoices; AltPath: ptNone),// sndOw4 |
13287
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
189 |
(FileName: 'Firepunch1.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirePunch1 |
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
190 |
(FileName: 'Firepunch2.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirePunch2 |
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
191 |
(FileName: 'Firepunch3.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirePunch3 |
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
192 |
(FileName: 'Firepunch4.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirePunch4 |
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
193 |
(FileName: 'Firepunch5.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirePunch5 |
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
194 |
(FileName: 'Firepunch6.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirePunch6 |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
195 |
(FileName: 'Melon.ogg'; Path: ptVoices; AltPath: ptNone),// sndMelon |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
196 |
(FileName: 'Hellish.ogg'; Path: ptSounds; AltPath: ptNone),// sndHellish |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
197 |
(FileName: 'Yoohoo.ogg'; Path: ptSounds; AltPath: ptNone),// sndYoohoo |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
198 |
(FileName: 'rcplane.ogg'; Path: ptSounds; AltPath: ptNone),// sndRCPlane |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
199 |
(FileName: 'whipcrack.ogg'; Path: ptSounds; AltPath: ptNone),// sndWhipCrack |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
200 |
(FileName:'ride_of_the_valkyries.ogg'; Path: ptSounds; AltPath: ptNone),// sndRideOfTheValkyries |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
201 |
(FileName: 'denied.ogg'; Path: ptSounds; AltPath: ptNone),// sndDenied |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
202 |
(FileName: 'placed.ogg'; Path: ptSounds; AltPath: ptNone),// sndPlaced |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
203 |
(FileName: 'baseballbat.ogg'; Path: ptSounds; AltPath: ptNone),// sndBaseballBat |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
204 |
(FileName: 'steam.ogg'; Path: ptSounds; AltPath: ptNone),// sndVaporize |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
205 |
(FileName: 'warp.ogg'; Path: ptSounds; AltPath: ptNone),// sndWarp |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
206 |
(FileName: 'suddendeath.ogg'; Path: ptSounds; AltPath: ptNone),// sndSuddenDeath |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
207 |
(FileName: 'mortar.ogg'; Path: ptSounds; AltPath: ptNone),// sndMortar |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
208 |
(FileName: 'shutterclick.ogg'; Path: ptSounds; AltPath: ptNone),// sndShutter |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
209 |
(FileName: 'homerun.ogg'; Path: ptSounds; AltPath: ptNone),// sndHomerun |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
210 |
(FileName: 'molotov.ogg'; Path: ptSounds; AltPath: ptNone),// sndMolotov |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
211 |
(FileName: 'Takecover.ogg'; Path: ptVoices; AltPath: ptNone),// sndCover |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
212 |
(FileName: 'Uh-oh.ogg'; Path: ptVoices; AltPath: ptNone),// sndUhOh |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
213 |
(FileName: 'Oops.ogg'; Path: ptVoices; AltPath: ptNone),// sndOops |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
214 |
(FileName: 'Nooo.ogg'; Path: ptVoices; AltPath: ptNone),// sndNooo |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
215 |
(FileName: 'Hello.ogg'; Path: ptVoices; AltPath: ptNone),// sndHello |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
216 |
(FileName: 'ropeshot.ogg'; Path: ptSounds; AltPath: ptNone),// sndRopeShot |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
217 |
(FileName: 'ropeattach.ogg'; Path: ptSounds; AltPath: ptNone),// sndRopeAttach |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
218 |
(FileName: 'roperelease.ogg'; Path: ptSounds; AltPath: ptNone),// sndRopeRelease |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
219 |
(FileName: 'switchhog.ogg'; Path: ptSounds; AltPath: ptNone),// sndSwitchHog |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
220 |
(FileName: 'Victory.ogg'; Path: ptVoices; AltPath: ptNone),// sndVictory |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
221 |
(FileName: 'Flawless.ogg'; Path: ptVoices; AltPath: ptNone),// sndFlawless |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
222 |
(FileName: 'sniperreload.ogg'; Path: ptSounds; AltPath: ptNone),// sndSniperReload |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
223 |
(FileName: 'steps.ogg'; Path: ptSounds; AltPath: ptNone),// sndSteps |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
224 |
(FileName: 'lowgravity.ogg'; Path: ptSounds; AltPath: ptNone),// sndLowGravity |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
225 |
(FileName: 'hell_growl.ogg'; Path: ptSounds; AltPath: ptNone),// sndHellishImpact1 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
226 |
(FileName: 'hell_ooff.ogg'; Path: ptSounds; AltPath: ptNone),// sndHellishImpact2 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
227 |
(FileName: 'hell_ow.ogg'; Path: ptSounds; AltPath: ptNone),// sndHellishImpact3 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
228 |
(FileName: 'hell_ugh.ogg'; Path: ptSounds; AltPath: ptNone),// sndHellishImpact4 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
229 |
(FileName: 'melonimpact.ogg'; Path: ptSounds; AltPath: ptNone),// sndMelonImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
230 |
(FileName: 'Droplet1.ogg'; Path: ptCurrTheme; AltPath: ptSounds),// sndDroplet1 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
231 |
(FileName: 'Droplet2.ogg'; Path: ptCurrTheme; AltPath: ptSounds),// sndDroplet2 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
232 |
(FileName: 'Droplet3.ogg'; Path: ptCurrTheme; AltPath: ptSounds),// sndDroplet3 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
233 |
(FileName: 'egg.ogg'; Path: ptSounds; AltPath: ptNone),// sndEggBreak |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
234 |
(FileName: 'drillgun.ogg'; Path: ptSounds; AltPath: ptNone),// sndDrillRocket |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
235 |
(FileName: 'PoisonCough.ogg'; Path: ptVoices; AltPath: ptNone),// sndPoisonCough |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
236 |
(FileName: 'PoisonMoan.ogg'; Path: ptVoices; AltPath: ptNone),// sndPoisonMoan |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
237 |
(FileName: 'BirdyLay.ogg'; Path: ptSounds; AltPath: ptNone),// sndBirdyLay |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
238 |
(FileName: 'Whistle.ogg'; Path: ptSounds; AltPath: ptNone),// sndWhistle |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
239 |
(FileName: 'beewater.ogg'; Path: ptSounds; AltPath: ptNone),// sndBeeWater |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
240 |
(FileName: '1C.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano0 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
241 |
(FileName: '2D.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano1 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
242 |
(FileName: '3E.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano2 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
243 |
(FileName: '4F.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano3 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
244 |
(FileName: '5G.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano4 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
245 |
(FileName: '6A.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano5 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
246 |
(FileName: '7B.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano6 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
247 |
(FileName: '8C.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano7 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
248 |
(FileName: '9D.ogg'; Path: ptSounds; AltPath: ptNone),// sndPiano8 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
249 |
(FileName: 'skip.ogg'; Path: ptCurrTheme; AltPath: ptSounds),// sndSkip |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
250 |
(FileName: 'sinegun.ogg'; Path: ptSounds; AltPath: ptNone),// sndSineGun |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
251 |
(FileName: 'Ooff1.ogg'; Path: ptVoices; AltPath: ptNone),// sndOoff1 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
252 |
(FileName: 'Ooff2.ogg'; Path: ptVoices; AltPath: ptNone),// sndOoff2 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
253 |
(FileName: 'Ooff3.ogg'; Path: ptVoices; AltPath: ptNone),// sndOoff3 |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
254 |
(FileName: 'hammer.ogg'; Path: ptSounds; AltPath: ptNone),// sndWhack |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
255 |
(FileName: 'Comeonthen.ogg'; Path: ptVoices; AltPath: ptNone),// sndComeonthen |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
256 |
(FileName: 'parachute.ogg'; Path: ptSounds; AltPath: ptNone),// sndParachute |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
257 |
(FileName: 'bump.ogg'; Path: ptSounds; AltPath: ptNone),// sndBump |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
258 |
(FileName: 'hogchant3.ogg'; Path: ptSounds; AltPath: ptNone),// sndResurrector |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
259 |
(FileName: 'plane.ogg'; Path: ptSounds; AltPath: ptNone),// sndPlane |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
260 |
(FileName: 'TARDIS.ogg'; Path: ptSounds; AltPath: ptNone),// sndTardis |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
261 |
(FileName: 'frozen_hog_impact.ogg'; Path: ptSounds; AltPath: ptNone),// sndFrozenHogImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
262 |
(FileName: 'ice_beam.ogg'; Path: ptSounds; AltPath: ptNone),// sndIceBeam |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
263 |
(FileName: 'hog_freeze.ogg'; Path: ptSounds; AltPath: ptNone), // sndHogFreeze |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
264 |
(FileName: 'airmine_impact.ogg'; Path: ptSounds; AltPath: ptNone),// sndAirMineImpact |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
265 |
(FileName: 'knife_impact.ogg'; Path: ptSounds; AltPath: ptNone),// sndKnifeImpact |
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
266 |
(FileName: 'extratime.ogg'; Path: ptSounds; AltPath: ptNone),// sndExtraTime |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
267 |
(FileName: 'lasersight.ogg'; Path: ptSounds; AltPath: ptNone),// sndLaserSight |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
268 |
(FileName: 'invulnerable.ogg'; Path: ptSounds; AltPath: ptNone),// sndInvulnerable |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
269 |
(FileName: 'ufo.ogg'; Path: ptSounds; AltPath: ptNone),// sndJetpackLaunch |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
270 |
(FileName: 'jetpackboost.ogg'; Path: ptSounds; AltPath: ptNone),// sndJetpackBoost |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
271 |
(FileName: 'portalshot.ogg'; Path: ptSounds; AltPath: ptNone),// sndPortalShot |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
272 |
(FileName: 'portalswitch.ogg'; Path: ptSounds; AltPath: ptNone),// sndPortalSwitch |
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11874
diff
changeset
|
273 |
(FileName: 'portalopen.ogg'; Path: ptSounds; AltPath: ptNone),// sndPortalOpen |
11914
c9bad8a01185
Play countdown sounds for 4-1 remaining seconds and “boring” voice on timeout
Wuzzy <almikes@aol.com>
parents:
11911
diff
changeset
|
274 |
(FileName: 'blowtorch.ogg'; Path: ptSounds; AltPath: ptNone),// sndBlowTorch |
c9bad8a01185
Play countdown sounds for 4-1 remaining seconds and “boring” voice on timeout
Wuzzy <almikes@aol.com>
parents:
11911
diff
changeset
|
275 |
(FileName: 'countdown1.ogg'; Path: ptSounds; AltPath: ptNone),// sndCountdown1 |
c9bad8a01185
Play countdown sounds for 4-1 remaining seconds and “boring” voice on timeout
Wuzzy <almikes@aol.com>
parents:
11911
diff
changeset
|
276 |
(FileName: 'countdown2.ogg'; Path: ptSounds; AltPath: ptNone),// sndCountdown2 |
c9bad8a01185
Play countdown sounds for 4-1 remaining seconds and “boring” voice on timeout
Wuzzy <almikes@aol.com>
parents:
11911
diff
changeset
|
277 |
(FileName: 'countdown3.ogg'; Path: ptSounds; AltPath: ptNone),// sndCountdown3 |
12194
ac9cf0cf40ee
Add sounds for rubberduck drop, destruction and water collision
Wuzzy <almikes@aol.com>
parents:
11914
diff
changeset
|
278 |
(FileName: 'countdown4.ogg'; Path: ptSounds; AltPath: ptNone),// sndCountdown4 |
ac9cf0cf40ee
Add sounds for rubberduck drop, destruction and water collision
Wuzzy <almikes@aol.com>
parents:
11914
diff
changeset
|
279 |
(FileName: 'rubberduck_drop.ogg'; Path: ptSounds; AltPath: ptNone),// sndDuckDrop |
ac9cf0cf40ee
Add sounds for rubberduck drop, destruction and water collision
Wuzzy <almikes@aol.com>
parents:
11914
diff
changeset
|
280 |
(FileName: 'rubberduck_water.ogg'; Path: ptSounds; AltPath: ptNone),// sndDuckWater |
12668
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
281 |
(FileName: 'rubberduck_die.ogg'; Path: ptSounds; AltPath: ptNone),// sndDuckDie |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
282 |
(FileName: 'custom1.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom1 |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
283 |
(FileName: 'custom2.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom2 |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
284 |
(FileName: 'custom3.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom3 |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
285 |
(FileName: 'custom4.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom4 |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
286 |
(FileName: 'custom5.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom5 |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
287 |
(FileName: 'custom6.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom6 |
308846e05154
extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.
nemo
parents:
12621
diff
changeset
|
288 |
(FileName: 'custom7.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom7 |
13161 | 289 |
(FileName: 'custom8.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom8 |
290 |
(FileName: 'minigun.ogg'; Path: ptSounds; AltPath: ptNone) // sndMinigun |
|
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
291 |
); |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8046
diff
changeset
|
292 |
|
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
293 |
|
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
294 |
function AskForVoicepack(name: shortstring): Pointer; |
1654 | 295 |
var i: Longword; |
5107
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
296 |
locName, path: shortstring; |
1654 | 297 |
begin |
10995
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
298 |
i:= 0; |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
299 |
|
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
300 |
// Adjust voicepack name if there's a localised version version of the voice |
5107
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
301 |
if cLocale <> 'en' then |
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
302 |
begin |
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
303 |
locName:= name+'_'+cLocale; |
8025 | 304 |
path:= cPathz[ptVoices] + '/' + locName; |
8678
fb62d23c70f8
PhysFS-aware check for directory existence. Should fix issue 511.
unc0rr
parents:
8471
diff
changeset
|
305 |
if pfsExists(path) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
306 |
name:= locName |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5134
diff
changeset
|
307 |
else |
8025 | 308 |
if Length(cLocale) > 3 then |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5134
diff
changeset
|
309 |
begin |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5134
diff
changeset
|
310 |
locName:= name+'_'+Copy(cLocale,1,2); |
8025 | 311 |
path:= cPathz[ptVoices] + '/' + locName; |
8678
fb62d23c70f8
PhysFS-aware check for directory existence. Should fix issue 511.
unc0rr
parents:
8471
diff
changeset
|
312 |
if pfsExists(path) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
313 |
name:= locName |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5134
diff
changeset
|
314 |
end |
5107
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
315 |
end; |
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
316 |
|
10995
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
317 |
path:= cPathz[ptVoices] + '/' + name; |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
318 |
|
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
319 |
// Fallback to Default if voicepack can't be found at all |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
320 |
if (name <> 'Default') and (not pfsExists(path)) then |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
321 |
begin |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
322 |
path:= cPathz[ptVoices] + '/Default'; |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
323 |
if pfsExists(path) then |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
324 |
exit(AskForVoicepack('Default')); |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
325 |
end; |
7faaef306837
fallback to Default voicepack if specified voicepack is not available
sheepluva
parents:
10510
diff
changeset
|
326 |
|
11532 | 327 |
while (voicepacks[i].name <> name) and (voicepacks[i].name <> '') and (i < cMaxTeams) do |
5107
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
328 |
begin |
3529 | 329 |
inc(i); |
11532 | 330 |
//TryDo(i <= cMaxTeams, 'Engine bug: AskForVoicepack i > cMaxTeams', true) |
5107
d7fc678d78f4
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo
parents:
5052
diff
changeset
|
331 |
end; |
1654 | 332 |
|
3529 | 333 |
voicepacks[i].name:= name; |
334 |
AskForVoicepack:= @voicepacks[i] |
|
1654 | 335 |
end; |
4 | 336 |
|
337 |
procedure InitSound; |
|
11261
ce5f1b547a67
- Return of stereo sound for mobile!
antonc27 <antonc27@mail.ru>
parents:
11068
diff
changeset
|
338 |
const channels: LongInt = 2; |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
339 |
var success: boolean; |
4 | 340 |
begin |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
341 |
if not (isSoundEnabled or isMusicEnabled) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
342 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
343 |
WriteToConsole('Init sound...'); |
12612
2ffdee246adc
workaround to fix pas2c mistyping a constant as bool
sheepluva
parents:
12194
diff
changeset
|
344 |
success:= SDL_InitSubSystem(SDL_INIT_AUDIO) = 0; |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
345 |
|
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
346 |
if success then |
12612
2ffdee246adc
workaround to fix pas2c mistyping a constant as bool
sheepluva
parents:
12194
diff
changeset
|
347 |
begin |
2ffdee246adc
workaround to fix pas2c mistyping a constant as bool
sheepluva
parents:
12194
diff
changeset
|
348 |
WriteLnToConsole(msgOK); |
2ffdee246adc
workaround to fix pas2c mistyping a constant as bool
sheepluva
parents:
12194
diff
changeset
|
349 |
WriteToConsole('Open audio...'); |
11500 | 350 |
success:= Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, channels, 1024) = 0; |
12612
2ffdee246adc
workaround to fix pas2c mistyping a constant as bool
sheepluva
parents:
12194
diff
changeset
|
351 |
end; |
2327 | 352 |
|
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
353 |
if success then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
354 |
WriteLnToConsole(msgOK) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
355 |
else |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
356 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
357 |
WriteLnToConsole(msgFailed); |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
358 |
isSoundEnabled:= false; |
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
359 |
isMusicEnabled:= false; |
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
360 |
end; |
2647 | 361 |
|
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
362 |
WriteToConsole('Init SDL_mixer... '); |
11507 | 363 |
if SDLCheck(Mix_Init(MIX_INIT_OGG) <> 0, 'Mix_Init', true) then exit; |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
364 |
WriteLnToConsole(msgOK); |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
365 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
366 |
Mix_AllocateChannels(Succ(chanTPU)); |
11499
9c5d9993b14b
fix volume being at 0 on engine start. note: seems window focus changes are not detected atm. (relevant for sound dampening)
sheepluva
parents:
11362
diff
changeset
|
367 |
previousVolume:= cInitVolume; |
8330 | 368 |
ChangeVolume(cInitVolume); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
369 |
end; |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
370 |
|
7061 | 371 |
procedure ResetSound; |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
372 |
begin |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
373 |
isSoundEnabled:= isSEBackup; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
374 |
end; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
375 |
|
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
376 |
procedure SetSound(enabled: boolean); |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
377 |
begin |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
378 |
isSEBackup:= isSoundEnabled; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
379 |
isSoundEnabled:= enabled; |
4 | 380 |
end; |
381 |
||
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
382 |
// when complete is false, this procedure just releases some of the chucks on inactive channels |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
383 |
// in this way music is not stopped, nor are chucks currently being played |
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
384 |
procedure ReleaseSound(complete: boolean); |
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
385 |
var i: TSound; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
386 |
t: Longword; |
4 | 387 |
begin |
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
388 |
// release and nil all sounds |
3529 | 389 |
for t:= 0 to cMaxTeams do |
390 |
if voicepacks[t].name <> '' then |
|
391 |
for i:= Low(TSound) to High(TSound) do |
|
392 |
if voicepacks[t].chunks[i] <> nil then |
|
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
393 |
if complete or (Mix_Playing(lastChan[i]) = 0) then |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
394 |
begin |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
395 |
Mix_HaltChannel(lastChan[i]); |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
396 |
lastChan[i]:= -1; |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
397 |
Mix_FreeChunk(voicepacks[t].chunks[i]); |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
398 |
voicepacks[t].chunks[i]:= nil; |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
399 |
end; |
3182 | 400 |
|
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
401 |
// stop music |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
402 |
if complete then |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
403 |
begin |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
404 |
if Mus <> nil then |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
405 |
begin |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
406 |
Mix_HaltMusic(); |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
407 |
Mix_FreeMusic(Mus); |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
408 |
Mus:= nil; |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
409 |
end; |
3182 | 410 |
|
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
411 |
// make sure all instances of sdl_mixer are unloaded before continuing |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
412 |
while Mix_Init(0) <> 0 do |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
413 |
Mix_Quit(); |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
414 |
|
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
415 |
Mix_CloseAudio(); |
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
416 |
end; |
4 | 417 |
end; |
418 |
||
2745 | 419 |
procedure PlaySound(snd: TSound); |
420 |
begin |
|
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
421 |
PlaySoundV(snd, nil, false, false); |
2745 | 422 |
end; |
423 |
||
3202 | 424 |
procedure PlaySound(snd: TSound; keepPlaying: boolean); |
425 |
begin |
|
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
426 |
PlaySoundV(snd, nil, keepPlaying, false); |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
427 |
end; |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
428 |
|
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
429 |
procedure PlaySound(snd: TSound; keepPlaying: boolean; ignoreMask: boolean); |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
430 |
begin |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
431 |
PlaySoundV(snd, nil, keepPlaying, ignoreMask); |
3202 | 432 |
end; |
433 |
||
7053 | 434 |
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack); |
4 | 435 |
begin |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
436 |
PlaySoundV(snd, voicepack, false, false); |
3201 | 437 |
end; |
438 |
||
7053 | 439 |
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean); |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
440 |
begin |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
441 |
PlaySoundV(snd, voicepack, keepPlaying, false); |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
442 |
end; |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
443 |
|
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
444 |
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean; ignoreMask: boolean); |
3664 | 445 |
var s:shortstring; |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
446 |
rwops: PSDL_RWops; |
3201 | 447 |
begin |
4948 | 448 |
if (not isSoundEnabled) or fastUntilLag then |
3529 | 449 |
exit; |
3201 | 450 |
|
3529 | 451 |
if keepPlaying and (lastChan[snd] <> -1) and (Mix_Playing(lastChan[snd]) <> 0) then |
452 |
exit; |
|
453 |
||
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
454 |
if (ignoreMask = false) and (MaskedSounds[snd] = true) then |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
455 |
exit; |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
456 |
|
3664 | 457 |
if (voicepack <> nil) then |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
458 |
begin |
3664 | 459 |
if (voicepack^.chunks[snd] = nil) and (Soundz[snd].Path = ptVoices) and (Soundz[snd].FileName <> '') then |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
460 |
begin |
8025 | 461 |
s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; |
13288
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
462 |
// Fallback to sndFirePunch1 / sndOw1 / sndOoff1 if a “higher-numbered” sound is missing |
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
463 |
if (not pfsExists(s)) then |
13287
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
464 |
begin |
13288
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
465 |
if (snd in [sndFirePunch2, sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6]) then |
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
466 |
snd := sndFirePunch1 |
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
467 |
else if (snd in [sndOw2, sndOw3, sndOw4]) then |
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
468 |
snd := sndOw1 |
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
469 |
else if (snd in [sndOoff2, sndOoff3]) then |
ee8c6eb0ab47
Add voice pack sound fallbacks also for sndOoff{2,3} and sndOw{2,4}
Wuzzy <Wuzzy2@mail.ru>
parents:
13287
diff
changeset
|
470 |
snd := sndOoff1; |
13287
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
471 |
s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; |
29055da6a6cd
Fix broken fallback to sndFirePunch1 if sndFirePunch{2,6} is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
472 |
end; |
3664 | 473 |
WriteToConsole(msgLoading + s + ' '); |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
474 |
rwops := rwopsOpenRead(s); |
11874
045f33b498ea
fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents:
11873
diff
changeset
|
475 |
|
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
476 |
if rwops = nil then |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
477 |
begin |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
478 |
s:= cPathz[Soundz[snd].AltPath] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
479 |
WriteToConsole(msgLoading + s + ' ... '); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
480 |
rwops := rwopsOpenRead(s); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
481 |
end; |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
482 |
voicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
483 |
|
3664 | 484 |
if voicepack^.chunks[snd] = nil then |
485 |
WriteLnToConsole(msgFailed) |
|
486 |
else |
|
487 |
WriteLnToConsole(msgOK) |
|
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
488 |
end; |
3529 | 489 |
lastChan[snd]:= Mix_PlayChannelTimed(-1, voicepack^.chunks[snd], 0, -1) |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
490 |
end |
3529 | 491 |
else |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
492 |
begin |
3664 | 493 |
if (defVoicepack^.chunks[snd] = nil) and (Soundz[snd].Path <> ptVoices) and (Soundz[snd].FileName <> '') then |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
494 |
begin |
8025 | 495 |
s:= cPathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName; |
3664 | 496 |
WriteToConsole(msgLoading + s + ' '); |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
497 |
rwops := rwopsOpenRead(s); |
11874
045f33b498ea
fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents:
11873
diff
changeset
|
498 |
|
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
499 |
if rwops = nil then |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
500 |
begin |
12618
2d68c113fc8d
fix copypasta fail that caused segfaults (esp. in pas2c)
sheepluva
parents:
12612
diff
changeset
|
501 |
s:= cPathz[Soundz[snd].AltPath] + '/' + Soundz[snd].FileName; |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
502 |
WriteToConsole(msgLoading + s + ' ... '); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
503 |
rwops := rwopsOpenRead(s); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
504 |
end; |
11874
045f33b498ea
fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents:
11873
diff
changeset
|
505 |
|
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
506 |
defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1); |
11663
0427a9b6457b
fix sounds not playing on first play (=load), because function bailed on success, rather than error. introduced in bd9a2f1b0080 , addressing issue 111
sheepluva
parents:
11532
diff
changeset
|
507 |
if SDLCheck(defVoicepack^.chunks[snd] <> nil, 'Mix_LoadWAV_RW', true) then exit; |
3664 | 508 |
WriteLnToConsole(msgOK); |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
509 |
end; |
3529 | 510 |
lastChan[snd]:= Mix_PlayChannelTimed(-1, defVoicepack^.chunks[snd], 0, -1) |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
511 |
end; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
512 |
end; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
513 |
|
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
514 |
procedure AddVoice(snd: TSound; voicepack: PVoicepack); |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
515 |
begin |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
516 |
AddVoice(snd, voicepack, false); |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
517 |
end; |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
518 |
|
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
519 |
procedure AddVoice(snd: TSound; voicepack: PVoicepack; ignoreMask: boolean); |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
520 |
var i : LongInt; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
521 |
begin |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
522 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
523 |
if (not isSoundEnabled) or fastUntilLag or ((LastVoice.snd = snd) and (LastVoice.voicepack = voicepack)) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
524 |
exit; |
13121
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
525 |
if (ignoreMask = false) and (MaskedSounds[snd] = true) then |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
526 |
exit; |
de07c8423beb
Lua API: Add SetSoundMask to disable playing certain sounds
Wuzzy <Wuzzy2@mail.ru>
parents:
13039
diff
changeset
|
527 |
|
6360
eca20f8990e2
Clear all other sounds before playing flawless victory / victory
nemo
parents:
6072
diff
changeset
|
528 |
if (snd = sndVictory) or (snd = sndFlawless) then |
eca20f8990e2
Clear all other sounds before playing flawless victory / victory
nemo
parents:
6072
diff
changeset
|
529 |
begin |
6367
a7fbf18b2d55
be more gentle when you stop channels at the end of the game
koda
parents:
6363
diff
changeset
|
530 |
Mix_FadeOutChannel(-1, 800); |
8168 | 531 |
for i:= 0 to High(VoiceList) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
532 |
VoiceList[i].snd:= sndNone; |
6360
eca20f8990e2
Clear all other sounds before playing flawless victory / victory
nemo
parents:
6072
diff
changeset
|
533 |
LastVoice.snd:= sndNone; |
eca20f8990e2
Clear all other sounds before playing flawless victory / victory
nemo
parents:
6072
diff
changeset
|
534 |
end; |
eca20f8990e2
Clear all other sounds before playing flawless victory / victory
nemo
parents:
6072
diff
changeset
|
535 |
|
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
536 |
i:= 0; |
10490 | 537 |
while (i <= High(VoiceList)) and (VoiceList[i].snd <> sndNone) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
538 |
inc(i); |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
539 |
|
5921 | 540 |
// skip playing same sound for same hog twice |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
541 |
if (i>0) and (VoiceList[i-1].snd = snd) and (VoiceList[i-1].voicepack = voicepack) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
542 |
exit; |
10490 | 543 |
if(i <= High(VoiceList)) then |
544 |
begin |
|
545 |
VoiceList[i].snd:= snd; |
|
546 |
VoiceList[i].voicepack:= voicepack; |
|
547 |
end |
|
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
548 |
end; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
549 |
|
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
550 |
procedure PlayNextVoice; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
551 |
var i : LongInt; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
552 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
553 |
if (not isSoundEnabled) or fastUntilLag or ((LastVoice.snd <> sndNone) and (lastChan[LastVoice.snd] <> -1) and (Mix_Playing(lastChan[LastVoice.snd]) <> 0)) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
554 |
exit; |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
555 |
i:= 0; |
8168 | 556 |
while (i<High(VoiceList)) and (VoiceList[i].snd = sndNone) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
557 |
inc(i); |
8330 | 558 |
|
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
559 |
if (VoiceList[i].snd <> sndNone) then |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
560 |
begin |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
561 |
LastVoice.snd:= VoiceList[i].snd; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
562 |
LastVoice.voicepack:= VoiceList[i].voicepack; |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
563 |
VoiceList[i].snd:= sndNone; |
7053 | 564 |
PlaySoundV(LastVoice.snd, LastVoice.voicepack) |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
565 |
end |
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5239
diff
changeset
|
566 |
else LastVoice.snd:= sndNone; |
4 | 567 |
end; |
568 |
||
2745 | 569 |
function LoopSound(snd: TSound): LongInt; |
570 |
begin |
|
7053 | 571 |
LoopSound:= LoopSoundV(snd, nil) |
2745 | 572 |
end; |
573 |
||
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
574 |
function LoopSound(snd: TSound; fadems: LongInt): LongInt; |
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
575 |
begin |
7053 | 576 |
LoopSound:= LoopSoundV(snd, nil, fadems) |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
577 |
end; |
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
578 |
|
7053 | 579 |
function LoopSoundV(snd: TSound; voicepack: PVoicepack): LongInt; |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
580 |
begin |
5052 | 581 |
voicepack:= voicepack; // avoid compiler hint |
7053 | 582 |
LoopSoundV:= LoopSoundV(snd, nil, 0) |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
583 |
end; |
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
584 |
|
7053 | 585 |
function LoopSoundV(snd: TSound; voicepack: PVoicepack; fadems: LongInt): LongInt; |
3664 | 586 |
var s: shortstring; |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
587 |
rwops: PSDL_RWops; |
2647 | 588 |
begin |
4948 | 589 |
if (not isSoundEnabled) or fastUntilLag then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
590 |
begin |
7053 | 591 |
LoopSoundV:= -1; |
3529 | 592 |
exit |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
593 |
end; |
2647 | 594 |
|
3664 | 595 |
if (voicepack <> nil) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
596 |
begin |
3664 | 597 |
if (voicepack^.chunks[snd] = nil) and (Soundz[snd].Path = ptVoices) and (Soundz[snd].FileName <> '') then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
598 |
begin |
8025 | 599 |
s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; |
3664 | 600 |
WriteToConsole(msgLoading + s + ' '); |
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
601 |
rwops:=rwopsOpenRead(s); |
11874
045f33b498ea
fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents:
11873
diff
changeset
|
602 |
|
11873
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
603 |
if rwops = nil then |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
604 |
begin |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
605 |
s:= cPathz[Soundz[snd].AltPath] + '/' + Soundz[snd].FileName; |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
606 |
WriteToConsole(msgLoading + s + ' ... '); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
607 |
rwops:=rwopsOpenRead(s); |
7db5aef27e8d
support for alternate sound paths [this is allowing themes to override certain sound files; reviewed and committed by sheepluva, fixes pending]
KoBeWi <kobewi4e@gmail.com>
parents:
11835
diff
changeset
|
608 |
end; |
11874
045f33b498ea
fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents:
11873
diff
changeset
|
609 |
|
045f33b498ea
fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents:
11873
diff
changeset
|
610 |
voicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1); |
3664 | 611 |
if voicepack^.chunks[snd] = nil then |
612 |
WriteLnToConsole(msgFailed) |
|
613 |
else |
|
614 |
WriteLnToConsole(msgOK) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
615 |
end; |
7053 | 616 |
LoopSoundV:= Mix_PlayChannelTimed(-1, voicepack^.chunks[snd], -1, -1) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
617 |
end |
3529 | 618 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
619 |
begin |
3664 | 620 |
if (defVoicepack^.chunks[snd] = nil) and (Soundz[snd].Path <> ptVoices) and (Soundz[snd].FileName <> '') then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
621 |
begin |
8025 | 622 |
s:= cPathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName; |
3664 | 623 |
WriteToConsole(msgLoading + s + ' '); |
8025 | 624 |
defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwopsOpenRead(s), 1); |
11507 | 625 |
if SDLCheck(defVoicepack^.chunks[snd] <> nil, 'Mix_LoadWAV_RW', true) then exit; |
3664 | 626 |
WriteLnToConsole(msgOK); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
627 |
end; |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
628 |
if fadems > 0 then |
7053 | 629 |
LoopSoundV:= Mix_FadeInChannelTimed(-1, defVoicepack^.chunks[snd], -1, fadems, -1) |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
630 |
else |
7053 | 631 |
LoopSoundV:= Mix_PlayChannelTimed(-1, defVoicepack^.chunks[snd], -1, -1); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
632 |
end; |
2647 | 633 |
end; |
634 |
||
282 | 635 |
procedure StopSound(snd: TSound); |
4 | 636 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
637 |
if not isSoundEnabled then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
638 |
exit; |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
639 |
|
3529 | 640 |
if (lastChan[snd] <> -1) and (Mix_Playing(lastChan[snd]) <> 0) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
641 |
begin |
3529 | 642 |
Mix_HaltChannel(lastChan[snd]); |
643 |
lastChan[snd]:= -1; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
644 |
end; |
4 | 645 |
end; |
646 |
||
7053 | 647 |
procedure StopSoundChan(chn: LongInt); |
2745 | 648 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
649 |
if not isSoundEnabled then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
650 |
exit; |
3529 | 651 |
|
652 |
if (chn <> -1) and (Mix_Playing(chn) <> 0) then |
|
653 |
Mix_HaltChannel(chn); |
|
2745 | 654 |
end; |
655 |
||
7053 | 656 |
procedure StopSoundChan(chn, fadems: LongInt); |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
657 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
658 |
if not isSoundEnabled then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
659 |
exit; |
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
660 |
|
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
661 |
if (chn <> -1) and (Mix_Playing(chn) <> 0) then |
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
662 |
Mix_FadeOutChannel(chn, fadems); |
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
663 |
end; |
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4948
diff
changeset
|
664 |
|
4 | 665 |
procedure PlayMusic; |
2905 | 666 |
var s: shortstring; |
4 | 667 |
begin |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
668 |
if (MusicFN = '') or (not isMusicEnabled) then |
3529 | 669 |
exit; |
10510 | 670 |
if SuddenDeath and (SDMusicFN <> '') then |
10254 | 671 |
s:= '/Music/' + SDMusicFN |
672 |
else s:= '/Music/' + MusicFN; |
|
3529 | 673 |
WriteToConsole(msgLoading + s + ' '); |
565 | 674 |
|
12915 | 675 |
// Load normal music |
8046 | 676 |
Mus:= Mix_LoadMUS_RW(rwopsOpenRead(s)); |
11507 | 677 |
SDLCheck(Mus <> nil, 'Mix_LoadMUS_RW', false); |
12915 | 678 |
if Mus <> nil then |
679 |
WriteLnToConsole(msgOK); |
|
680 |
||
681 |
// If normal music failed, try to get fallback music |
|
682 |
if Mus = nil then |
|
683 |
begin |
|
684 |
WriteLnToConsole('Music not found. Trying fallback music.'); |
|
685 |
if SuddenDeath and (FallbackSDMusicFN <> '') then |
|
686 |
s:= '/Music/' + FallbackSDMusicFN |
|
687 |
else if (not SuddenDeath) and (FallbackMusicFN <> '') then |
|
688 |
s:= '/Music/' + FallbackMusicFN |
|
689 |
else |
|
690 |
begin |
|
691 |
WriteLnToConsole('No fallback music configured!'); |
|
692 |
s:= '' |
|
693 |
end; |
|
694 |
||
695 |
if (s <> '') then |
|
696 |
begin |
|
697 |
WriteLnToConsole(msgLoading + s + ' '); |
|
698 |
Mus:= Mix_LoadMUS_RW(rwopsOpenRead(s)); |
|
699 |
SDLCheck(Mus <> nil, 'Mix_LoadMUS_RW', false); |
|
700 |
if Mus <> nil then |
|
701 |
WriteLnToConsole(msgOK) |
|
702 |
end; |
|
703 |
end; |
|
565 | 704 |
|
11507 | 705 |
SDLCheck(Mix_FadeInMusic(Mus, -1, 3000) <> -1, 'Mix_FadeInMusic', false) |
4 | 706 |
end; |
707 |
||
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
708 |
procedure SetVolume(vol: LongInt); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
709 |
begin |
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
710 |
cInitVolume:= vol; |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
711 |
end; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
712 |
|
13039
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
713 |
function GetVolumePercent(): LongInt; |
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
714 |
begin |
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
715 |
GetVolumePercent:= Volume * 100 div MIX_MAX_VOLUME; |
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
716 |
end; |
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
717 |
|
371 | 718 |
function ChangeVolume(voldelta: LongInt): LongInt; |
174 | 719 |
begin |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6898
diff
changeset
|
720 |
ChangeVolume:= 0; |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
721 |
if not (isSoundEnabled or isMusicEnabled) or ((voldelta = 0) and (not (cInitVolume = 0))) then |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6898
diff
changeset
|
722 |
exit; |
2327 | 723 |
|
3529 | 724 |
inc(Volume, voldelta); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
725 |
if Volume < 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
726 |
Volume:= 0; |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
727 |
// apply Volume to all channels |
3529 | 728 |
Mix_Volume(-1, Volume); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
729 |
// get assigned Volume |
3529 | 730 |
Volume:= Mix_Volume(-1, -1); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
731 |
if isMusicEnabled then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
732 |
Mix_VolumeMusic(Volume * 4 div 8); |
13039
aed4b25ff242
Fix volume caption not being shown when hitting mute key
Wuzzy <Wuzzy2@mail.ru>
parents:
12915
diff
changeset
|
733 |
ChangeVolume:= GetVolumePercent(); |
7403 | 734 |
|
7404 | 735 |
if (isMusicEnabled) then |
736 |
if (Volume = 0) then |
|
737 |
PauseMusic |
|
738 |
else |
|
739 |
ResumeMusic; |
|
7403 | 740 |
|
7404 | 741 |
isAudioMuted:= (Volume = 0); |
174 | 742 |
end; |
743 |
||
6862 | 744 |
procedure DampenAudio; |
745 |
begin |
|
7404 | 746 |
if (isAudioMuted) then |
747 |
exit; |
|
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6898
diff
changeset
|
748 |
previousVolume:= Volume; |
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6898
diff
changeset
|
749 |
ChangeVolume(-Volume * 7 div 9); |
6862 | 750 |
end; |
751 |
||
752 |
procedure UndampenAudio; |
|
753 |
begin |
|
7404 | 754 |
if (isAudioMuted) then |
755 |
exit; |
|
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
756 |
ChangeVolume(previousVolume - Volume); |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
757 |
end; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
758 |
|
7403 | 759 |
procedure MuteAudio; |
760 |
begin |
|
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
761 |
if not (isSoundEnabled or isMusicEnabled) then |
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
762 |
exit; |
7404 | 763 |
|
764 |
if (isAudioMuted) then |
|
765 |
begin |
|
766 |
ResumeMusic; |
|
767 |
ChangeVolume(previousVolume); |
|
768 |
end |
|
769 |
else |
|
770 |
begin |
|
771 |
PauseMusic; |
|
772 |
previousVolume:= Volume; |
|
773 |
ChangeVolume(-Volume); |
|
774 |
end; |
|
775 |
||
776 |
// isAudioMuted is updated in ChangeVolume |
|
7403 | 777 |
end; |
778 |
||
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
779 |
procedure SetMusic(enabled: boolean); |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
780 |
begin |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
781 |
isMusicEnabled:= enabled; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
782 |
end; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
783 |
|
7053 | 784 |
procedure SetMusicName(musicname: shortstring); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
785 |
begin |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
786 |
MusicFN:= musicname; |
6862 | 787 |
end; |
788 |
||
1712 | 789 |
procedure PauseMusic; |
790 |
begin |
|
3529 | 791 |
if (MusicFN = '') or (not isMusicEnabled) then |
792 |
exit; |
|
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
793 |
|
6472 | 794 |
if Mus <> nil then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
795 |
Mix_PauseMusic(Mus); |
1712 | 796 |
end; |
797 |
||
798 |
procedure ResumeMusic; |
|
799 |
begin |
|
3529 | 800 |
if (MusicFN = '') or (not isMusicEnabled) then |
801 |
exit; |
|
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
802 |
|
6472 | 803 |
if Mus <> nil then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
804 |
Mix_ResumeMusic(Mus); |
1712 | 805 |
end; |
806 |
||
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
807 |
procedure ChangeMusic(musicname: shortstring); |
4748 | 808 |
begin |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
809 |
MusicFN:= musicname; |
4748 | 810 |
if (MusicFN = '') or (not isMusicEnabled) then |
811 |
exit; |
|
812 |
||
6472 | 813 |
StopMusic; |
814 |
PlayMusic; |
|
815 |
end; |
|
816 |
||
817 |
procedure StopMusic; |
|
818 |
begin |
|
819 |
if (MusicFN = '') or (not isMusicEnabled) then |
|
820 |
exit; |
|
821 |
||
4748 | 822 |
if Mus <> nil then |
6521 | 823 |
begin |
4748 | 824 |
Mix_FreeMusic(Mus); |
6521 | 825 |
Mus:= nil; |
826 |
end |
|
4748 | 827 |
end; |
828 |
||
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4377
diff
changeset
|
829 |
procedure chVoicepack(var s: shortstring); |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4377
diff
changeset
|
830 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
831 |
if CurrentTeam = nil then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
832 |
OutError(errmsgIncorrectUse + ' "/voicepack"', true); |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4377
diff
changeset
|
833 |
if s[1]='"' then Delete(s, 1, 1); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
834 |
if s[byte(s[0])]='"' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6551
diff
changeset
|
835 |
Delete(s, byte(s[0]), 1); |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4377
diff
changeset
|
836 |
CurrentTeam^.voicepack:= AskForVoicepack(s) |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4377
diff
changeset
|
837 |
end; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4377
diff
changeset
|
838 |
|
7896
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
839 |
procedure preInitModule; |
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
840 |
begin |
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
841 |
isMusicEnabled:= true; |
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
842 |
isSoundEnabled:= true; |
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
843 |
cInitVolume:= 100; |
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
844 |
end; |
67217e6108fd
another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents:
7848
diff
changeset
|
845 |
|
3038 | 846 |
procedure initModule; |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
847 |
var t: LongInt; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
848 |
i: TSound; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
849 |
begin |
6898 | 850 |
RegisterVariable('voicepack', @chVoicepack, false); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
851 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
852 |
MusicFN:=''; |
11068
0ff8b968291b
allow holding PRECISE key to switch portal ball colors in reverse order
sheepluva
parents:
11046
diff
changeset
|
853 |
SDMusicFN:= 'sdmusic.ogg'; |
7848
775a72905708
* fix initialisation, preload values and then read args
koda
parents:
7423
diff
changeset
|
854 |
Mus:= nil; |
7404 | 855 |
isAudioMuted:= false; |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
856 |
isSEBackup:= isSoundEnabled; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
857 |
Volume:= 0; |
8471
7681d14b9f01
Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents:
8370
diff
changeset
|
858 |
SoundTimerTicks:= 0; |
7024 | 859 |
defVoicepack:= AskForVoicepack('Default'); |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
860 |
|
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
861 |
for i:= Low(TSound) to High(TSound) do |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
862 |
lastChan[i]:= -1; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
863 |
|
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
864 |
// initialize all voices to nil so that they can be loaded lazily |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
865 |
for t:= 0 to cMaxTeams do |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
866 |
if voicepacks[t].name <> '' then |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
867 |
for i:= Low(TSound) to High(TSound) do |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
868 |
voicepacks[t].chunks[i]:= nil; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
869 |
|
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
870 |
(* on MOBILE SDL_mixer has to be compiled against Tremor (USE_OGG_TREMOR) |
8168 | 871 |
or sound files bigger than 32k will lockup the game on slow cpu *) |
7021
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
872 |
for i:= Low(TSound) to High(TSound) do |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
873 |
defVoicepack^.chunks[i]:= nil; |
0c75512a8920
adjust the scope of a few uSound variables and functions
koda
parents:
6990
diff
changeset
|
874 |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
875 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
876 |
|
3038 | 877 |
procedure freeModule; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
878 |
begin |
8231
a41d84553ae8
Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two).
Mitchell Kember <mk12360@gmail.com>
parents:
8191
diff
changeset
|
879 |
if isSoundEnabled or isMusicEnabled then |
6362
ceacd1b61833
modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents:
6360
diff
changeset
|
880 |
ReleaseSound(true); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
881 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2674
diff
changeset
|
882 |
|
2515
51d3f4b6293a
revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents:
2501
diff
changeset
|
883 |
end. |
2192
4763a778c033
- Fix quickplay sound bug triggered by two faults: ttsmj's (passing voicepack with empty name in team config) and koda's (he changed fallback to default scheme condition)
unc0rr
parents:
2191
diff
changeset
|
884 |