Merge pull request #735 from LoboEire/master

Automap zooming tweaks
edge-classic · Sep 10, 2024 · b9666b7 · b9666b7
2 parents 148b001 + b5921c7
commit b9666b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/docs/mapping/EdgeC_UDB_Config/Includes/EdgeC_misc.cfg b/docs/mapping/EdgeC_UDB_Config/Includes/EdgeC_misc.cfg
@@ -201,6 +201,13 @@ mapformat_udmf
 
 	// Enabled setting brightness for upper, middle, and lower sidedef independently from each other
 	distinctsidedefpartbrightness = false;
+
+	// Enables support for 3D floors (not really, since support for 3D floors is pretty much hard-coded, but
+	// this tells plugins that the game supports 3D floors)
+	effect3dfloorsupport = true;
+
+	// Enables support for vertex heights
+	vertexheightsupport = true;
 
 
 	//engine = "edge-classic"; // override that so that DB2 uses the correct namespace

diff --git a/source_files/edge/am_map.cc b/source_files/edge/am_map.cc
@@ -100,7 +100,7 @@ static constexpr uint8_t kAutomapTotalMarkPoints = 9;
 
 // scale on entry
 static constexpr float kAutomapMinimumScale = 0.5f;
-static constexpr float kAutomapInitialScale = 4.0f;
+static constexpr float kAutomapInitialScale = 2.0f;
 static constexpr float kAutomapMaximumScale = 100.0f;
 
 // how much the automap moves window per tic in frame-buffer coordinates
@@ -270,7 +270,11 @@ void AutomapInitLevel(void)
 
     FindMinMaxBoundaries();
 
-    map_scale = kAutomapInitialScale;
+    if (map_scale == 0.0f)  //Not been changed yet so set a default
+    {
+        map_scale = kAutomapInitialScale;
+    }
+
 }
 
 void AutomapStop(void)