NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GL merge error

This commit is contained in:
Erik Persson 2014-01-15 11:25:59 +01:00
parent 4c1be4d807
commit 208482b0ce
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Code/Game/GameLogic/Game.cpp
View File

@ -55,13 +55,11 @@ void Game::GetAllPlayerPos()
Game::PlayerData Game::CreatePlayer() Game::PlayerData Game::CreatePlayer()
{ {
<<<<<<< HEAD SmartPointer<PlayerData> newPlayer = new PlayerData();
SmartPointer<Player> newPlayer = new Player();
myData->players.Push(newPlayer); myData->players.Push(newPlayer);
=======
return PlayerData(); return newPlayer;
>>>>>>> eb6ed13cceff0ce4380699391759883acf487107
} }
void Game::CreateTeam() void Game::CreateTeam()