devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

player updating moved to the Map class

Browse Source 
removed unused methods
This commit is contained in:
devZoGok
2023-01-03 09:49:28 +02:00
parent ecc066d7aa
commit dd1643eafa
9 changed files with 39 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
activeGameState.cpp
+3 -4
View File
@@ -46,16 +46,15 @@ namespace battleship{
ActiveGameState::StructureFrame::~StructureFrame(){
}
ActiveGameState::ActiveGameState(GuiAppState *guiState, vector<Player*> players, int playerId) : AbstractAppState(
ActiveGameState::ActiveGameState(GuiAppState *guiState, int playerId) : AbstractAppState(
AppStateType::ACTIVE_STATE,
configData::calcSumBinds(AppStateType::ACTIVE_STATE, true),
configData::calcSumBinds(AppStateType::ACTIVE_STATE, false),
GameManager::getSingleton()->getPath() + "Scripts/options.lua"){
this->guiState = guiState;
this->players = players;
this->playerId = playerId;
mainPlayer = players[playerId];
mainPlayer = Map::getSingleton()->getPlayer(playerId);
initDragbox();
initDepthText();
@@ -134,7 +133,7 @@ namespace battleship{
void ActiveGameState::renderUnits() {
vector<Unit*> units;
for (Player *p : players)
for (Player *p : Map::getSingleton()->getPlayers())
for (Unit *u : p->getUnits())
units.push_back(u);