Changeset c3b2f42 in lost-perception

Timestamp:

Nov 2, 2018, 3:02:21 AM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

master

Children:

0b84f13

Parents:

1c27783

Message:

Make the loading screen show correctly on OSX, remove some .class files that were accidentally committed, and change the name of the jar file generated by make from LostHavenRPG.jar to LostPerception.jar.

Files:

• .gitignore (modified) (1 diff)
• astar/AStarMap.class (deleted)
• astar/AStarNode.class (deleted)
• astar/AStarSearch.class (deleted)
• astar/BinaryHeap.class (deleted)
• astar/QuadTree.class (deleted)
• collision/Bound.class (deleted)
• main/LostHavenRPG.java (modified) (3 diffs)
• makefile (modified) (1 diff)
• utils/DynamicImage.class (deleted)
• utils/Utils$1.class (deleted)
• utils/Utils.class (deleted)
• utils/Utils.java (modified) (1 diff)
• utils/WrappedString.class (deleted)

.gitignore

@@ -2 +2 @@
 *.class
 err.txt
-LostHavenRPG.jar
+LostPerception.jar

main/LostHavenRPG.java

@@ -237 +237 @@
         this.g = bufferStrategy.getDrawGraphics();
         this.gcsLogo.draw(this.g, 0, 0);
-        this.g.setColor(Color.green);
+        this.g.setColor(Color.black);
+        this.g.setFont(this.guiFont12);
         this.g.drawString("Loading...", 368, 31);
         this.g.dispose();
@@ -244 +245 @@
     
     private void loadGUI(final BufferStrategy bufferStrategy) {
-        this.font14 = new Font("Arial", 0, 14);
         this.gcsLogo = new DynamicImage("gui/gcslogo.png");
-        this.g.setFont(this.font14);
+        this.guiFont12 = new Font("Garamond", 1, 12);
+        this.m = this.g.getFontMetrics(this.guiFont12);
         this.updateLoadingScreen(bufferStrategy);
+
         this.font11 = new Font("Arial", 0, 11);
         this.font12 = new Font("Arial", 0, 12);
+        this.font14 = new Font("Arial", 0, 14);
         this.font24 = new Font("Arial", 0, 24);
         this.fontTT = new Font("Courier New", 0, 11);
-        this.guiFont12 = new Font("Garamond", 1, 12);
         this.guiFont14 = new Font("Garamond", 1, 14);
-        this.m = this.g.getFontMetrics(this.guiFont12);
         try {
             final Font fontCustom = Utils.loadFont("images/gui/Last_words.ttf");
@@ -262 +263 @@
             this.fontCustom24 = fontCustom.deriveFont(0, 24.0f);
             this.fontCustom30 = fontCustom.deriveFont(0, 30.0f);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }

makefile

@@ -19 +19 @@
 FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
 
-LostHavenRPG: $(CLASS_DEPS) $(FILE_DEPS)
-        jar cfe $@.jar main.$@ $^ $(INNER_DEPS)
+LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
+        jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)

utils/Utils.java

@@ -33 +33 @@
 import java.awt.GraphicsConfiguration;
 
-public class Utils
-{
+public class Utils {
     private static boolean RUNNING_FROM_JAR;
     private static Utils classLoaderReference;