ubergames/rpg-x2-rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2-rpgxEF.git synced 2025-03-15 05:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

still need to learn things about git...

Browse source 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
This commit is contained in:
Harry Young 2012-07-26 19:04:22 +02:00
parent 51c98703cf
commit 185451ad39
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
game/g_target.c
View file

@ -2656,7 +2656,6 @@ void target_selfdestruct_think(gentity_t *ent) {
}
} else if (ent->wait == 0) { //bang time ^^
<<<<<<< HEAD
//if we have a target fire that, else kill everyone that is not marked as escaped.
//if (!ent->target) {
//Loop trough all clients on the server.
@ -2678,21 +2677,6 @@ void target_selfdestruct_think(gentity_t *ent) {
// } else {
// G_UseTargets(ent, ent);
// }
=======
//Loop trough all clients on the server.
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 (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"));
//let's be shakey for a sec... I hope lol ^^
trap_SetConfigstring( CS_CAMERA_SHAKE, va( "%f %i", 999999, (level.time + 1000) ) );
}
>>>>>>> origin/master
} else if (ent->wait < 0) {
//we have aborted and the note should be out or ended and everyone should be dead so let's reset