diff options
| author | scosu <scosu@gmx.de> | 2008-11-01 09:32:17 +0000 |
|---|---|---|
| committer | scosu <scosu@gmx.de> | 2008-11-01 09:32:17 +0000 |
| commit | 8c0dd7f4313ab1d87eed17930d0729d568b21324 (patch) | |
| tree | d47e797dde9abca355680654c78cf749dff69761 /src/game/server/entities | |
| parent | feaab8565d306a7864087d9716fdbcb66f429ec0 (diff) | |
| download | zcatch-8c0dd7f4313ab1d87eed17930d0729d568b21324.tar.gz zcatch-8c0dd7f4313ab1d87eed17930d0729d568b21324.zip | |
a fix for the physical size of tees in changeset:1659
Diffstat (limited to 'src/game/server/entities')
| -rw-r--r-- | src/game/server/entities/character.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 98650f81..3aeabd2d 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -593,11 +593,12 @@ void CHARACTER::tick() core.input = input; core.tick(true); + float phys_size = 28.0f; // handle death-tiles - 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) + if(col_get((int)(pos.x+phys_size/2), (int)(pos.y-phys_size/2))&COLFLAG_DEATH || + col_get((int)(pos.x+phys_size/2), (int)(pos.y+phys_size/2))&COLFLAG_DEATH || + col_get((int)(pos.x-phys_size/2), (int)(pos.y-phys_size/2))&COLFLAG_DEATH || + col_get((int)(pos.x-phys_size/2), (int)(pos.y+phys_size/2))&COLFLAG_DEATH) die(player->client_id, -1); // handle weapons |