Change some of the default values

gaborbata · Oct 6, 2023 · 798b095 · 798b095
1 parent f35828b
commit 798b095
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/CONFIG.md b/CONFIG.md
@@ -122,7 +122,7 @@ The file takes the format of a list of configuration settings, with each line of
 #### Display
 
 * `screenblocks`:
-  Controls the screensize, ranging from 3–11. A value of 10 gives a fullscreen window with the status bar, while 11 gives fullscreen without status bar. The default value is 9.
+  Controls the screensize, ranging from 3-11. A value of 10 gives a fullscreen window with the status bar, while 11 gives fullscreen without status bar. The default value is 9 (10 in Mocha Doom).
 * `detaillevel`:
   Boolean value which controls the resolution of the screen. The logic here is inverted: 0 is high resolution, while 1 is low resolution.
 * `usegamma`:
@@ -253,7 +253,7 @@ The file can be made read-only to avoid this problem.
 ### Mocha Doom Settings
 
 * `fullscreen`: `false` by default. Turns on fullscreen mode instead of the default windowed mode
-* `fullscreen_mode`: options: `Best` (default, picks the closest supported resolution), `Native` (the current display mode)
+* `fullscreen_mode`: options: `Best` (picks the closest supported resolution), `Native` (default, the current display mode)
 * `fullscreen_stretch`: options: `Centre`, `Stretch`, `Fit` (default), `Aspect_4_3`. Try with `fullscreen_mode=Native` if you experience trouble.
 * `fullscreen_interpolation`: options: `Nearest` (default), `Bilinear`, `Biqubic`
 * `alwaysrun`: `false` by default

diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ You can use `classic.cfg` configuration in order to have the old-school classic
 ### IDE
 
 1. Open the project with IntelliJ IDEA, Eclipse or NetBeans
-2. Build and run the project
+2. Build and run the project (entry point: `mochadoom.Engine`)
 
 ### Linux shell scripts
 

diff --git a/src/doom/CVarManager.java b/src/doom/CVarManager.java
@@ -46,7 +46,7 @@ public class CVarManager {
 
     public CVarManager(final List<String> commandList) {
         LOGGER.log(Level.INFO,
-                String.format("%d command-line variables", processAllArgs(commandList)));
+                String.format("%d command-line variable(s).", processAllArgs(commandList)));
     }
 
     /**

diff --git a/src/doom/DoomMain.java b/src/doom/DoomMain.java
@@ -2715,13 +2715,13 @@ public DoomMain() throws IOException {
                 .setVideoScale(vs).setBppMode(bppMode).setWadLoader(wadLoader)
                 .build();
 
-        LOGGER.log(Level.INFO, "V_Init: allocate screens.");
+        LOGGER.log(Level.INFO, "V_Init: Allocate screens.");
 
         // Disk access visualizer
         this.diskDrawer = new DiskDrawer(this, DiskDrawer.STDISK);
 
         // init subsystems
-        LOGGER.log(Level.INFO, "AM_Init: Init Automap colors");
+        LOGGER.log(Level.INFO, "AM_Init: Init Automap colors.");
         this.autoMap = new automap.Map<>(this);
 
         this.wiper = graphicSystem.createWiper(random);
@@ -2740,7 +2740,7 @@ public DoomMain() throws IOException {
         LOGGER.log(Level.INFO, "M_Init: Init miscellaneous info.");
         menu.Init();
 
-        LOGGER.log(Level.INFO, "R_Init: Init DOOM refresh daemon");
+        LOGGER.log(Level.INFO, "R_Init: Init DOOM refresh daemon.");
         sceneRenderer.Init();
 
         LOGGER.log(Level.INFO, "P_Init: Init Playloop state.");
@@ -2869,22 +2869,22 @@ private void printGameInfo() {
         switch (getGameMode()) {
             case shareware:
             case indetermined:
-                LOGGER.log(Level.INFO, "Game info: Shareware!");
+                LOGGER.log(Level.INFO, "Game Info: Shareware!");
                 break;
             case registered:
             case retail:
             case commercial:
             case pack_tnt:
             case pack_plut:
             case pack_xbla:
-                LOGGER.log(Level.INFO, "Game info: Commercial product - do not distribute!");
-                LOGGER.log(Level.INFO, "Game note: Please report software piracy to the SPA: 1-800-388-PIR8");
+                LOGGER.log(Level.INFO, "Game Info: Commercial product - do not distribute!");
+                LOGGER.log(Level.INFO, "Game Note: Please report software piracy to the SPA: 1-800-388-PIR8");
                 break;
             case freedoom1:
             case freedoom2:
             case freedm:
-                LOGGER.log(Level.INFO, "Game info: Copyright (c) 2001-2017 Contributors to the Freedoom project. All rights reserved.");
-                LOGGER.log(Level.INFO, "Game note: See https://github.com/freedoom/freedoom/blob/master/COPYING.adoc");
+                LOGGER.log(Level.INFO, "Game Info: Copyright (c) 2001-2017 Contributors to the Freedoom project. All rights reserved.");
+                LOGGER.log(Level.INFO, "Game Note: See https://github.com/freedoom/freedoom/blob/master/COPYING.adoc");
                 break;
             default:
                 // Ouch.
@@ -3696,7 +3696,7 @@ private void CheckNetGame() throws IOException {
             ArbitrateNetStart();
         }
 
-        LOGGER.log(Level.INFO, String.format("D_CheckNetGame: startskill %s  deathmatch: %s  startmap: %d  startepisode: %d",
+        LOGGER.log(Level.FINE, String.format("D_CheckNetGame: startskill %s, deathmatch: %s, startmap: %d, startepisode: %d",
                 startskill.toString(), Boolean.toString(deathmatch), startmap, startepisode));
 
         // read values out of doomcom
@@ -3715,7 +3715,7 @@ private void CheckNetGame() throws IOException {
             nodeingame[i] = true;
         }
 
-        LOGGER.log(Level.INFO, String.format("D_CheckNetGame: player %d of %d (%d nodes)", (consoleplayer + 1), doomcom.numplayers, doomcom.numnodes));
+        LOGGER.log(Level.FINE, String.format("D_CheckNetGame: Player %d of %d (%d node(s))", (consoleplayer + 1), doomcom.numplayers, doomcom.numnodes));
     }
 
     /**

diff --git a/src/m/Settings.java b/src/m/Settings.java
@@ -90,7 +90,7 @@ public enum Settings {
     joyb_strafe(FILE_DOOM, 1),
     joyb_use(FILE_DOOM, 3),
     joyb_speed(FILE_DOOM, 2),
-    screenblocks(FILE_DOOM, 9),
+    screenblocks(FILE_DOOM, 10),
     detaillevel(FILE_DOOM, 0),
     snd_channels(FILE_DOOM, 8),
     snd_musicdevice(FILE_DOOM, 3), // unused, here for compatibility
@@ -115,7 +115,7 @@ public enum Settings {
      */
     mb_used(FILE_MOCHADOOM, 2),
     fullscreen(FILE_MOCHADOOM, false),
-    fullscreen_mode(FILE_MOCHADOOM, FullscreenOptions.FullMode.Best),
+    fullscreen_mode(FILE_MOCHADOOM, FullscreenOptions.FullMode.Native),
     fullscreen_stretch(FILE_MOCHADOOM, FullscreenOptions.StretchMode.Fit),
     fullscreen_interpolation(FILE_MOCHADOOM, FullscreenOptions.InterpolationMode.Nearest),
     alwaysrun(FILE_MOCHADOOM, false), // Always run is OFF