Changeset c3b2f42 in lost-perception


Ignore:
Timestamp:
Nov 2, 2018, 3:02:21 AM (4 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:
10 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r1c27783 rc3b2f42  
    22*.class
    33err.txt
    4 LostHavenRPG.jar
     4LostPerception.jar
  • main/LostHavenRPG.java

    r1c27783 rc3b2f42  
    237237        this.g = bufferStrategy.getDrawGraphics();
    238238        this.gcsLogo.draw(this.g, 0, 0);
    239         this.g.setColor(Color.green);
     239        this.g.setColor(Color.black);
     240        this.g.setFont(this.guiFont12);
    240241        this.g.drawString("Loading...", 368, 31);
    241242        this.g.dispose();
     
    244245   
    245246    private void loadGUI(final BufferStrategy bufferStrategy) {
    246         this.font14 = new Font("Arial", 0, 14);
    247247        this.gcsLogo = new DynamicImage("gui/gcslogo.png");
    248         this.g.setFont(this.font14);
     248        this.guiFont12 = new Font("Garamond", 1, 12);
     249        this.m = this.g.getFontMetrics(this.guiFont12);
    249250        this.updateLoadingScreen(bufferStrategy);
     251
    250252        this.font11 = new Font("Arial", 0, 11);
    251253        this.font12 = new Font("Arial", 0, 12);
     254        this.font14 = new Font("Arial", 0, 14);
    252255        this.font24 = new Font("Arial", 0, 24);
    253256        this.fontTT = new Font("Courier New", 0, 11);
    254         this.guiFont12 = new Font("Garamond", 1, 12);
    255257        this.guiFont14 = new Font("Garamond", 1, 14);
    256         this.m = this.g.getFontMetrics(this.guiFont12);
    257258        try {
    258259            final Font fontCustom = Utils.loadFont("images/gui/Last_words.ttf");
     
    262263            this.fontCustom24 = fontCustom.deriveFont(0, 24.0f);
    263264            this.fontCustom30 = fontCustom.deriveFont(0, 30.0f);
    264         }
    265         catch (Exception e) {
     265        } catch (Exception e) {
    266266            e.printStackTrace();
    267267        }
  • makefile

    r1c27783 rc3b2f42  
    1919FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
    2020
    21 LostHavenRPG: $(CLASS_DEPS) $(FILE_DEPS)
    22         jar cfe $@.jar main.$@ $^ $(INNER_DEPS)
     21LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
     22        jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)
  • utils/Utils.java

    r1c27783 rc3b2f42  
    3333import java.awt.GraphicsConfiguration;
    3434
    35 public class Utils
    36 {
     35public class Utils {
    3736    private static boolean RUNNING_FROM_JAR;
    3837    private static Utils classLoaderReference;
Note: See TracChangeset for help on using the changeset viewer.