diff options
| author | scosu <scosu@gmx.de> | 2008-10-26 08:37:05 +0000 |
|---|---|---|
| committer | scosu <scosu@gmx.de> | 2008-10-26 08:37:05 +0000 |
| commit | 36f4b66569ad35006a187159642977451aa11a13 (patch) | |
| tree | 36deab4ebe0d6c1b487f195bde25f9ccfb1de6b4 /src/game/server/entities | |
| parent | 11aa9f95fc4243ec8c5453863d1483e59a0b5580 (diff) | |
| download | zcatch-36f4b66569ad35006a187159642977451aa11a13.tar.gz zcatch-36f4b66569ad35006a187159642977451aa11a13.zip | |
Changes the collision check for death-tiles so it reacts if any part of the tee is in the area of the tile. Before this change it reacts only if the middle of the tee is in the death tile.
Diffstat (limited to 'src/game/server/entities')
| -rw-r--r-- | src/game/server/entities/character.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 8ad15284..98650f81 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -594,7 +594,10 @@ void CHARACTER::tick() core.tick(true); // handle death-tiles - if(col_get((int)pos.x, (int)pos.y)&COLFLAG_DEATH) + if(col_get((int)pos.x+6, (int)pos.y-6)&COLFLAG_DEATH || + col_get((int)pos.x+6, (int)pos.y+6)&COLFLAG_DEATH || + col_get((int)pos.x-6, (int)pos.y-6)&COLFLAG_DEATH || + col_get((int)pos.x-6, (int)pos.y+6)&COLFLAG_DEATH) die(player->client_id, -1); // handle weapons |