diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-23 14:10:05 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-23 14:10:05 +0000 |
| commit | 815c55c4ce58995dcc34627bcbed956d1a1bc4dd (patch) | |
| tree | ae33fb8915f06865369208c5402122555b90d905 /src/game/server/entities | |
| parent | 8f9e2031dcd562e72ac7e5ec9c00b8aed10b53a6 (diff) | |
| download | zcatch-815c55c4ce58995dcc34627bcbed956d1a1bc4dd.tar.gz zcatch-815c55c4ce58995dcc34627bcbed956d1a1bc4dd.zip | |
added death tile
Diffstat (limited to 'src/game/server/entities')
| -rw-r--r-- | src/game/server/entities/character.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 98bfa862..05820102 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -2,6 +2,7 @@ #include <engine/e_server_interface.h> #include <engine/e_config.h> #include <game/server/gamecontext.hpp> +#include <game/mapitems.hpp> #include "character.hpp" #include "laser.hpp" @@ -588,6 +589,9 @@ void CHARACTER::tick() //core.jumped = jumped; core.input = input; core.tick(true); + + if(col_get(pos.x, pos.y)&COLFLAG_DEATH) + die(player->client_id, -1); // handle weapons handle_weapons(); |