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

GameLogic - fixed some minor merging errors

This commit is contained in:
Dennis Andersen 2014-01-20 16:01:54 +01:00
parent 6c3c234be1 567fa229eb
commit ab2a3a3892
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ template<typename T> int InsertObject(DynamicArray<T*>& list, T* obj)
list[i] = obj; list[i] = obj;
return i; return i;
} }
} }
list.Push(obj); list.Push(obj);
return list.Size() - 1; return list.Size() - 1;
} }

4
Code/Game/GameLogic/Game_PlayerData.cpp
View File

@ -20,9 +20,9 @@ void Game::PlayerData::Move(const PLAYER_MOVEMENT &movement)
{ {
this->player->Move(movement); this->player->Move(movement);
} }
void Game::PlayerData::UseWeapon(int playerID, const WEAPON_FIRE &usage) void Game::PlayerData::UseWeapon(const WEAPON_FIRE &usage)
{ {
this->player->UseWeapon(usage);
} }
Oyster::Math::Float3 Game::PlayerData::GetPosition() Oyster::Math::Float3 Game::PlayerData::GetPosition()
{ {