4 files changed, 70 insertions, 49 deletions

diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg
index 6537437cd..1a2140771 100644
--- a/src/Bindings/AllToLua.pkg
+++ b/src/Bindings/AllToLua.pkg
@@ -75,6 +75,7 @@ $cfile "../Mobs/Monster.h"
 $cfile "../CompositeChat.h"
 $cfile "../Map.h"
 $cfile "../MapManager.h"
+$cfile "../Scoreboard.h"
 
 
 
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index f419ee09c..416bda2ec 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -858,6 +858,8 @@ void cPlayer::KilledBy(cEntity * a_Killer)
 	else if (a_Killer->IsPlayer())
 	{
 		GetWorld()->BroadcastChatDeath(Printf("%s was killed by %s", GetName().c_str(), ((cPlayer *)a_Killer)->GetName().c_str()));
+
+		m_World->GetScoreBoard().AddPlayerScore(((cPlayer *)a_Killer)->GetName(), cObjective::E_TYPE_PLAYER_KILL_COUNT, 1);
 	}
 	else
 	{
@@ -867,24 +869,7 @@ void cPlayer::KilledBy(cEntity * a_Killer)
 		GetWorld()->BroadcastChatDeath(Printf("%s was killed by a %s", GetName().c_str(), KillerClass.c_str()));
 	}
 
-	class cIncrementCounterCB
-		: public cObjectiveCallback
-	{
-		AString m_Name;
-	public:
-		cIncrementCounterCB(const AString & a_Name) : m_Name(a_Name) {}
-
-		virtual bool Item(cObjective * a_Objective) override
-		{
-			a_Objective->AddScore(m_Name, 1);
-			return true;
-		}
-	} IncrementCounter (GetName());
-
-	cScoreboard & Scoreboard = m_World->GetScoreBoard();
-
-	// Update scoreboard objectives
-	Scoreboard.ForEachObjectiveWith(cObjective::E_TYPE_DEATH_COUNT, IncrementCounter);
+	m_World->GetScoreBoard().AddPlayerScore(GetName(), cObjective::E_TYPE_DEATH_COUNT, 1);
 }
 
 
diff --git a/src/Scoreboard.cpp b/src/Scoreboard.cpp
index 61ecac5b7..1c5a22eff 100644
--- a/src/Scoreboard.cpp
+++ b/src/Scoreboard.cpp
@@ -246,6 +246,17 @@ void cTeam::Reset(void)
 
 
 
+void cTeam::SetDisplayName(const AString & a_Name)
+{
+	m_DisplayName = a_Name;
+
+	// TODO 2014-03-01 xdot: Update clients
+}
+
+
+
+
+
 unsigned int cTeam::GetNumPlayers(void) const
 {
 	return m_Players.size();
@@ -306,6 +317,8 @@ bool cScoreboard::RemoveObjective(const AString & a_Name)
 	ASSERT(m_World != NULL);
 	m_World->BroadcastScoreboardObjective(it->second.GetName(), it->second.GetDisplayName(), 1);
 
+	// TODO 2014-03-01 xdot: Remove objective from display slot
+
 	return true;
 }
 
@@ -465,6 +478,23 @@ void cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallb
 
 
 
+void cScoreboard::AddPlayerScore(const AString & a_Name, cObjective::eType a_Type, cObjective::Score a_Value)
+{
+	cCSLock Lock(m_CSObjectives);
+
+	for (cObjectiveMap::iterator it = m_Objectives.begin(); it != m_Objectives.end(); ++it)
+	{
+		if (it->second.GetType() == a_Type)
+		{
+			it->second.AddScore(a_Name, a_Value);
+		}
+	}
+}
+
+
+
+
+
 void cScoreboard::SendTo(cClientHandle & a_Client)
 {
 	cCSLock Lock(m_CSObjectives);
diff --git a/src/Scoreboard.h b/src/Scoreboard.h
index f64ba2bce..f9a8665da 100644
--- a/src/Scoreboard.h
+++ b/src/Scoreboard.h
@@ -67,29 +67,29 @@ public:
 	const AString & GetName(void)        const { return m_Name; }
 	const AString & GetDisplayName(void) const { return m_DisplayName; }
 
-	/// Resets the objective
+	/** Resets the objective */
 	void Reset(void);
 
-	/// Returns the score of the specified player
+	/** Returns the score of the specified player */
 	Score GetScore(const AString & a_Name) const;
 
-	/// Sets the score of the specified player
+	/** Sets the score of the specified player */
 	void SetScore(const AString & a_Name, Score a_Score);
 
-	/// Resets the score of the specified player
+	/** Resets the score of the specified player */
 	void ResetScore(const AString & a_Name);
 
-	/// Adds a_Delta and returns the new score
+	/** Adds a_Delta and returns the new score */
 	Score AddScore(const AString & a_Name, Score a_Delta);
 
-	/// Subtracts a_Delta and returns the new score
+	/** Subtracts a_Delta and returns the new score */
 	Score SubScore(const AString & a_Name, Score a_Delta);
 
 	void SetDisplayName(const AString & a_Name);
 
 	// tolua_end
 
-	/// Send this objective to the specified client
+	/** Send this objective to the specified client */
 	void SendTo(cClientHandle & a_Client);
 
 private:
@@ -109,7 +109,8 @@ private:
 
 	friend class cScoreboardSerializer;
 
-};
+
+}; // tolua_export
 
 
 
@@ -127,21 +128,21 @@ public:
 		const AString & a_Prefix, const AString & a_Suffix
 	);
 
-	/// Adds a new player to the team
+	// tolua_begin
+
+	/** Adds a new player to the team */
 	bool AddPlayer(const AString & a_Name);
 
-	/// Removes a player from the team
+	/** Removes a player from the team */
 	bool RemovePlayer(const AString & a_Name);
 
-	/// Returns whether the specified player is in this team
+	/** Returns whether the specified player is in this team */
 	bool HasPlayer(const AString & a_Name) const;
 
-	/// Removes all registered players
+	/** Removes all registered players */
 	void Reset(void);
 
-	// tolua_begin
-
-	/// Returns the number of registered players
+	/** Returns the number of registered players */
 	unsigned int GetNumPlayers(void) const;
 
 	bool AllowsFriendlyFire(void)      const { return m_AllowsFriendlyFire; }
@@ -180,7 +181,8 @@ private:
 
 	friend class cScoreboardSerializer;
 
-};
+
+}; // tolua_export
 
 
 
@@ -209,44 +211,46 @@ public:
 
 	// tolua_begin
 
-	/// Registers a new scoreboard objective, returns the cObjective instance, NULL on name collision
+	/** Registers a new scoreboard objective, returns the cObjective instance, NULL on name collision */
 	cObjective * RegisterObjective(const AString & a_Name, const AString & a_DisplayName, cObjective::eType a_Type);
 
-	/// Removes a registered objective, returns true if operation was successful
+	/** Removes a registered objective, returns true if operation was successful */
 	bool RemoveObjective(const AString & a_Name);
 
-	/// Retrieves the objective with the specified name, NULL if not found
+	/** Retrieves the objective with the specified name, NULL if not found */
 	cObjective * GetObjective(const AString & a_Name);
 
-	/// Registers a new team, returns the cTeam instance, NULL on name collision
+	/** Registers a new team, returns the cTeam instance, NULL on name collision */
 	cTeam * RegisterTeam(const AString & a_Name, const AString & a_DisplayName, const AString & a_Prefix, const AString & a_Suffix);
 
-	/// Removes a registered team, returns true if operation was successful
+	/** Removes a registered team, returns true if operation was successful */
 	bool RemoveTeam(const AString & a_Name);
 
-	/// Retrieves the team with the specified name, NULL if not found
+	/** Retrieves the team with the specified name, NULL if not found */
 	cTeam * GetTeam(const AString & a_Name);
 
-	cTeam * QueryPlayerTeam(const AString & a_Name); // WARNING: O(n logn)
-
 	void SetDisplay(const AString & a_Objective, eDisplaySlot a_Slot);
 
-	void SetDisplay(cObjective * a_Objective, eDisplaySlot a_Slot);
-
 	cObjective * GetObjectiveIn(eDisplaySlot a_Slot);
 
-	/// Execute callback for each objective with the specified type
-	void ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback& a_Callback);
-
 	unsigned int GetNumObjectives(void) const;
 
 	unsigned int GetNumTeams(void) const;
 
+	void AddPlayerScore(const AString & a_Name, cObjective::eType a_Type, cObjective::Score a_Value = 1);
+
 	// tolua_end
 
-	/// Send this scoreboard to the specified client
+	/** Send this scoreboard to the specified client */
 	void SendTo(cClientHandle & a_Client);
 
+	cTeam * QueryPlayerTeam(const AString & a_Name); // WARNING: O(n logn)
+
+	/** Execute callback for each objective with the specified type */
+	void ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback& a_Callback);
+
+	void SetDisplay(cObjective * a_Objective, eDisplaySlot a_Slot);
+
 
 private:
 
@@ -269,7 +273,8 @@ private:
 
 	friend class cScoreboardSerializer;
 
-} ;
+
+}; // tolua_export