Merge pull request #119 from booksaw/GoldShopFix

Fix Gold Shop
booksaw · May 3, 2022 · 381ad7c · 381ad7c
2 parents 6d965cc + 09c3761
commit 381ad7c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/src/main/java/com/mygdx/pirategame/save/GameScreen.java b/core/src/main/java/com/mygdx/pirategame/save/GameScreen.java
@@ -916,10 +916,9 @@ public void openShop() {
      * Closes gold shop
      */
     public void closeShop() {
-        goldShop = new GoldShop(GameScreen.game, camera, this);
-        goldShop.show();
         goldShop.hide();
-        goldShop = null;
+        table.setVisible(true);
+        pauseTable.setVisible(false);
         resume();
     }
 

diff --git a/core/src/main/java/com/mygdx/pirategame/screen/GoldShop.java b/core/src/main/java/com/mygdx/pirategame/screen/GoldShop.java
@@ -1,6 +1,7 @@
 package com.mygdx.pirategame.screen;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.InputProcessor;
 import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.graphics.OrthographicCamera;
@@ -73,6 +74,8 @@ public GoldShop(PirateGame pirateGame, OrthographicCamera camera, GameScreen gam
 
     }
 
+    private InputProcessor processor;
+
     /**
      * Called when this screen becomes the current screen
      */
@@ -85,6 +88,7 @@ public void show() {
         Skin skin = new Skin(Gdx.files.internal("skin/uiskin.json"));
 
         //Set the input processor
+        processor = Gdx.input.getInputProcessor();
         Gdx.input.setInputProcessor(stage);
         // Create a table that fills the screen
         Table table = new Table();
@@ -310,6 +314,7 @@ public void hide() {
         healthBoostBtn.setDisabled(true);
         increaseCannonDamageBtn.setDisabled(true);
         closeButton.setDisabled(true);
+        Gdx.input.setInputProcessor(processor);
     }
 
     /**