"Show enemy productivity overlay" cheat #1738
Conversation
| @@ -107,18 +111,31 @@ BOOST_FIXTURE_TEST_CASE(CanToggleAllVisible_IfCheatModeIsOn, CheatsFixture) | |||
| BOOST_TEST_REQUIRE((viewer.GetVisibility(farawayPos) == Visibility::Visible) == true); | |||
| } | |||
|
|
|||
| BOOST_FIXTURE_TEST_CASE(CanToggleAllBuildingsEnabled_IfCheatModeIsOn, CheatsFixture) | |||
| BOOST_FIXTURE_TEST_CASE(CanToggleAllBuildingsEnabled_AndShowEnemyProductivityOverlay_IfCheatModeIsOn, CheatsFixture) | |||
There was a problem hiding this comment.
Given the increasing length in name and that the first 6 lines seem to test the opposite I'd suggest to name this something like Can change cheats (only) if cheat mode is enabled. Instead of "only if" you can use "iff" which is shorter and more clear even if someone doesn't know the difference between "if" and "iff" (i.e. "if and only if").
| { | ||
| BOOST_TEST_REQUIRE(cheats.areAllBuildingsEnabled() == false); | ||
| BOOST_TEST_REQUIRE(cheats.shouldShowEnemyProductivityOverlay() == false); | ||
|
|
||
| cheats.toggleAllBuildingsEnabled(); |
There was a problem hiding this comment.
The test should be exactly after the call to make sure that e.g. toggleShowEnemyProductivityOverlay doesn't change buildingsEnabled. Or at least for the enabling and subsequent disabling below. At least in one place. I.e.:
- Cheat mode off. Toggle all. Check all disabled
- Cheat mode on. Toggle all. Check all enabled
- Toggle each individually of, check only that changed until all are off
- Optional: Do the same with enabling all one-by-one or use that instead of the 2nd point which is likely better/shorter
| @@ -370,7 +372,10 @@ void GameWorldView::DrawNameProductivityOverlay(const TerrainRenderer& terrainRe | |||
| auto* attackAidImage = LOADER.GetImageN("map_new", 20000); | |||
| attackAidImage->DrawFull(curPos - DrawPoint(0, attackAidImage->getHeight())); | |||
| } | |||
| continue; | |||
| // Do not draw enemy productivity overlay unless the object is visible AND the related cheat is on | |||
| if(!(gwv.GetVisibility(pt) == Visibility::Visible | |||
There was a problem hiding this comment.
I'd rather put that at the top of both to make it clearer:
if != Visible -> continue
if addon -> draw military aid
// Skip drawing the name and productivity below if not enabled (or similar comment)
if !prod Overlay enabled -> continue
Although the first check isn't exactly there it is there implicitly as you cannot attack when you don't see the building. So !visible implies numSoldiers=0
This avoids the if(!(conditions)) which is (slightly) more complex.
And while touching this code: Can you move the checks for the addon and cheat, and loading the image out of the loop please? This is a hot loop that is run very often (in times and iterations) so we can move those constants, that might not be obvious constants to the compiler, to a single place as const variables.
Speaking of those: The visibility check has a few constant conditions Maybe we split that into 2 functions IsAllVisible and CalcVisibility (both called from the current function) but move a call to the first out of the loop to a constant and use the 2nd here as if (!isAllVisible && !gwv.CalcVisibility(pt)) Although I don't expect that there are too many enemy buildings in the current view that there is a huge impact. So impact is low.
But moving the 2 "constants" used here out of the loop is trivial enough to be worth it without measuring.
And possibly also the 2 lines at the top for coordinate transform below the no check directly on top of curPos = .
This isn't exactly part of the PR topic but I like to do such small cleanups when touching code ("Boy Scout Rule")
No description provided.