native music fade in/out, random seek in ogg streams, action music while carrying CTF flag

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2007 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-17 17:12:53 +00:00
parent 9405b717d0
commit ce141e60a7
6 changed files with 217 additions and 71 deletions
+16 -2
View File
@@ -481,6 +481,11 @@ void timeupdate(int timeremain)
else
{
conoutf("time remaining: %d minutes", timeremain);
if(timeremain==1)
{
musicsuggest(M_LASTMINUTE1 + rnd(2), 70*1000, true);
hudoutf("1 minute left!");
}
}
}
@@ -605,14 +610,22 @@ void flagmsg(int flag, int action)
case SV_FLAGPICKUP:
{
playsound(S_FLAGPICKUP, SP_HIGH);
if(firstperson) conoutf("\f2you got the enemy flag");
if(firstperson)
{
conoutf("\f2you got the enemy flag");
musicsuggest(M_FLAGGRAB, 90*1000);
}
else conoutf("\f2%s got %s flag", colorname(f.actor), teamstr);
break;
}
case SV_FLAGDROP:
{
playsound(S_FLAGDROP, SP_HIGH);
if(firstperson) conoutf("\f2you lost the flag");
if(firstperson)
{
conoutf("\f2you lost the flag");
musicfadeout(M_FLAGGRAB);
}
else conoutf("\f2%s lost %s flag", colorname(f.actor), teamstr);
break;
}
@@ -630,6 +643,7 @@ void flagmsg(int flag, int action)
{
conoutf("\f2you scored");
addmsg(SV_FLAGS, "ri", ++player1->flagscore);
musicfadeout(M_FLAGGRAB);
}
else conoutf("\f2%s scored for %s team", colorname(f.actor), (own ? "the enemy" : "your"));
break;