diff options
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/entities/character.cpp | 8 | ||||
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 7 | ||||
| -rw-r--r-- | src/game/server/hooks.cpp | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 3bbe8670..8ba91a80 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -546,10 +546,10 @@ void CHARACTER::tick() float phys_size = 28.0f; // handle death-tiles - 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) + if(col_get((int)(pos.x+phys_size/3), (int)(pos.y-phys_size/3))&COLFLAG_DEATH || + col_get((int)(pos.x+phys_size/3), (int)(pos.y+phys_size/3))&COLFLAG_DEATH || + col_get((int)(pos.x-phys_size/3), (int)(pos.y-phys_size/3))&COLFLAG_DEATH || + col_get((int)(pos.x-phys_size/3), (int)(pos.y+phys_size/3))&COLFLAG_DEATH) { die(player->client_id, WEAPON_WORLD); } diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index f1c7c236..b2146b51 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -216,11 +216,8 @@ void FLAG::reset() void FLAG::snap(int snapping_client) { NETOBJ_FLAG *flag = (NETOBJ_FLAG *)snap_new_item(NETOBJTYPE_FLAG, team, sizeof(NETOBJ_FLAG)); - if(!networkclipped(snapping_client, pos)) - { - flag->x = (int)pos.x; - flag->y = (int)pos.y; - } + flag->x = (int)pos.x; + flag->y = (int)pos.y; flag->team = team; flag->carried_by = -1; diff --git a/src/game/server/hooks.cpp b/src/game/server/hooks.cpp index 18626b4e..1ae38ce2 100644 --- a/src/game/server/hooks.cpp +++ b/src/game/server/hooks.cpp @@ -257,7 +257,7 @@ void mods_message(int msgtype, int client_id) return; } - str_format(chatmsg, sizeof(chatmsg), "Vote called to kick '%s'", server_clientname(kick_id)); + str_format(chatmsg, sizeof(chatmsg), "%s called for vote to kick '%s'", server_clientname(client_id), server_clientname(kick_id)); str_format(desc, sizeof(desc), "Kick '%s'", server_clientname(kick_id)); str_format(cmd, sizeof(cmd), "kick %d", kick_id); if (!config.sv_vote_kick_bantime) |