提交: 99faecd523e9d478d302b7128a36a0cb797e4f4d - HotshotIOS (hg)

Commit MetaInfo

• 修訂: 99faecd523e9d478d302b7128a36a0cb797e4f4d (tree)
• 時間: 2024-01-23 22:35:29
• 作者: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

ShipData change to use APP_Game nameShipMap.

Change Summary

• modified: core/src/headwayent/blackholedarksun/APP_Game.java
• modified: core/src/headwayent/blackholedarksun/entitydata/ShipData.java

差異

diff -r 6a19dc9f1c85 -r 99faecd523e9 core/src/headwayent/blackholedarksun/APP_Game.java
--- a/core/src/headwayent/blackholedarksun/APP_Game.java	Mon Jan 22 21:15:37 2024 +0100
+++ b/core/src/headwayent/blackholedarksun/APP_Game.java	Tue Jan 23 14:35:29 2024 +0100
@@ -36,6 +36,7 @@
 import headwayent.blackholedarksun.animations.PortalEnteringWithoutRenderingAnimation;
 import headwayent.blackholedarksun.animations.PortalExitingWithoutRenderingAnimation;
 import headwayent.blackholedarksun.entitydata.AsteroidData;
+import headwayent.blackholedarksun.entitydata.ShipData;
 import headwayent.blackholedarksun.entitydata.WeaponData;
 import headwayent.blackholedarksun.exception.GameDataException;
 import headwayent.blackholedarksun.gamestatedebugger.Frame;
@@ -189,6 +190,10 @@
         asteroidDataMap = AsteroidData.createAsteroidMappings();
     }
 
+    public TreeMap<String, ShipData> getNameShipMap() {
+        return nameShipMap;
+    }
+
     public enum GameMode {
         SP, MP
     }
@@ -863,13 +868,13 @@
                     e.printStackTrace();
                 }
                 if (b != null) {
-                    int index = (int) b[0];
-                    int soundsOn = (int) b[1];
-                    int accelOn = (int) b[2];
-                    int orientationIndex = (int) b[3];
-                    int invertYAxis = (int) b[4];
-                    int thirdPersonCam = (int) b[5];
-                    int vibrate = (int) b[6];
+                    int index = b[0];
+                    int soundsOn = b[1];
+                    int accelOn = b[2];
+                    int orientationIndex = b[3];
+                    int invertYAxis = b[4];
+                    int thirdPersonCam = b[5];
+                    int vibrate = b[6];
                     // this.setShipOptionsIndex(index);
                     // this.setOrientationIndex(orientationIndex);
                     setSoundsEnabled(soundsOn == 1);

diff -r 6a19dc9f1c85 -r 99faecd523e9 core/src/headwayent/blackholedarksun/entitydata/ShipData.java
--- a/core/src/headwayent/blackholedarksun/entitydata/ShipData.java	Mon Jan 22 21:15:37 2024 +0100
+++ b/core/src/headwayent/blackholedarksun/entitydata/ShipData.java	Tue Jan 23 14:35:29 2024 +0100
@@ -227,14 +227,14 @@
     public static final int TYPE_ANY =
             TYPE_CARGO | TYPE_FIGHTER | TYPE_RELOADER;
 
-    private static final TreeMap<String, ShipData> filenameShipMap =
-            new TreeMap<>();
-    private static TreeMap<String, ShipData> nameShipMap =
-            new TreeMap<>();
+//    private static final TreeMap<String, ShipData> filenameShipMap =
+//            new TreeMap<>();
+//    private static TreeMap<String, ShipData> nameShipMap =
+//            new TreeMap<>();
 
     public static ArrayList<ShipData> getShipData(int team, int type) {
         ArrayList<ShipData> list = new ArrayList<>();
-        for (ShipData data : filenameShipMap.values()) {
+        for (ShipData data : MainApp.getGame().getNameShipMap().values()) {
             boolean teamFound = false;
             boolean typeFound = false;
             if ((team & TEAM_ALIEN) != 0 && data.team == ShipTeam.ALIEN) {
@@ -519,7 +519,7 @@
 //		map.nameShipMap.put(ship.name, ship);
 
 //        filenameShipMap = map.filenameShipMap;
-        nameShipMap = map.nameShipMap;
+//        nameShipMap = map.nameShipMap;
 
         return map;
     }