diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-23 18:08:19 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-23 18:08:19 +0000 |
| commit | d9d37b945ee5796553794ef33249c22490494391 (patch) | |
| tree | 03c1c97c02732095316fdcbc46fdf777de2ab9b0 /src/game/server/gamemodes | |
| parent | c10ce4d17b4e21effecb28e0b43df2386ae1baaf (diff) | |
| download | zcatch-d9d37b945ee5796553794ef33249c22490494391.tar.gz zcatch-d9d37b945ee5796553794ef33249c22490494391.zip | |
some server restructure. added hook no attach sound
Diffstat (limited to 'src/game/server/gamemodes')
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index 1188b891..c8e2e931 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -41,7 +41,7 @@ int GAMECONTROLLER_CTF::on_character_death(class CHARACTER *victim, class PLAYER for(int fi = 0; fi < 2; fi++) { FLAG *f = flags[fi]; - if(f && f->carrying_character == &killer->character) + if(f && f->carrying_character == killer->get_character()) had_flag |= 2; if(f && f->carrying_character == victim) { @@ -139,13 +139,13 @@ void GAMECONTROLLER_CTF::tick() for(int c = 0; c < MAX_CLIENTS; c++) { - if(game.players[c].client_id == -1) + if(!game.players[c]) continue; - if(game.players[c].team == fi) - game.create_sound_global(SOUND_CTF_GRAB_EN, game.players[c].client_id); + if(game.players[c]->team == fi) + game.create_sound_global(SOUND_CTF_GRAB_EN, game.players[c]->client_id); else - game.create_sound_global(SOUND_CTF_GRAB_PL, game.players[c].client_id); + game.create_sound_global(SOUND_CTF_GRAB_PL, game.players[c]->client_id); } break; } |