Skip to content

Commit 6f4e400

Browse files
committed
Merge PR #139 - fixes #138
2 parents 0e5046a + 9034a61 commit 6f4e400

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

desktop/src/org/destinationsol/desktop/SolDesktop.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,34 @@ public static void main(String[] argv) {
3131
return;
3232
}
3333

34-
LwjglApplicationConfiguration c = new LwjglApplicationConfiguration();
34+
LwjglApplicationConfiguration applicationConfig = new LwjglApplicationConfiguration();
3535
boolean devBuild = java.nio.file.Files.exists(Paths.get("devBuild"));
3636
if (devBuild) {
3737
DebugOptions.DEV_ROOT_PATH = "main/"; // Lets the game run from source without a tweaked working directory
38-
c.vSyncEnabled = false; //Setting to false disables vertical sync
39-
c.foregroundFPS = 0; //disables foreground fps throttling
40-
c.backgroundFPS = 0; //disables background fps throttling
38+
applicationConfig.vSyncEnabled = false; //Setting to false disables vertical sync
39+
applicationConfig.foregroundFPS = 0; //disables foreground fps throttling
40+
applicationConfig.backgroundFPS = 0; //disables background fps throttling
4141
}
4242
MyReader reader = new MyReader();
4343
DebugOptions.read(reader);
4444

4545

4646
if (DebugOptions.EMULATE_MOBILE) {
47-
c.width = 640;
48-
c.height = 480;
49-
c.fullscreen = false;
47+
applicationConfig.width = 640;
48+
applicationConfig.height = 480;
49+
applicationConfig.fullscreen = false;
5050
} else {
5151
GameOptions d = new GameOptions(false, reader);
52-
c.width = d.x;
53-
c.height = d.y;
54-
c.fullscreen = d.fullscreen;
52+
applicationConfig.width = d.x;
53+
applicationConfig.height = d.y;
54+
applicationConfig.fullscreen = d.fullscreen;
5555
}
5656

57-
c.title = "Destination Sol";
57+
applicationConfig.title = "Destination Sol";
5858
if (DebugOptions.DEV_ROOT_PATH == null) {
59-
c.addIcon("res/icon.png", Files.FileType.Internal);
59+
applicationConfig.addIcon("res/icon.png", Files.FileType.Internal);
6060
} else {
61-
c.addIcon(DebugOptions.DEV_ROOT_PATH + "res/icon.png", Files.FileType.Absolute);
61+
applicationConfig.addIcon(DebugOptions.DEV_ROOT_PATH + "res/icon.png", Files.FileType.Absolute);
6262
}
6363

6464
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@@ -85,7 +85,7 @@ public void uncaughtException(Thread thread, final Throwable ex) {
8585
}
8686
});
8787

88-
new LwjglApplication(new SolApplication(), c);
88+
new LwjglApplication(new SolApplication(), applicationConfig);
8989
}
9090

9191
private static class MyReader implements SolFileReader {

gradlew

100644100755
File mode changed.

main/src/org/destinationsol/menu/MenuLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class MenuLayout {
2929
private static final int numberOfRowsTotal = 5;
3030

3131
public MenuLayout(float r) {
32-
btnW = .30f * r;
32+
btnW = .40f * r;
3333
btnH = .1f;
3434
myPad = .1f * btnH;
3535
rowH = btnH + myPad;

0 commit comments

Comments
 (0)