Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic

2013-12-18 08:44:18 +01:00 · 2013-12-18 08:44:18 +01:00 · e9c5a49778
parent 347b546566 2daf93987a
commit e9c5a49778
2 changed files with 3 additions and 1 deletions
--- a/Code/Game/GameLogic/Team.h
+++ b/Code/Game/GameLogic/Team.h
@ -4,6 +4,8 @@

 #ifndef TEAM_H
 #define TEAM_H
+#include "Player.h"
+
 namespace GameLogic
 {

--- a/Code/Game/GameLogic/TeamManager.cpp
+++ b/Code/Game/GameLogic/TeamManager.cpp
@ -82,7 +82,7 @@ bool TeamManager::AddPlayerToTeam(Player *player,int teamID)

 bool TeamManager::AddPlayerToTeam(Player *player)
 {
-	
+	return false;
 }

 bool TeamManager::IsValidTeam(int teamID)