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

end flag music when getting teamkilled

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4416 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2009-05-20 12:23:51 +00:00
parent 3e40971a6b
commit ee1c2c50c5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+11 -3
View File
@@ -786,11 +786,13 @@ COMMAND(suicide, ARG_NONE);
void flagmsg(int flag, int message, int actor, int flagtime)
{
static int musicplaying = -1;
playerent *act = getclient(actor);
if(actor != getclientnum() && !act && message != FM_RESET) return;
bool own = flag == team_int(player1->team);
bool firstperson = actor == getclientnum();
bool teammate = !act ? true : isteam(player1->team, act->team);
bool firstpersondrop = false;
const char *teamstr = m_ktf ? "the" : own ? "your" : "the enemy";
const char *flagteam = m_ktf ? (teammate ? "your teammate " : "your enemy ") : "";
@@ -802,6 +804,7 @@ void flagmsg(int flag, int message, int actor, int flagtime)
{
hudoutf("\f2you got the %sflag", m_ctf ? "enemy " : "");
audiomgr.musicsuggest(M_FLAGGRAB, m_ctf ? 90*1000 : 900*1000, true);
musicplaying = flag;
}
else hudoutf("\f2%s%s got %s flag", flagteam, colorname(act), teamstr);
break;
@@ -813,7 +816,7 @@ void flagmsg(int flag, int message, int actor, int flagtime)
if(firstperson)
{
hudoutf("\f2you %s the flag", droplost);
audiomgr.musicfadeout(M_FLAGGRAB);
firstpersondrop = true;
}
else hudoutf("\f2%s %s %s flag", colorname(act), droplost, teamstr);
break;
@@ -828,7 +831,7 @@ void flagmsg(int flag, int message, int actor, int flagtime)
if(firstperson)
{
hudoutf("\f2you scored");
if(m_ctf) audiomgr.musicfadeout(M_FLAGGRAB);
if(m_ctf) firstpersondrop = true;
}
else hudoutf("\f2%s scored for %s team", colorname(act), teammate ? "your" : "the enemy");
break;
@@ -851,9 +854,14 @@ void flagmsg(int flag, int message, int actor, int flagtime)
case FM_RESET:
audiomgr.playsound(S_FLAGRETURN, SP_HIGHEST);
hudoutf("the server reset the flag");
if(firstperson || own) audiomgr.musicfadeout(M_FLAGGRAB);
firstpersondrop = true;
break;
}
if(firstpersondrop && flag == musicplaying)
{
audiomgr.musicfadeout(M_FLAGGRAB);
musicplaying = -1;
}
}
void dropflag() { tryflagdrop(true); }