edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

reset flag when it hits a death-tile; ticket #513

Browse source
This commit is contained in:
Dominik Geyer 2008-10-18 20:37:41 +00:00
parent 9d1c56e2fd
commit 3cdb90c10c
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/server/entities/character.cpp
View file

@ -601,6 +601,7 @@ void CHARACTER::tick()
core.input = input;
core.tick(true);
// handle death-tiles
if(col_get((int)pos.x, (int)pos.y)&COLFLAG_DEATH)
die(player->client_id, -1);

7
src/game/server/gamemodes/ctf.cpp
View file

@ -73,6 +73,13 @@ void GAMECONTROLLER_CTF::tick()
if(!f)
continue;
// flag hits death-tile, reset it
if(col_get((int)f->pos.x, (int)f->pos.y)&COLFLAG_DEATH)
{
f->reset();
continue;
}
//
if(f->carrying_character)
{