diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-09-26 07:31:14 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-09-26 07:31:14 +0000 |
| commit | d33bdd1dbbf1f7ffe60fd781cde4580b5951da56 (patch) | |
| tree | cdd9fe816216a72a1ca4d8318cf8ef69d1f4fdcb /src/game/server/srv_ctf.cpp | |
| parent | fb87d00c8dfde266a46d5479838f06bce0b375fd (diff) | |
| download | zcatch-d33bdd1dbbf1f7ffe60fd781cde4580b5951da56.tar.gz zcatch-d33bdd1dbbf1f7ffe60fd781cde4580b5951da56.zip | |
cleaned up ctf a bit
Diffstat (limited to 'src/game/server/srv_ctf.cpp')
| -rw-r--r-- | src/game/server/srv_ctf.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/game/server/srv_ctf.cpp b/src/game/server/srv_ctf.cpp index 8f345436..7a13b877 100644 --- a/src/game/server/srv_ctf.cpp +++ b/src/game/server/srv_ctf.cpp @@ -27,8 +27,9 @@ void gameobject_ctf::on_player_spawn(class player *p) { } -void gameobject_ctf::on_player_death(class player *victim, class player *killer, int weapon) +void gameobject_ctf::on_player_death(class player *victim, class player *killer, int weaponid) { + gameobject::on_player_death(victim, killer, weaponid); // drop flags for(int fi = 0; fi < 2; fi++) { @@ -73,7 +74,8 @@ void gameobject_ctf::tick() if(players[i]->team == f->team) { // return the flag - f->reset(); + if(!f->at_stand) + f->reset(); } else { @@ -117,19 +119,6 @@ void flag::reset() spawntick = -1; } -void flag::tick() -{ -} - -bool flag::is_grounded() -{ - if(col_check_point((int)(pos.x+phys_size/2), (int)(pos.y+phys_size/2+5))) - return true; - if(col_check_point((int)(pos.x-phys_size/2), (int)(pos.y+phys_size/2+5))) - return true; - return false; -} - void flag::snap(int snapping_client) { if(spawntick != -1) |