From 38fbd742096e70289ae18738ff6f83c6daf51f1d Mon Sep 17 00:00:00 2001 From: Walter Julius Hennecke Date: Thu, 26 Jul 2012 17:43:42 +0200 Subject: [PATCH] Self destruct is now leathal --- game/g_target.c | 6 +++--- stefgame.suo | Bin 235008 -> 235008 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game/g_target.c b/game/g_target.c index 0c28cba..d928780 100644 --- a/game/g_target.c +++ b/game/g_target.c @@ -2637,12 +2637,12 @@ void target_selfdestruct_think(gentity_t *ent) { for(i = 0; i < level.numConnectedClients; i++) { client = &g_entities[i]; //if (!client->flags &= FL_ESCAPEPOD) //anyone knowing how to set up this flag? - G_Damage (NULL, NULL, NULL, NULL, NULL, 999999, 0, MOD_TRIGGER_HURT); //maybe a new message ala "[Charname] did not abandon ship." + G_Damage (client, NULL, NULL, NULL, NULL, 999999, 0, MOD_TRIGGER_HURT); //maybe a new message ala "[Charname] did not abandon ship." //} //let's hear it - G_AddEvent(ent, EV_GLOBAL_SOUND, G_SoundIndex("sound/weapons/explosions/explode2.wav")); + G_AddEvent(ent, EV_GLOBAL_SOUND, G_SoundIndex("sound/weapons/explosions/explode2.wav")); //let's be shakey for a sec... I hope lol ^^ - trap_SetConfigstring( CS_CAMERA_SHAKE, va( "%f %i", 999999, (level.time + 1000) ) ); + trap_SetConfigstring( CS_CAMERA_SHAKE, va( "%f %i", 999999, (level.time + 1000) ) ); } } else if (ent->wait < 0) { diff --git a/stefgame.suo b/stefgame.suo index 2ce0ecc90a5720733f17742f8113ff4a2119592a..112286796c14c08c6d51c1b06bc2a764c857325c 100644 GIT binary patch delta 5465 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 delta 5656 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 ATL1t6