ubergames/rpg-x2-rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2-rpgxEF.git synced 2025-02-14 16:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git@github.com:UberGames/RPG-X2-rpgxEF.git

Browse source 
Conflicts:
	game/g_target.c
This commit is contained in:
Harry Young 2012-07-26 18:53:16 +02:00
commit 51c98703cf
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
game/g_target.c
View file

@ -2656,6 +2656,7 @@ void target_selfdestruct_think(gentity_t *ent) {
} }
} else if (ent->wait == 0) { //bang time ^^ } 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 we have a target fire that, else kill everyone that is not marked as escaped.
//if (!ent->target) { //if (!ent->target) {
//Loop trough all clients on the server. //Loop trough all clients on the server.
@ -2677,6 +2678,21 @@ void target_selfdestruct_think(gentity_t *ent) {
// } else { // } else {
// G_UseTargets(ent, ent); // 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) { } 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 //we have aborted and the note should be out or ended and everyone should be dead so let's reset

BIN
stefgame.suo
View file

Binary file not shown.