Skip to content

Make the remember-unit setting remember the assigned counts #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Giszmo wants to merge 1 commit into from
Closed

Make the remember-unit setting remember the assigned counts #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/GameGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ GameGUI::~GameGUI()
{
for (ParticleSet::iterator it = particles.begin(); it != particles.end(); ++it)
delete *it;
if (globalContainer->settings.rememberUnit)
globalContainer->settings.save();
}

void GameGUI::init()
Expand Down
6 changes: 6 additions & 0 deletions src/GameGUIDefaultAssignManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ int GameGUIDefaultAssignManager::getDefaultAssignedUnits(int typenum)
void GameGUIDefaultAssignManager::setDefaultAssignedUnits(int typenum, int value)
{
unitCount[typenum] = value;
if (!globalContainer->settings.rememberUnit)
return;
// carry the choice over to the next game through the settings
const BuildingType* type = globalContainer->buildingsTypes.get(typenum);
if (type)
globalContainer->settings.defaultUnitsAssigned[type->shortTypeNum][type->level*2 + (type->isBuildingSite ? 0 : 1)] = value;
}


Expand Down
Loading