GameLogic - fixed some minor merging errors

Code/Game/GameLogic/Game.cpp

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

Code/Game/GameLogic/Game_PlayerData.cpp

@@ -20,9 +20,9 @@ void Game::PlayerData::Move(const PLAYER_MOVEMENT &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()
 {