Skip to content

Fix swapped hilight arrows for warrior/explorer top-bar counters #157

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

Merged
genixpro merged 1 commit into from
Sep 6, 2026
Merged

Fix swapped hilight arrows for warrior/explorer top-bar counters #157

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
24 changes: 13 additions & 11 deletions src/GameGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4030,17 +4030,19 @@ void GameGUI::drawTopScreenBar(void)
globalContainer->gfx->drawString(dec+22, 0, globalContainer->littleFont, FormatableString("%0 / %1").arg(free).arg(tot).c_str());
globalContainer->littleFont->popStyle();

if(i==WORKER && hilights.find(HilightWorkersWorkingFreeStat) != hilights.end())
{
arrowPositions.push_back(HilightArrowPosition(dec+22, 32, 39));
}

else if(i==WARRIOR && hilights.find(HilightExplorersWorkingFreeStat) != hilights.end())
{
arrowPositions.push_back(HilightArrowPosition(dec+22, 32, 39));
}

else if(i==EXPLORER && hilights.find(HilightWarriorsWorkingFreeStat) != hilights.end())
// Tutorial hilight arrow for this counter. The sprite, the free/total
// counter, and the arrow position above all key off the unit-type index
// i (WORKER=0, EXPLORER=1, WARRIOR=2 from UnitConsts.h); the matching
// hilight id must too. This table keeps that pairing in one place so it
// cannot be silently swapped. Indices follow the UnitConsts ordering,
// NOT the Hilight* enum's numeric order (which lists explorer/warrior
// the other way around), so the mapping is spelled out explicitly.
static const int hilightForUnitType[3] = {
HilightWorkersWorkingFreeStat, // i == WORKER
HilightExplorersWorkingFreeStat, // i == EXPLORER
HilightWarriorsWorkingFreeStat, // i == WARRIOR
};
if(hilights.find(hilightForUnitType[i]) != hilights.end())
{
arrowPositions.push_back(HilightArrowPosition(dec+22, 32, 39));
}
Expand Down
Loading