Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #372 from isaisstillalive/patch-1

Browse Source 
Fixed an issue that caused an error when pressing the tab key
This commit is contained in:
tobspr 2020-07-03 09:38:24 +02:00 committed by GitHub
commit 503f9a7fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/game/hud/parts/base_toolbar.js
View File

@ -103,15 +103,25 @@ export class HUDBaseToolbar extends BaseHUDPart {
* Cycles through all buildings * Cycles through all buildings
*/ */
cycleBuildings() { cycleBuildings() {
const visible = this.visibilityCondition();
if (!visible) {
return;
}
let newBuildingFound = false;
let newIndex = this.lastSelectedIndex; let newIndex = this.lastSelectedIndex;
for (let i = 0; i < this.supportedBuildings.length; ++i, ++newIndex) { for (let i = 0; i < this.supportedBuildings.length; ++i, ++newIndex) {
newIndex %= this.supportedBuildings.length; newIndex %= this.supportedBuildings.length;
const metaBuilding = gMetaBuildingRegistry.findByClass(this.supportedBuildings[newIndex]); const metaBuilding = gMetaBuildingRegistry.findByClass(this.supportedBuildings[newIndex]);
const handle = this.buildingHandles[metaBuilding.id]; const handle = this.buildingHandles[metaBuilding.id];
if (!handle.selected && handle.unlocked) { if (!handle.selected && handle.unlocked) {
newBuildingFound = true;
break; break;
} }
} }
if (!newBuildingFound) {
return;
}
const metaBuildingClass = this.supportedBuildings[newIndex]; const metaBuildingClass = this.supportedBuildings[newIndex];
const metaBuilding = gMetaBuildingRegistry.findByClass(metaBuildingClass); const metaBuilding = gMetaBuildingRegistry.findByClass(metaBuildingClass);
this.selectBuildingForPlacement(metaBuilding); this.selectBuildingForPlacement(metaBuilding);