Changeset a10d422 in lost-perception for main

Timestamp:

Jun 4, 2020, 4:15:10 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

master

Children:

57674f3

Parents:

5d846bb

Message:

Create a working makefile target for MapEditor

Location:

main

Files:

• Creature.java (modified) (2 diffs)
• Enemy.java (modified) (1 diff)
• Item.java (modified) (1 diff)
• MapEditor.java (modified) (5 diffs)
• MapObject.java (modified) (2 diffs)

main/Creature.java

@@ -13 +13 @@
 import java.awt.geom.Point2D;
 
-public class Creature extends MapObject
-{
+public class Creature extends MapObject {
     String name;
     private Model model;
@@ -77 +76 @@
         this.dead = false;
         this.id = Creature.lastId;
-        ++Creature.lastId;
+        Creature.lastId++;
     }
     

main/Enemy.java

@@ -8 +8 @@
 import java.awt.Point;
 
-public class Enemy extends Creature
-{
+public class Enemy extends Creature {
     int xpReward;
     Point patrolTarget;

main/Item.java

@@ -9 +9 @@
 import utils.DynamicImage;
 
-public class Item extends MapObject
-{
+public class Item extends MapObject {
     private String name;
     private DynamicImage img;

main/MapEditor.java

@@ -40 +40 @@
 import java.awt.event.KeyListener;
 
-public class MapEditor implements KeyListener, MouseListener
-{
+public class MapEditor implements KeyListener, MouseListener {
     public static final int RES_X = 1024;
     public static final int RES_Y = 768;
@@ -96 +95 @@
     boolean highLevelPlacement;
     Point playerLoc;
-    Point start;
     
     public MapEditor(final GraphicsDevice device) {
         this.started = false;
-        this.start = null;
         try {
             GraphicsConfiguration gc = device.getDefaultConfiguration();
-            gc = device.getDefaultConfiguration();
             (MapEditor.frmMain = new Frame(gc)).setUndecorated(true);
             MapEditor.frmMain.setIgnoreRepaint(true);
@@ -117 +113 @@
             this.mapBuffer = gc.createCompatibleImage(800, 600);
             this.mapG = this.mapBuffer.getGraphics();
-            Utils.init(gc, false);
+            Utils.init(gc, RUNNING_FROM_JAR);
             this.state = State.Main;
             this.auxState = AuxState.None;
@@ -152 +148 @@
                 }
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return;
-        }
-        finally {
+        } finally {
             device.setFullScreenWindow(null);
         }
@@ -1104 +1098 @@
             final GraphicsDevice device = env.getDefaultScreenDevice();
             new MapEditor(device);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }

main/MapObject.java

@@ -5 +5 @@
 import java.awt.Point;
 
-public class MapObject implements Comparable<MapObject>
-{
+public class MapObject implements Comparable<MapObject> {
     public Point loc;
     public int z;
@@ -15 +14 @@
         this.loc = new Point(x, y);
         this.z = z;
-        final Bound bound = null;
-        this.selectionBound = bound;
-        this.bound = bound;
+        this.bound = null;
+        this.selectionBound = null;
     }