Make CycleBuildings select last used item when empty

4 years ago · 6a5d1a0890
parent eb87550b36
commit 6a5d1a0890
1 changed files with 2 additions and 2 deletions
--- a/src/js/game/hud/parts/buildings_toolbar.js
+++ b/src/js/game/hud/parts/buildings_toolbar.js
@ -110,8 +110,8 @@ export class HUDBuildingsToolbar extends BaseHUDPart {

    cycleBuildings() {
        let newIndex = this.lastSelectedIndex;
-        for (let i = 0; i < toolbarBuildings.length; ++i) {
-            newIndex = (newIndex + 1) % toolbarBuildings.length;
+        for (let i = 0; i < toolbarBuildings.length; ++i, ++newIndex) {
+            newIndex %= toolbarBuildings.length;
            const metaBuilding = gMetaBuildingRegistry.findByClass(toolbarBuildings[newIndex]);
            const handle = this.buildingHandles[metaBuilding.id];
            if (!handle.selected && handle.unlocked) {