Merge remote branch 'origin/master' into samual/add_eventlog_reporting
authorSamual <samual@xonotic.org>
Sun, 23 Oct 2011 23:59:07 +0000 (19:59 -0400)
committerSamual <samual@xonotic.org>
Sun, 23 Oct 2011 23:59:07 +0000 (19:59 -0400)
1  2 
qcsrc/server/mutators/gamemode_keepaway.qc

@@@ -126,10 -125,9 +126,10 @@@ void ka_TouchEvent() // runs any time t
        other.effects |= autocvar_g_keepaway_ballcarrier_effects;
        
        // messages and sounds
 +      ka_EventLog("pickup", other);
        Send_KillNotification(other.netname, "", "", KA_PICKUPBALL, MSG_KA);
        WriteByte(MSG_BROADCAST, SVC_CENTERPRINT);
-       WriteString(MSG_BROADCAST, strcat("\n\n", other.netname, "^7 has picked up the ball!\n"));
+       WriteString(MSG_BROADCAST, strcat(other.netname, "^7 has picked up the ball!"));
        sound(self.owner, CH_TRIGGER, "keepaway/pickedup.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) 
        
        // scoring
@@@ -169,11 -167,10 +169,11 @@@ void ka_DropEvent(entity plyr) // runs 
        plyr.effects &~= autocvar_g_keepaway_ballcarrier_effects;
  
        // messages and sounds
 +      ka_EventLog("dropped", plyr);
        Send_KillNotification(plyr.netname, "", "", KA_DROPBALL, MSG_KA);
        WriteByte(MSG_BROADCAST, SVC_CENTERPRINT);
-       WriteString(MSG_BROADCAST, strcat("\n\n", plyr.netname, "^7 has dropped the ball!\n"));
-       sound(plyr, CH_TRIGGER, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE);   // ATTN_NONE (it's a sound intended to be heard anywhere) 
+       WriteString(MSG_BROADCAST, strcat(plyr.netname, "^7 has dropped the ball!"));
+       sound(other, CH_TRIGGER, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE);  // ATTN_NONE (it's a sound intended to be heard anywhere) 
        
        // scoring
        // PlayerScore_Add(plyr, SP_KEEPAWAY_DROPS, 1); Not anymore, this is 100% the same as pickups and is useless.