From: Samual <samual@xonotic.org>
Date: Sun, 23 Oct 2011 23:59:07 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/add_eventlog_reporting
X-Git-Tag: xonotic-v0.6.0~40^2~19^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fd2b1a8ba60990ceca63c494e1fc6094c3b7f6b2

Merge remote branch 'origin/master' into samual/add_eventlog_reporting
---

fd2b1a8ba60990ceca63c494e1fc6094c3b7f6b2
diff --cc qcsrc/server/mutators/gamemode_keepaway.qc
index 35d6e0e976,8d3511eced..9134353e01
--- a/qcsrc/server/mutators/gamemode_keepaway.qc
+++ b/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.