From 36f4b66569ad35006a187159642977451aa11a13 Mon Sep 17 00:00:00 2001 From: scosu Date: Sun, 26 Oct 2008 08:37:05 +0000 Subject: [PATCH] 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. --- src/game/server/entities/character.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 8ad152843..98650f817 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