From 2bb0b7f118d5cfe3960daebb4ed1f776550bacd9 Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 31 May 2008 10:18:41 +0000 Subject: [PATCH] support for CSL protocol #103 git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2132 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/server.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/src/server.cpp b/source/src/server.cpp index ceb971be..b23cf457 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1064,13 +1064,15 @@ void serverdamage(client *target, client *actor, int damage, int gun, bool gib, if(ts.health<=0) { target->state.deaths++; - if(actor->clientnum != target->clientnum) + if(target!=actor) { if (!isteam(target->team, actor->team)) actor->state.frags += gib ? 2 : 1; - else { actor->state.frags--; actor->state.teamkills++; } + else + { + actor->state.frags--; + actor->state.teamkills++; + } } - - if(target!=actor && !isteam(target->team, actor->team)) actor->state.frags += gib ? 2 : 1; else actor->state.frags--; sendf(-1, 1, "ri4", gib ? SV_GIBDIED : SV_DIED, target->clientnum, actor->clientnum, actor->state.frags); target->position.setsizenodelete(0);