rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trigger_push and target_push default to no noise when the noise flag is not set.

This commit is contained in:
Scott Brooks 2002-05-11 00:38:47 +00:00
parent a04a9eb263
commit 8f12a44cfb
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reaction/game/g_misc.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.36 2002/05/11 00:38:47 blaze
// trigger_push and target_push default to no noise when the noise flag is not set.
//
// Revision 1.35 2002/05/02 03:06:09 blaze // Revision 1.35 2002/05/02 03:06:09 blaze
// Fixed breakables crashing on vashes // Fixed breakables crashing on vashes
// //
@ -466,7 +469,6 @@ void func_breakable_explode( gentity_t *self , vec3_t pos ) {
void func_breakable_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int meansOfDeath ) void func_breakable_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int meansOfDeath )
{ {
func_breakable_explode( self , self->s.origin ); func_breakable_explode( self , self->s.origin );
G_ExplodeMissile(self); G_ExplodeMissile(self);
G_RadiusDamage(self->s.origin,attacker,self->damage,self->damage_radius,self, meansOfDeath); G_RadiusDamage(self->s.origin,attacker,self->damage,self->damage_radius,self, meansOfDeath);
@ -582,13 +584,12 @@ void SP_func_breakable( gentity_t *ent ) {
if ( ent->spawnflags & 4) if ( ent->spawnflags & 4)
{ {
ent->explosive = qtrue; ent->explosive = qtrue;
//Com_Printf("Explosive ");
} }
else else
{ {
ent->explosive = qfalse; ent->explosive = qfalse;
} }
if ( !ent->damage_radius ) if ( !ent->damage_radius )
{ {
ent->damage_radius=GRENADE_SPLASH_RADIUS; ent->damage_radius=GRENADE_SPLASH_RADIUS;

14
reaction/game/g_mover.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.27 2002/05/11 00:38:47 blaze
// trigger_push and target_push default to no noise when the noise flag is not set.
//
// Revision 1.26 2002/05/05 15:18:02 makro // Revision 1.26 2002/05/05 15:18:02 makro
// Fixed some crash bugs. Bot stuff. Triggerable func_statics. // Fixed some crash bugs. Bot stuff. Triggerable func_statics.
// Made flags only spawn in CTF mode // Made flags only spawn in CTF mode
@ -1875,7 +1878,16 @@ void SP_func_button( gentity_t *ent ) {
vec3_t size; vec3_t size;
float lip; float lip;
char *s; char *s;
ent->sound1to2 = G_SoundIndex("sound/movers/switches/butn2.wav"); char *noise;
if (G_SpawnString( "noise", "sound/movers/doors/dr1_end.wav", &noise ) )
{
ent->sound1to2 = G_SoundIndex(noise);
}
else
{
ent->sound1to2 = G_SoundIndex("sound/movers/switches/butn2.wav");
}
if ( !ent->speed ) { if ( !ent->speed ) {
ent->speed = 40; ent->speed = 40;

7
reaction/game/g_trigger.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.10 2002/05/11 00:38:47 blaze
// trigger_push and target_push default to no noise when the noise flag is not set.
//
// Revision 1.9 2002/05/05 15:18:03 makro // Revision 1.9 2002/05/05 15:18:03 makro
// Fixed some crash bugs. Bot stuff. Triggerable func_statics. // Fixed some crash bugs. Bot stuff. Triggerable func_statics.
// Made flags only spawn in CTF mode // Made flags only spawn in CTF mode
@ -208,7 +211,7 @@ void SP_trigger_push( gentity_t *self ) {
// unlike other triggers, we need to send this one to the client // unlike other triggers, we need to send this one to the client
// NiceAss: Added for custom push sounds. Default is none. Q3 is "sounds/world/bouncepad.wav" // NiceAss: Added for custom push sounds. Default is none. Q3 is "sounds/world/bouncepad.wav"
if (G_SpawnString( "noise", "", &sound )) {; if (G_SpawnString( "noise", "sound/misc/silence.wav", &sound )) {;
self->s.generic1 = G_SoundIndex( sound ); self->s.generic1 = G_SoundIndex( sound );
} }
@ -257,7 +260,7 @@ void SP_target_push( gentity_t *self ) {
G_SetMovedir (self->s.angles, self->s.origin2); G_SetMovedir (self->s.angles, self->s.origin2);
VectorScale (self->s.origin2, self->speed, self->s.origin2); VectorScale (self->s.origin2, self->speed, self->s.origin2);
if (G_SpawnString( "noise", "", &sound )) {; if (G_SpawnString( "noise", "sound/misc/silence.wav", &sound )) {;
G_Printf("^2Sound was %s\n",sound); G_Printf("^2Sound was %s\n",sound);
self->noise_index = G_SoundIndex( sound ); self->noise_index = G_SoundIndex( sound );
} }