hedgewars/uSound.pas
author Wuzzy <almikes@aol.com>
Sat, 30 Apr 2016 20:35:55 +0200
changeset 11912 d3a852554aa7
parent 11911 6145efcff302
child 11914 c9bad8a01185
permissions -rw-r--r--
Turn timer digits green when it's still the ready timer
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 611
diff changeset
     2
 * Hedgewars, a free turn based strategy game
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 10995
diff changeset
     3
 * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     4
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     8
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    12
 * GNU General Public License for more details.
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    13
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    14
 * You should have received a copy of the GNU General Public License
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    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
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    17
 *)
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    20
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    21
unit uSound;
5134
sheepluva
parents: 5107
diff changeset
    22
(*
sheepluva
parents: 5107
diff changeset
    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
sheepluva
parents: 5107
diff changeset
    25
 *
sheepluva
parents: 5107
diff changeset
    26
 * There are three basic types of sound controls:
sheepluva
parents: 5107
diff changeset
    27
 *    Music        - The background music of the game:
sheepluva
parents: 5107
diff changeset
    28
 *                   * will only be played if isMusicEnabled = true
sheepluva
parents: 5107
diff changeset
    29
 *                   * can be started, changed, paused and resumed
sheepluva
parents: 5107
diff changeset
    30
 *    Sound        - Can be started and stopped
sheepluva
parents: 5107
diff changeset
    31
 *    Looped Sound - Subtype of sound: plays in a loop using a
sheepluva
parents: 5107
diff changeset
    32
 *                   "channel", of which the id is returned on start.
sheepluva
parents: 5107
diff changeset
    33
 *                   The channel id can be used to stop a specific sound loop.
sheepluva
parents: 5107
diff changeset
    34
 *)
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    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
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    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
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
    39
procedure initModule;
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
    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
4e0fc59ab1ce More tolerance to pas2c
unc0rr
parents: 7053
diff changeset
    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
sheepluva
parents: 5107
diff changeset
    46
sheepluva
parents: 5107
diff changeset
    47
// MUSIC
sheepluva
parents: 5107
diff changeset
    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
sheepluva
parents: 5107
diff changeset
    57
sheepluva
parents: 5107
diff changeset
    58
sheepluva
parents: 5107
diff changeset
    59
// SOUNDS
sheepluva
parents: 5107
diff changeset
    60
sheepluva
parents: 5107
diff changeset
    61
// Plays the sound snd [from a given voicepack],
sheepluva
parents: 5107
diff changeset
    62
// if keepPlaying is given and true,
sheepluva
parents: 5107
diff changeset
    63
// then the sound's playback won't be interrupted if asked to play again.
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
    64
procedure PlaySound(snd: TSound);
3202
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
    65
procedure PlaySound(snd: TSound; keepPlaying: boolean);
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
    66
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack);
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
    67
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean);
5134
sheepluva
parents: 5107
diff changeset
    68
sheepluva
parents: 5107
diff changeset
    69
// Plays sound snd [of voicepack] in a loop, but starts with fadems milliseconds of fade-in.
sheepluva
parents: 5107
diff changeset
    70
// Returns sound channel of the looped sound.
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    71
function  LoopSound(snd: TSound): LongInt;
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
    72
function  LoopSound(snd: TSound; fadems: LongInt): LongInt;
10995
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
    73
function  LoopSoundV(snd: TSound; voicepack: PVoicepack): LongInt;
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
    74
function  LoopSoundV(snd: TSound; voicepack: PVoicepack; fadems: LongInt): LongInt;
5134
sheepluva
parents: 5107
diff changeset
    75
sheepluva
parents: 5107
diff changeset
    76
// Stops the normal/looped sound of the given type/in the given channel
sheepluva
parents: 5107
diff changeset
    77
// [with a fade-out effect for fadems milliseconds].
282
b1e3387389b6 - Pickhammer sound
unc0rr
parents: 183
diff changeset
    78
procedure StopSound(snd: TSound);
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
    79
procedure StopSoundChan(chn: LongInt);
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
    80
procedure StopSoundChan(chn, fadems: LongInt);
5134
sheepluva
parents: 5107
diff changeset
    81
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
    82
procedure AddVoice(snd: TSound; voicepack: PVoicepack);
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
    83
procedure PlayNextVoice;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
    84
5134
sheepluva
parents: 5107
diff changeset
    85
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    86
// GLOBAL FUNCTIONS
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    87
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    88
// Drastically lower the volume when we lose focus (and restore the previous value).
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    89
procedure DampenAudio;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    90
procedure UndampenAudio;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    91
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    92
// Mute/Unmute audio
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    93
procedure MuteAudio;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    94
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
    95
5134
sheepluva
parents: 5107
diff changeset
    96
// MISC
sheepluva
parents: 5107
diff changeset
    97
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
    98
// Set the initial volume
7848
775a72905708 * fix initialisation, preload values and then read args
koda
parents: 7423
diff changeset
    99
procedure SetVolume(vol: LongInt);
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   100
5134
sheepluva
parents: 5107
diff changeset
   101
// 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
   102
function  ChangeVolume(voldelta: LongInt): LongInt;
5134
sheepluva
parents: 5107
diff changeset
   103
sheepluva
parents: 5107
diff changeset
   104
// 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
   105
function  AskForVoicepack(name: shortstring): Pointer;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   106
10254
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10108
diff changeset
   107
var MusicFN: shortstring; // music file name
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10108
diff changeset
   108
    SDMusicFN: shortstring; // SD music file name
1097
06b15817b8a0 Enable music dependance on current land theme
unc0rr
parents: 1066
diff changeset
   109
8471
7681d14b9f01 Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents: 8370
diff changeset
   110
var Volume: LongInt;
7681d14b9f01 Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents: 8370
diff changeset
   111
    SoundTimerTicks: Longword;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   112
implementation
11772
927c45b83496 music credits etc.
sheepluva
parents: 11766
diff changeset
   113
uses uVariables, uConsole, uCommands, uChat, uUtils, uDebug, uPhysFSLayer;
564
17fb45c670c1 Finalize basic playlists implementation
unc0rr
parents: 449
diff changeset
   114
3418
8545f646a40d Engine:
smxx
parents: 3202
diff changeset
   115
const chanTPU = 32;
8471
7681d14b9f01 Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents: 8370
diff changeset
   116
var cInitVolume: LongInt;
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   117
    previousVolume: LongInt; // cached volume value
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   118
    lastChan: array [TSound] of LongInt;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   119
    voicepacks: array[0..cMaxTeams] of TVoicepack;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   120
    defVoicepack: PVoicepack;
7848
775a72905708 * fix initialisation, preload values and then read args
koda
parents: 7423
diff changeset
   121
    Mus: PMixMusic; // music pointer
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   122
    isMusicEnabled: boolean;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   123
    isSoundEnabled: boolean;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   124
    isSEBackup: boolean;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   125
    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
   126
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   127
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   128
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   129
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   130
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   131
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   132
                    ( snd: sndNone; voicepack: nil),
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   133
                    ( snd: sndNone; voicepack: nil));
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   134
    Soundz: array[TSound] of record
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   135
            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
   136
            Path, AltPath    : TPathType;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   137
            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
   138
            (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
   139
            (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
   140
            (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
   141
            (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
   142
            (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
   143
            (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
   144
            (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
   145
            (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
   146
            (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
   147
            (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
   148
            (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
   149
            (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
   150
            (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
   151
            (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
   152
            (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
   153
            (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
   154
            (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
   155
            (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
   156
            (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
   157
            (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
   158
            (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
   159
            (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
   160
            (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
   161
            (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
   162
            (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
   163
            (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
   164
            (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
   165
            (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
   166
            (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
   167
            (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
   168
            (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
   169
            (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
   170
            (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
   171
            (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
   172
            (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
   173
            (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
   174
            (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
   175
            (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
   176
            (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
   177
            (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
   178
            (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
   179
            (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
   180
            (FileName:                  'Ow4.ogg'; Path: ptVoices; AltPath: ptNone),// sndOw4
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:           'Firepunch1.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirepunch1
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:           'Firepunch2.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirepunch2
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:           'Firepunch3.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirepunch3
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:           'Firepunch4.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirepunch4
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:           'Firepunch5.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirepunch5
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:           'Firepunch6.ogg'; Path: ptVoices; AltPath: ptNone),// sndFirepunch6
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:                '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
   188
            (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
   189
            (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
   190
            (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
   191
            (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
   192
            (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
   193
            (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
   194
            (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
   195
            (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
   196
            (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
   197
            (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
   198
            (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
   199
            (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
   200
            (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
   201
            (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
   202
            (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
   203
            (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
   204
            (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
   205
            (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
   206
            (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
   207
            (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
   208
            (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
   209
            (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
   210
            (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
   211
            (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
   212
            (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
   213
            (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
   214
            (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
   215
            (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
   216
            (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
   217
            (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
   218
            (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
   219
            (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
   220
            (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
   221
            (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
   222
            (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
   223
            (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
   224
            (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
   225
            (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
   226
            (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
   227
            (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
   228
            (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
   229
            (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
   230
            (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
   231
            (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
   232
            (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
   233
            (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
   234
            (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
   235
            (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
   236
            (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
   237
            (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
   238
            (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
   239
            (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
   240
            (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
   241
            (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
   242
            (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
   243
            (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
   244
            (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
   245
            (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
   246
            (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
   247
            (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
   248
            (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
   249
            (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
   250
            (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
   251
            (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
   252
            (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
   253
            (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
   254
            (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
   255
            (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
   256
            (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
   257
            (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
   258
            (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
   259
            (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
   260
            (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
   261
            (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
   262
            (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
   263
            (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
   264
            (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
   265
            (FileName:           'portalopen.ogg'; Path: ptSounds; AltPath: ptNone),// sndPortalOpen
6145efcff302 Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents: 11874
diff changeset
   266
            (FileName:            'blowtorch.ogg'; Path: ptSounds; AltPath: ptNone) // sndBlowTorch
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   267
            );
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8046
diff changeset
   268
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   269
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   270
function  AskForVoicepack(name: shortstring): Pointer;
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
   271
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
   272
    locName, path: shortstring;
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
   273
begin
10995
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   274
    i:= 0;
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   275
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   276
    // 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
   277
    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
   278
        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
   279
        locName:= name+'_'+cLocale;
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   280
        path:= cPathz[ptVoices] + '/' + locName;
8678
fb62d23c70f8 PhysFS-aware check for directory existence. Should fix issue 511.
unc0rr
parents: 8471
diff changeset
   281
        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
   282
            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
   283
        else
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   284
            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
   285
                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
   286
                locName:= name+'_'+Copy(cLocale,1,2);
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   287
                path:= cPathz[ptVoices] + '/' + locName;
8678
fb62d23c70f8 PhysFS-aware check for directory existence. Should fix issue 511.
unc0rr
parents: 8471
diff changeset
   288
                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
   289
                    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
   290
                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
   291
        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
   292
10995
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   293
    path:= cPathz[ptVoices] + '/' + name;
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   294
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   295
    // 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
   296
    if (name <> 'Default') and (not pfsExists(path)) then
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   297
        begin
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   298
        path:= cPathz[ptVoices] + '/Default';
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   299
        if pfsExists(path) then
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   300
            exit(AskForVoicepack('Default'));
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   301
        end;
7faaef306837 fallback to Default voicepack if specified voicepack is not available
sheepluva
parents: 10510
diff changeset
   302
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   303
    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
   304
        begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   305
        inc(i);
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   306
        //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
   307
        end;
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
   308
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   309
    voicepacks[i].name:= name;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   310
    AskForVoicepack:= @voicepacks[i]
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
   311
end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   312
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   313
procedure InitSound;
11261
ce5f1b547a67 - Return of stereo sound for mobile!
antonc27 <antonc27@mail.ru>
parents: 11068
diff changeset
   314
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
   315
var success: boolean;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   316
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
   317
    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
   318
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   319
    WriteToConsole('Init sound...');
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
   320
    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
   321
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
   322
    if success then
11500
3a4026fe7c18 use MIX_DEFAULT_FORMAT for sound
sheepluva
parents: 11499
diff changeset
   323
        success:= Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, channels, 1024) = 0;
2327
4832b77ec958 restored volumen control (hoorray)
koda
parents: 2303
diff changeset
   324
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
   325
    if success then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   326
        WriteLnToConsole(msgOK)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   327
    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
   328
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   329
        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
   330
        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
   331
        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
   332
    end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   333
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   334
    WriteToConsole('Init SDL_mixer... ');
11507
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11500
diff changeset
   335
    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
   336
    WriteLnToConsole(msgOK);
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   337
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   338
    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
   339
    previousVolume:= cInitVolume;
8330
aaefa587e277 update branch with default
koda
parents: 8096 8231
diff changeset
   340
    ChangeVolume(cInitVolume);
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   341
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
   342
7061
4e0fc59ab1ce More tolerance to pas2c
unc0rr
parents: 7053
diff changeset
   343
procedure ResetSound;
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   344
begin
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   345
    isSoundEnabled:= isSEBackup;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   346
end;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   347
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   348
procedure SetSound(enabled: boolean);
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   349
begin
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   350
    isSEBackup:= isSoundEnabled;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   351
    isSoundEnabled:= enabled;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   352
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   353
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
   354
// 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
   355
// 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
   356
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
   357
var i: TSound;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   358
    t: Longword;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   359
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
   360
    // release and nil all sounds
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   361
    for t:= 0 to cMaxTeams do
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   362
        if voicepacks[t].name <> '' then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   363
            for i:= Low(TSound) to High(TSound) do
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   364
                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
   365
                    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
   366
                        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
   367
                        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
   368
                        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
   369
                        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
   370
                        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
   371
                        end;
3182
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
   372
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
   373
    // 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
   374
    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
   375
        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
   376
        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
   377
            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
   378
            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
   379
            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
   380
            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
   381
            end;
3182
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
   382
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
   383
        // 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
   384
        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
   385
            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
   386
ceacd1b61833 modify ReleaseSound so that it performs a partial release of unused sounds, useful for responding to memory warnings
koda
parents: 6360
diff changeset
   387
        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
   388
        end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   389
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   390
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   391
procedure PlaySound(snd: TSound);
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   392
begin
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   393
    PlaySoundV(snd, nil, false);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   394
end;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   395
3202
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   396
procedure PlaySound(snd: TSound; keepPlaying: boolean);
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   397
begin
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   398
    PlaySoundV(snd, nil, keepPlaying);
3202
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   399
end;
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   400
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   401
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   402
begin
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   403
    PlaySoundV(snd, voicepack, false);
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   404
end;
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   405
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   406
procedure PlaySoundV(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean);
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   407
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
   408
rwops: PSDL_RWops;
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   409
begin
4948
c3dc41ae68fa remove unused ios code
koda
parents: 4748
diff changeset
   410
    if (not isSoundEnabled) or fastUntilLag then
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   411
        exit;
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   412
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   413
    if keepPlaying and (lastChan[snd] <> -1) and (Mix_Playing(lastChan[snd]) <> 0) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   414
        exit;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   415
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   416
    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
   417
        begin
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   418
        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
   419
            begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   420
            s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
8191
3f03f0b6a385 Fix check for file existance
unc0rr
parents: 8168
diff changeset
   421
            if (not pfsExists(s)) and (snd in [sndFirePunch2, sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6]) then
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   422
                s:= cPathz[Soundz[sndFirePunch1].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   423
            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
   424
            rwops := rwopsOpenRead(s);
11874
045f33b498ea fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents: 11873
diff changeset
   425
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
   426
            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
   427
                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
   428
                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
   429
                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
   430
                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
   431
                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
   432
            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
   433
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   434
            if voicepack^.chunks[snd] = nil then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   435
                WriteLnToConsole(msgFailed)
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   436
            else
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   437
                WriteLnToConsole(msgOK)
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   438
            end;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   439
        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
   440
        end
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   441
    else
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   442
        begin
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   443
        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
   444
            begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   445
            s:= cPathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   446
            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
   447
            rwops := rwopsOpenRead(s);
11874
045f33b498ea fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents: 11873
diff changeset
   448
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
   449
            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
   450
                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
   451
                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
   452
                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
   453
                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
   454
                end;
11874
045f33b498ea fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents: 11873
diff changeset
   455
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
   456
            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
   457
            if SDLCheck(defVoicepack^.chunks[snd] <> nil, 'Mix_LoadWAV_RW', true) then exit;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   458
            WriteLnToConsole(msgOK);
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   459
            end;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   460
        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
   461
        end;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   462
end;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   463
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   464
procedure AddVoice(snd: TSound; voicepack: PVoicepack);
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   465
var i : LongInt;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   466
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   467
    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
   468
        exit;
6360
eca20f8990e2 Clear all other sounds before playing flawless victory / victory
nemo
parents: 6072
diff changeset
   469
    if (snd = sndVictory) or (snd = sndFlawless) then
eca20f8990e2 Clear all other sounds before playing flawless victory / victory
nemo
parents: 6072
diff changeset
   470
        begin
6367
a7fbf18b2d55 be more gentle when you stop channels at the end of the game
koda
parents: 6363
diff changeset
   471
        Mix_FadeOutChannel(-1, 800);
8168
645ee0e201a2 use High() to avoid future out of bounds in uSound
koda
parents: 8165
diff changeset
   472
        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
   473
            VoiceList[i].snd:= sndNone;
6360
eca20f8990e2 Clear all other sounds before playing flawless victory / victory
nemo
parents: 6072
diff changeset
   474
        LastVoice.snd:= sndNone;
eca20f8990e2 Clear all other sounds before playing flawless victory / victory
nemo
parents: 6072
diff changeset
   475
        end;
eca20f8990e2 Clear all other sounds before playing flawless victory / victory
nemo
parents: 6072
diff changeset
   476
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   477
    i:= 0;
10490
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10254
diff changeset
   478
    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
   479
        inc(i);
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   480
5921
43cb3139cebe Avoid hog repeating himself
nemo
parents: 5673
diff changeset
   481
    // 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
   482
    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
   483
        exit;
10490
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10254
diff changeset
   484
    if(i <= High(VoiceList)) then
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10254
diff changeset
   485
        begin
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10254
diff changeset
   486
        VoiceList[i].snd:= snd;
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10254
diff changeset
   487
        VoiceList[i].voicepack:= voicepack;
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10254
diff changeset
   488
        end
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   489
end;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   490
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   491
procedure PlayNextVoice;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   492
var i : LongInt;
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   493
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   494
    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
   495
        exit;
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   496
    i:= 0;
8168
645ee0e201a2 use High() to avoid future out of bounds in uSound
koda
parents: 8165
diff changeset
   497
    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
   498
        inc(i);
8330
aaefa587e277 update branch with default
koda
parents: 8096 8231
diff changeset
   499
5638
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   500
    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
   501
        begin
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   502
        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
   503
        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
   504
        VoiceList[i].snd:= sndNone;
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   505
        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
   506
        end
e35ba2a400d8 Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents: 5239
diff changeset
   507
    else LastVoice.snd:= sndNone;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   508
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   509
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   510
function LoopSound(snd: TSound): LongInt;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   511
begin
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   512
    LoopSound:= LoopSoundV(snd, nil)
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   513
end;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   514
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   515
function LoopSound(snd: TSound; fadems: LongInt): LongInt;
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   516
begin
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   517
    LoopSound:= LoopSoundV(snd, nil, fadems)
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   518
end;
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   519
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   520
function LoopSoundV(snd: TSound; voicepack: PVoicepack): LongInt;
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   521
begin
5052
74a81c276d67 fix a couple of loose ends
koda
parents: 4976
diff changeset
   522
    voicepack:= voicepack;    // avoid compiler hint
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   523
    LoopSoundV:= LoopSoundV(snd, nil, 0)
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   524
end;
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   525
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   526
function LoopSoundV(snd: TSound; voicepack: PVoicepack; fadems: LongInt): LongInt;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   527
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
   528
rwops: PSDL_RWops;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   529
begin
4948
c3dc41ae68fa remove unused ios code
koda
parents: 4748
diff changeset
   530
    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
   531
        begin
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   532
        LoopSoundV:= -1;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   533
        exit
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   534
        end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   535
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   536
    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
   537
        begin
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   538
        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
   539
           begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   540
            s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   541
            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
   542
            rwops:=rwopsOpenRead(s);
11874
045f33b498ea fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents: 11873
diff changeset
   543
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
   544
            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
   545
                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
   546
                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
   547
                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
   548
                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
   549
                end;
11874
045f33b498ea fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents: 11873
diff changeset
   550
045f33b498ea fix copypastafail (incorrect variable name) and whitespaces
sheepluva
parents: 11873
diff changeset
   551
            voicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1);
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   552
            if voicepack^.chunks[snd] = nil then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   553
                WriteLnToConsole(msgFailed)
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   554
            else
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   555
                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
   556
            end;
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   557
        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
   558
        end
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   559
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   560
        begin
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   561
        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
   562
            begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   563
            s:= cPathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   564
            WriteToConsole(msgLoading + s + ' ');
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8015
diff changeset
   565
            defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwopsOpenRead(s), 1);
11507
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11500
diff changeset
   566
            if SDLCheck(defVoicepack^.chunks[snd] <> nil, 'Mix_LoadWAV_RW', true) then exit;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   567
            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
   568
            end;
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   569
        if fadems > 0 then
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   570
            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
   571
        else
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   572
            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
   573
        end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   574
end;
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   575
282
b1e3387389b6 - Pickhammer sound
unc0rr
parents: 183
diff changeset
   576
procedure StopSound(snd: TSound);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   577
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   578
    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
   579
        exit;
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   580
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   581
    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
   582
        begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   583
        Mix_HaltChannel(lastChan[snd]);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   584
        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
   585
        end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   586
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   587
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   588
procedure StopSoundChan(chn: LongInt);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   589
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   590
    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
   591
        exit;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   592
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   593
    if (chn <> -1) and (Mix_Playing(chn) <> 0) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   594
        Mix_HaltChannel(chn);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   595
end;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   596
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   597
procedure StopSoundChan(chn, fadems: LongInt);
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   598
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   599
    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
   600
        exit;
4956
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   601
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   602
    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
   603
        Mix_FadeOutChannel(chn, fadems);
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   604
end;
48e1f9a04c28 usound: added function for loops with fade in and out
koda
parents: 4948
diff changeset
   605
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   606
procedure PlayMusic;
2905
f3c79f7193a9 Engine:
smxx
parents: 2832
diff changeset
   607
var s: shortstring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   608
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
   609
    if (MusicFN = '') or (not isMusicEnabled) then
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   610
        exit;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
   611
    if SuddenDeath and (SDMusicFN <> '') then
10254
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10108
diff changeset
   612
         s:= '/Music/' + SDMusicFN
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10108
diff changeset
   613
    else s:= '/Music/' + MusicFN;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   614
    WriteToConsole(msgLoading + s + ' ');
565
092cb8deffc5 Fix some bug, finish playlist implementation
unc0rr
parents: 564
diff changeset
   615
8046
4d3415927d2c Use (undocumented) Mix_LoadMUS_RW to load music
unc0rr
parents: 8025
diff changeset
   616
    Mus:= Mix_LoadMUS_RW(rwopsOpenRead(s));
11507
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11500
diff changeset
   617
    SDLCheck(Mus <> nil, 'Mix_LoadMUS_RW', false);
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   618
    WriteLnToConsole(msgOK);
565
092cb8deffc5 Fix some bug, finish playlist implementation
unc0rr
parents: 564
diff changeset
   619
11507
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11500
diff changeset
   620
    SDLCheck(Mix_FadeInMusic(Mus, -1, 3000) <> -1, 'Mix_FadeInMusic', false)
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   621
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   622
7848
775a72905708 * fix initialisation, preload values and then read args
koda
parents: 7423
diff changeset
   623
procedure SetVolume(vol: LongInt);
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   624
begin
7848
775a72905708 * fix initialisation, preload values and then read args
koda
parents: 7423
diff changeset
   625
    cInitVolume:= vol;
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   626
end;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   627
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 355
diff changeset
   628
function ChangeVolume(voldelta: LongInt): LongInt;
174
0b2c5b22f644 Changeable volume
unc0rr
parents: 97
diff changeset
   629
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
   630
    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
   631
    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
   632
        exit;
2327
4832b77ec958 restored volumen control (hoorray)
koda
parents: 2303
diff changeset
   633
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   634
    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
   635
    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
   636
        Volume:= 0;
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   637
    // apply Volume to all channels
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   638
    Mix_Volume(-1, Volume);
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   639
    // get assigned Volume
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   640
    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
   641
    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
   642
        Mix_VolumeMusic(Volume * 4 div 8);
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   643
    ChangeVolume:= Volume * 100 div MIX_MAX_VOLUME;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   644
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   645
    if (isMusicEnabled) then
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   646
        if (Volume = 0) then
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   647
            PauseMusic
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   648
            else
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   649
            ResumeMusic;
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   650
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   651
    isAudioMuted:= (Volume = 0);
174
0b2c5b22f644 Changeable volume
unc0rr
parents: 97
diff changeset
   652
end;
0b2c5b22f644 Changeable volume
unc0rr
parents: 97
diff changeset
   653
6862
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   654
procedure DampenAudio;
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   655
begin
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   656
    if (isAudioMuted) then
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   657
        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
   658
    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
   659
    ChangeVolume(-Volume * 7 div 9);
6862
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   660
end;
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   661
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   662
procedure UndampenAudio;
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   663
begin
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   664
     if (isAudioMuted) then
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   665
        exit;
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   666
    ChangeVolume(previousVolume - Volume);
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   667
end;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   668
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   669
procedure MuteAudio;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   670
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
   671
    if not (isSoundEnabled or isMusicEnabled) then
7848
775a72905708 * fix initialisation, preload values and then read args
koda
parents: 7423
diff changeset
   672
        exit;
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   673
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   674
    if (isAudioMuted) then
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   675
    begin
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   676
        ResumeMusic;
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   677
        ChangeVolume(previousVolume);
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   678
    end
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   679
    else
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   680
    begin
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   681
        PauseMusic;
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   682
        previousVolume:= Volume;
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   683
        ChangeVolume(-Volume);
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   684
    end;
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   685
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   686
    // isAudioMuted is updated in ChangeVolume
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   687
end;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   688
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   689
procedure SetMusic(enabled: boolean);
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   690
begin
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   691
    isMusicEnabled:= enabled;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   692
end;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   693
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7043
diff changeset
   694
procedure SetMusicName(musicname: shortstring);
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   695
begin
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   696
    MusicFN:= musicname;
6862
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   697
end;
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6700
diff changeset
   698
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   699
procedure PauseMusic;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   700
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   701
    if (MusicFN = '') or (not isMusicEnabled) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   702
        exit;
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   703
6472
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   704
    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
   705
        Mix_PauseMusic(Mus);
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   706
end;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   707
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   708
procedure ResumeMusic;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   709
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   710
    if (MusicFN = '') or (not isMusicEnabled) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   711
        exit;
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   712
6472
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   713
    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
   714
        Mix_ResumeMusic(Mus);
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   715
end;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   716
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   717
procedure ChangeMusic(musicname: shortstring);
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   718
begin
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   719
    MusicFN:= musicname;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   720
    if (MusicFN = '') or (not isMusicEnabled) then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   721
        exit;
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   722
6472
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   723
    StopMusic;
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   724
    PlayMusic;
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   725
end;
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   726
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   727
procedure StopMusic;
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   728
begin
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   729
    if (MusicFN = '') or (not isMusicEnabled) then
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   730
        exit;
bced12412f94 present somthing that could be taken as a structure
Henek
parents: 6415
diff changeset
   731
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   732
    if Mus <> nil then
6521
16d9ac07f504 missing nil
nemo
parents: 6472
diff changeset
   733
        begin
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   734
        Mix_FreeMusic(Mus);
6521
16d9ac07f504 missing nil
nemo
parents: 6472
diff changeset
   735
        Mus:= nil;
16d9ac07f504 missing nil
nemo
parents: 6472
diff changeset
   736
        end
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   737
end;
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4461
diff changeset
   738
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
   739
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
   740
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6551
diff changeset
   741
    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
   742
        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
   743
    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
   744
    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
   745
        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
   746
    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
   747
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
   748
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   749
procedure chMute(var s: shortstring);
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   750
begin
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   751
    s:= s; // avoid compiler hint
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   752
    MuteAudio;
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   753
end;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7151
diff changeset
   754
7896
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   755
procedure preInitModule;
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   756
begin
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   757
    isMusicEnabled:= true;
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   758
    isSoundEnabled:= true;
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   759
    cInitVolume:= 100;
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   760
end;
67217e6108fd another stake at variable pre-initialisation - we lost preview logging in the course
koda
parents: 7848
diff changeset
   761
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
   762
procedure initModule;
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   763
var t: LongInt;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   764
    i: TSound;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   765
begin
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6862
diff changeset
   766
    RegisterVariable('voicepack', @chVoicepack, false);
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   767
    RegisterVariable('mute'     , @chMute     , true );
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   768
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   769
    MusicFN:='';
11068
0ff8b968291b allow holding PRECISE key to switch portal ball colors in reverse order
sheepluva
parents: 11046
diff changeset
   770
    SDMusicFN:= 'sdmusic.ogg';
7848
775a72905708 * fix initialisation, preload values and then read args
koda
parents: 7423
diff changeset
   771
    Mus:= nil;
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
   772
    isAudioMuted:= false;
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   773
    isSEBackup:= isSoundEnabled;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   774
    Volume:= 0;
8471
7681d14b9f01 Trying to prevent audio mute from endlessly spamming. Untested.
nemo
parents: 8370
diff changeset
   775
    SoundTimerTicks:= 0;
7024
3e1cca870090 fix more breakage
koda
parents: 7021
diff changeset
   776
    defVoicepack:= AskForVoicepack('Default');
7021
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   777
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   778
    for i:= Low(TSound) to High(TSound) do
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   779
        lastChan[i]:= -1;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   780
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   781
    // 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
   782
    for t:= 0 to cMaxTeams do
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   783
        if voicepacks[t].name <> '' then
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   784
            for i:= Low(TSound) to High(TSound) do
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   785
                voicepacks[t].chunks[i]:= nil;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   786
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   787
    (* on MOBILE SDL_mixer has to be compiled against Tremor (USE_OGG_TREMOR)
8168
645ee0e201a2 use High() to avoid future out of bounds in uSound
koda
parents: 8165
diff changeset
   788
       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
   789
    for i:= Low(TSound) to High(TSound) do
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   790
        defVoicepack^.chunks[i]:= nil;
0c75512a8920 adjust the scope of a few uSound variables and functions
koda
parents: 6990
diff changeset
   791
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   792
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   793
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
   794
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   795
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
   796
    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
   797
        ReleaseSound(true);
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   798
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   799
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   800
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
   801