Skip to content

Commit

Permalink
Merge PR #51 by @grauerkoala - typo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Cervator committed Jul 26, 2015
2 parents a9e487b + df27126 commit c491d85
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions main/src/com/miloshpetrov/sol2/game/GalaxyFiller.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions main/src/com/miloshpetrov/sol2/game/SolGame.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -318,8 +318,8 @@ public TextureManager getTexMan() {
return myTextureManager;
}

public PlanetMananger getPlanetMan() {
return myPlanetMananger;
public PlanetManager getPlanetMan() {
return myPlanetManager;
}

public PartMan getPartMan() {
Expand Down Expand Up @@ -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++) {
Expand Down
2 changes: 1 addition & 1 deletion main/src/com/miloshpetrov/sol2/game/chunk/ChunkFiller.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import java.util.*;

public class PlanetMananger {
public class PlanetManager {

private final ArrayList<SolSystem> mySystems;
private final ArrayList<Planet> myPlanets;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit c491d85

Please sign in to comment.