From 8c0dd7f4313ab1d87eed17930d0729d568b21324 Mon Sep 17 00:00:00 2001 From: scosu Date: Sat, 1 Nov 2008 09:32:17 +0000 Subject: a fix for the physical size of tees in changeset:1659 --- src/game/server/entities/character.cpp | 9 +++++---- 1 file 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 -- cgit 1.4.1