Commit: 9bd0f047614ce6316e19c516bf54b509e0f1a65a - HotshotIOS (hg)

Commit MetaInfo

• Revisão: 9bd0f047614ce6316e19c516bf54b509e0f1a65a (tree)
• Hora: 2021-05-14 01:41:33
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Mensagem de Log

Got rid of exit game button on mobile.

Mudança Sumário

• modified: android/src/main/.DS_Store
• modified: core/src/headwayent/blackholedarksun/loaders/MenuCompiler.java
• modified: core/src/headwayent/blackholedarksun/menuresource/Menu.java
• modified: core/src/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java

Diff

diff -r d8713c914cfc -r 9bd0f047614c android/src/main/.DS_Store
Binary file android/src/main/.DS_Store has changed

diff -r d8713c914cfc -r 9bd0f047614c core/src/headwayent/blackholedarksun/loaders/MenuCompiler.java
--- a/core/src/headwayent/blackholedarksun/loaders/MenuCompiler.java	Mon May 10 22:13:51 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/loaders/MenuCompiler.java	Thu May 13 19:41:33 2021 +0300
@@ -1,5 +1,6 @@
 package headwayent.blackholedarksun.loaders;
 
+import headwayent.blackholedarksun.MainApp;
 import headwayent.blackholedarksun.menuresource.Menu;
 import headwayent.blackholedarksun.menuresource.MenuSelection;
 import headwayent.hotshotengine.exception.ENG_InvalidFormatParsingException;
@@ -8,6 +9,7 @@
 import headwayent.hotshotengine.scriptcompiler.ENG_CompilerUtil;
 
 import java.io.DataInputStream;
+import java.util.Iterator;
 
 public class MenuCompiler extends ENG_AbstractCompiler<Menu> {
 
@@ -27,6 +29,11 @@
 					" determining the current name and next menu");
 		}*/
         MenuSelection menuSelection = new MenuSelection();
+        if (MainApp.PLATFORM == MainApp.Platform.ANDROID || MainApp.PLATFORM == MainApp.Platform.IOS) {
+            if (s.equalsIgnoreCase("Exit")) {
+                return menuSelection;
+            }
+        }
         menuSelection.name = s.replace("_", " ");
         s = ENG_CompilerUtil.getNextWord(fp0);
         checkNull(s);
@@ -93,6 +100,14 @@
                     break;
                 }
             }
+            // Hack to get rid of the Exit menu issue when on mobile devices.
+            for (Iterator<MenuSelection> iterator = menu.selectionList.iterator(); iterator.hasNext(); ) {
+                MenuSelection menuSelection = iterator.next();
+                if (menuSelection.name == null) {
+                    iterator.remove();
+                }
+            }
+
             return menu;
         } finally {
             ENG_CompilerUtil.close(fp0);

diff -r d8713c914cfc -r 9bd0f047614c core/src/headwayent/blackholedarksun/menuresource/Menu.java
--- a/core/src/headwayent/blackholedarksun/menuresource/Menu.java	Mon May 10 22:13:51 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/menuresource/Menu.java	Thu May 13 19:41:33 2021 +0300
@@ -13,7 +13,7 @@
     public ArrayList<MenuSelection> getValidSelections() {
         ArrayList<MenuSelection> menuSelections = new ArrayList<>();
         for (MenuSelection s : selectionList) {
-            if (!s.goToPreviousMenu) {
+            if (!s.goToPreviousMenu && s.name != null) {
                 menuSelections.add(s);
             }
         }

diff -r d8713c914cfc -r 9bd0f047614c core/src/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java
--- a/core/src/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java	Mon May 10 22:13:51 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java	Thu May 13 19:41:33 2021 +0300
@@ -326,11 +326,14 @@
         gameMenu.setOnClickListener(TUTORIAL_BUTTON, createOnClickListenerWithType(
                 StartActivityOnClickListener.StartActivityOnClickListenerFactory.TYPE, bundle));
 
-        gameMenu.setOnClickListener(EXIT_BUTTON, createOnClickListenerWithType(
-                ExitGameOnClickListener.ExitGameOnClickListenerFactory.TYPE));
+        if (MainApp.PLATFORM == MainApp.Platform.DESKTOP) {
 
-        gameMenu.setOnClickListener(EXIT_TO_MAIN_MENU_BUTTON, createOnClickListenerWithType(
-                ExitToMainMenuOnClickListener.ExitToMainMenuOnClickListenerFactory.TYPE));
+            gameMenu.setOnClickListener(EXIT_BUTTON, createOnClickListenerWithType(
+                    ExitGameOnClickListener.ExitGameOnClickListenerFactory.TYPE));
+
+            gameMenu.setOnClickListener(EXIT_TO_MAIN_MENU_BUTTON, createOnClickListenerWithType(
+                    ExitToMainMenuOnClickListener.ExitToMainMenuOnClickListenerFactory.TYPE));
+        }
 
         bundle = new Bundle();
         bundle.putString("activity", LEVEL_SELECTION);
@@ -366,8 +369,10 @@
                 bundle));
 
 
-        mainMenu.setOnClickListener(EXIT_BUTTON, createOnClickListenerWithType(
-                ExitGameOnClickListener.ExitGameOnClickListenerFactory.TYPE));
+        if (MainApp.PLATFORM == MainApp.Platform.DESKTOP) {
+            mainMenu.setOnClickListener(EXIT_BUTTON, createOnClickListenerWithType(
+                    ExitGameOnClickListener.ExitGameOnClickListenerFactory.TYPE));
+        }
 
         bundle = new Bundle();
         bundle.putString("activity", MULTIPLAYER_LOGIN);