kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

htf, ktf bugfixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2488 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2008-09-06 12:16:04 +00:00
parent ed5b32bf6b
commit 9a4bd5dd63
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clients2c.cpp
+1
View File
@@ -564,6 +564,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
flaginbase(flag, action, actor);
break;
case CTFF_IDLE:
flaginbase(flag, action, actor);
f.flagent->spawned = false;
f.ack = true;
break;
source/src/server.cpp
+9 -5
View File
@@ -919,8 +919,8 @@ void flagaction(int flag, int action, int sender)
{
f.state = CTFF_IDLE;
of.state = CTFF_INBASE;
sendflaginfo(team_opposite(flag), SV_FLAGRETURN);
action = 0;
sendflaginfo(team_opposite(flag), 0);
action = SV_FLAGRETURN;
}
f.lastupdate = gamemillis;
@@ -1246,11 +1246,10 @@ void serverdamage(client *target, client *actor, int damage, int gun, bool gib,
else
{ // suicide
actor->state.frags--;
flagtk = true;
suic = true;
}
sendf(-1, 1, "ri4", gib ? SV_GIBDIED : SV_DIED, target->clientnum, actor->clientnum, actor->state.frags);
if(flagtk && (m_htf || m_ktf) && targethasflag >= 0)
if((suic || flagtk) && (m_htf || m_ktf) && targethasflag >= 0)
{
actor->state.flagscore--;
sendf(-1, 1, "riii", SV_FLAGS, actor->clientnum, actor->state.flagscore);
@@ -1261,7 +1260,12 @@ void serverdamage(client *target, client *actor, int damage, int gun, bool gib,
logger->writeline(log::info, "[%s] %s %s %s", actor->hostname, actor->name, gib ? "gibbed" : "fragged", target->name);
if(m_flags && targethasflag >= 0)
{
flagaction(targethasflag, suic ? SV_FLAGLOST : SV_FLAGRESET, -1);
if(m_ctf)
flagaction(targethasflag, flagtk ? SV_FLAGRESET : SV_FLAGLOST, -1);
else if(m_htf)
flagaction(targethasflag, SV_FLAGLOST, -1);
else // ktf
flagaction(targethasflag, SV_FLAGRESET, -1);
}
// don't issue respawn yet until DEATHMILLIS has elapsed
// ts.respawn();