Merge PR #51 by @grauerkoala - typo fix

Author: Cervator

main/src/com/miloshpetrov/sol2/game/GalaxyFiller.java

@@ -122,9 +122,9 @@ public void fill(SolGame game) {
   }
 
   private void createStarPorts(SolGame game) {
-    PlanetMananger planetMananger = game.getPlanetMan();
+    PlanetManager planetManager = game.getPlanetMan();
     ArrayList<Planet> biggest = new ArrayList<Planet>();
-    for (SolSystem s : planetMananger.getSystems()) {
+    for (SolSystem s : planetManager.getSystems()) {
       float minH = 0;
       Planet biggestP = null;
       int bi = -1;

main/src/com/miloshpetrov/sol2/game/SolGame.java

@@ -36,7 +36,7 @@ public class SolGame {
   private final ObjectManager myObjectManager;
   private final SolApplication myCmp;
   private final DraMan myDraMan;
-  private final PlanetMananger myPlanetMananger;
+  private final PlanetManager myPlanetManager;
   private final TextureManager myTextureManager;
   private final ChunkManager myChunkManager;
   private final PartMan myPartMan;
@@ -95,7 +95,7 @@ public SolGame(SolApplication cmp, boolean usePrevShip, TextureManager textureMa
     myAbilityCommonConfigs = new AbilityCommonConfigs(myEffectTypes, myTextureManager, gameColors, mySoundManager);
     hullConfigManager = new HullConfigManager(myShipBuilder, FileManager.getInstance(), textureManager, myItemManager, myAbilityCommonConfigs, mySoundManager);
     myNames = new SolNames();
-    myPlanetMananger = new PlanetMananger(myTextureManager, hullConfigManager, gameColors, myItemManager);
+    myPlanetManager = new PlanetManager(myTextureManager, hullConfigManager, gameColors, myItemManager);
     SolContactListener contactListener = new SolContactListener(this);
     myFractionMan = new FractionMan(myTextureManager);
     myObjectManager = new ObjectManager(contactListener, myFractionMan);
@@ -117,7 +117,7 @@ public SolGame(SolApplication cmp, boolean usePrevShip, TextureManager textureMa
     myTimeFactor = 1;
 
     // from this point we're ready!
-    myPlanetMananger.fill(myNames);
+    myPlanetManager.fill(myNames);
     myGalaxyFiller.fill(this);
     ShipConfig startingShip = usePrevShip ? SaveManager.readShip(hullConfigManager, myItemManager) : null;
     createPlayer(startingShip);
@@ -237,7 +237,7 @@ public void update() {
     myTimeStep = Const.REAL_TIME_STEP * myTimeFactor;
     myTime += myTimeStep;
 
-    myPlanetMananger.update(this);
+    myPlanetManager.update(this);
     myCam.update(this);
     myChunkManager.update(this);
     myMountDetectDrawer.update(this);
@@ -279,7 +279,7 @@ public void draw() {
 
   public void drawDebug(GameDrawer drawer) {
     if (DebugOptions.GRID_SZ > 0) myGridDrawer.draw(drawer, this, DebugOptions.GRID_SZ, drawer.debugWhiteTex);
-    myPlanetMananger.drawDebug(drawer, this);
+    myPlanetManager.drawDebug(drawer, this);
     myObjectManager.drawDebug(drawer, this);
     if (DebugOptions.ZOOM_OVERRIDE != 0) myCam.drawDebug(drawer);
     drawDebugPoint(drawer, DebugOptions.DEBUG_POINT, DebugCol.POINT);
@@ -318,8 +318,8 @@ public TextureManager getTexMan() {
     return myTextureManager;
   }
 
-  public PlanetMananger getPlanetMan() {
-    return myPlanetMananger;
+  public PlanetManager getPlanetMan() {
+    return myPlanetManager;
   }
 
   public PartMan getPartMan() {
@@ -376,12 +376,12 @@ public FractionMan getFractionMan() {
   }
 
   public boolean isPlaceEmpty(Vector2 pos, boolean considerPlanets) {
-    Planet np = myPlanetMananger.getNearestPlanet(pos);
+    Planet np = myPlanetManager.getNearestPlanet(pos);
     if (considerPlanets) {
       boolean inPlanet = np.getPos().dst(pos) < np.getFullHeight();
       if (inPlanet) return false;
     }
-    SolSystem ns = myPlanetMananger.getNearestSystem(pos);
+    SolSystem ns = myPlanetManager.getNearestSystem(pos);
     if (ns.getPos().dst(pos) < SunSingleton.SUN_HOT_RAD) return false;
     List<SolObject> objs = myObjectManager.getObjs();
     for (int i = 0, objsSize = objs.size(); i < objsSize; i++) {

main/src/com/miloshpetrov/sol2/game/chunk/ChunkFiller.java

@@ -69,7 +69,7 @@ public void fill(SolGame game, Vector2 chunk, RemoveController remover, boolean
   private SpaceEnvConfig getConfig(SolGame game, Vector2 chCenter, float[] densityMul,
     RemoveController remover, boolean farBg)
   {
-    PlanetMananger pm = game.getPlanetMan();
+    PlanetManager pm = game.getPlanetMan();
     SolSystem sys = pm.getNearestSystem(chCenter);
     float toSys = sys.getPos().dst(chCenter);
     if (toSys < sys.getRadius()) {

…rov/sol2/game/planet/PlanetMananger.java …trov/sol2/game/planet/PlanetManager.javamain/src/com/miloshpetrov/sol2/game/planet/PlanetMananger.java renamed to main/src/com/miloshpetrov/sol2/game/planet/PlanetManager.java main/src/com/miloshpetrov/sol2/game/planet/PlanetMananger.java renamed to main/src/com/miloshpetrov/sol2/game/planet/PlanetManager.java

@@ -17,7 +17,7 @@
 
 import java.util.*;
 
-public class PlanetMananger {
+public class PlanetManager {
 
   private final ArrayList<SolSystem> mySystems;
   private final ArrayList<Planet> myPlanets;
@@ -31,7 +31,7 @@ public class PlanetMananger {
   private final PlanetCoreSingleton myPlanetCore;
   private Planet myNearestPlanet;
 
-  public PlanetMananger(TextureManager textureManager, HullConfigManager hullConfigs, GameColors cols, ItemManager itemManager) {
+  public PlanetManager(TextureManager textureManager, HullConfigManager hullConfigs, GameColors cols, ItemManager itemManager) {
     myPlanetConfigs = new PlanetConfigs(textureManager, hullConfigs, cols, itemManager);
     mySysConfigs = new SysConfigs(textureManager, hullConfigs, itemManager);
     myMazeConfigs = new MazeConfigs(textureManager, hullConfigs, itemManager);

main/src/com/miloshpetrov/sol2/game/screens/BorderDrawer.java

@@ -123,7 +123,7 @@ private void maybeDrawIcon(UiDrawer drawer, Vector2 pos, SolCam cam, float objSi
   }
 
   private void drawTishches(UiDrawer drawer, SolGame g, SolCam cam, Vector2 camPos) {
-    PlanetMananger pMan = g.getPlanetMan();
+    PlanetManager pMan = g.getPlanetMan();
     Planet np = pMan.getNearestPlanet();
     if (np != null && np.getPos().dst(camPos) < np.getFullHeight()) return;
     for (int i = 0, myTishchesSize = myTishches.size(); i < myTishchesSize; i++) {

main/src/com/miloshpetrov/sol2/game/screens/ZoneNameAnnouncer.java

@@ -15,7 +15,7 @@ public class ZoneNameAnnouncer {
   private String myText;
 
   public void update(SolGame game) {
-    PlanetMananger pm = game.getPlanetMan();
+    PlanetManager pm = game.getPlanetMan();
     String zone = null;
     String pref = null;
     Vector2 camPos = game.getCam().getPos();