Skip to content

Commit f2118ec

Browse files
author
Giel van Schijndel
committed
* Remove cheat "no faults"
* Remove sound scream4.ogg (ID_SOUND_NOFAULTS) which it triggered (that's the onlything that cheat did: playing that audiofile) * All that audiofile contained was a spoken message: "There are no faults, in the renderer, at the moment." git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3266 4a71c877-e1ca-e34f-864e-861f7616d084
1 parent 59e3746 commit f2118ec

7 files changed

Lines changed: 7 additions & 18 deletions

File tree

data/audio/audio.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ audio_module
414414
audio "scream.ogg" oneshot 100 1800
415415
audio "scream2.ogg" oneshot 100 1800
416416
audio "scream3.ogg" oneshot 100 1800
417-
audio "scream4.ogg" oneshot 100 1800
418417
audio "silence.ogg" oneshot 100 1800
419418
420419
/*Extra*/

data/audio/sfx/misc/scream4.ogg

-12.8 KB
Binary file not shown.

lib/sound/audio_id.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ static AUDIO_ID_MAP asAudioID[] =
440440
{ID_SOUND_BARB_SCREAM2, "scream2.ogg"},
441441
{ID_SOUND_BARB_SCREAM3, "scream3.ogg"},
442442
{ID_SOUND_OF_SILENCE, "silence.ogg"},
443-
{ID_SOUND_NOFAULTS, "scream4.ogg"},
444443

445444
/* Extra */
446445
{ID_SOUND_LANDING_ZONE, "lndgzne.ogg"},

lib/sound/audio_id.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
/* INGAME AUDIO */
2525

2626
typedef enum
27-
{
27+
{
2828
NO_SOUND = -1,
2929

3030
/* Beeps */
31-
31+
3232
ID_SOUND_WINDOWCLOSE,
3333
ID_SOUND_WINDOWOPEN,
3434
ID_SOUND_SELECT,
@@ -340,7 +340,7 @@ typedef enum
340340
/* SFX */
341341

342342
/* Weapon Sounds */
343-
343+
344344
ID_SOUND_ROCKET,
345345
ID_SOUND_ROTARY_LASER,
346346
ID_SOUND_GAUSSGUN,
@@ -390,7 +390,7 @@ typedef enum
390390
ID_SOUND_CONSTRUCTOR_MOVEOFF,
391391
ID_SOUND_CONSTRUCTOR_MOVE,
392392
ID_SOUND_CONSTRUCTOR_SHUTDOWN,
393-
393+
394394
/* Transports */
395395
ID_SOUND_BLIMP_FLIGHT,
396396
ID_SOUND_BLIMP_IDLE,
@@ -423,13 +423,12 @@ typedef enum
423423
ID_SOUND_FIRE_ROAR,
424424

425425
/* Misc */
426-
426+
427427
ID_SOUND_HELP,
428428
ID_SOUND_BARB_SCREAM,
429429
ID_SOUND_BARB_SCREAM2,
430430
ID_SOUND_BARB_SCREAM3,
431431
ID_SOUND_OF_SILENCE,
432-
ID_SOUND_NOFAULTS,
433432

434433
/* Extra */
435434

@@ -462,7 +461,7 @@ typedef enum
462461
ID_SOUND_TEAM_GAMMA_RESCUED,
463462
ID_SOUND_LASER_SATELLITE_FIRING,
464463
ID_SOUND_INCOMING_LASER_SAT_STRIKE,
465-
464+
466465
/* Nexus */
467466

468467
ID_SOUND_NEXUS_DEFENCES_ABSORBED,

src/cheat.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ static CHEAT_ENTRY cheatCodes[] =
6666
{"build info", kf_BuildInfo}, // tells you when the game was built
6767
{"time toggle", kf_ToggleMissionTimer},
6868
{"work harder", kf_FinishResearch},
69-
{"no faults", kf_NoFaults},//carol vorderman
7069
{"tileinfo", kf_TileInfo}, // output debug info about a tile
7170
{"showfps", kf_ToggleFPS}, //displays your average FPS
7271
{"showsamples", kf_ToggleSamples}, //displays the # of Sound samples in Queue & List

src/keybind.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,6 @@ void kf_ToggleRadarJump( void )
154154
{
155155
setRadarJump(!getRadarJumpStatus());
156156
}
157-
// --------------------------------------------------------------------------
158-
void kf_NoFaults( void )
159-
{
160-
audio_QueueTrack( ID_SOUND_NOFAULTS );
161-
}
162-
// --------------------------------------------------------------------------
163157

164158
// --------------------------------------------------------------------------
165159
//===================================================

src/keybind.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ extern void kf_KillEnemy( void );
192192
extern void kf_ToggleMissionTimer( void );
193193

194194
extern void kf_SetHardLevel( void );
195-
extern void kf_NoFaults( void );
196195
extern void kf_SelectCommander_0( void );
197196
extern void kf_SelectCommander_1( void );
198197
extern void kf_SelectCommander_2( void );
@@ -206,7 +205,7 @@ extern void kf_SelectCommander_9( void );
206205
void kf_ToggleReopenBuildMenu( void );
207206

208207
// dirty but necessary
209-
extern char sTextToSend[MAX_CONSOLE_STRING_LENGTH];
208+
extern char sTextToSend[MAX_CONSOLE_STRING_LENGTH];
210209
extern void kf_FaceNorth(void);
211210
extern void kf_FaceSouth(void);
212211
extern void kf_FaceEast(void);

0 commit comments

Comments
 (0)