Fixed elev_mod problem.

orbitersim · Dec 31, 2023 · 4d1ee0f · 4d1ee0f
1 parent 4eb26d2
commit 4d1ee0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/OVP/D3D9Client/Surfmgr2.cpp b/OVP/D3D9Client/Surfmgr2.cpp
@@ -282,9 +282,6 @@ INT16 *SurfTile::ReadElevationFile (const char *name, int lvl, int ilat, int iln
 
 	if (e) {
 
-		//
-		//for (i = 0; i < ndat; i++) elev[i] = (trunc(float(e[i]) * (ehdr.scale / tgt_res)) + trunc(ehdr.offset / tgt_res)) * tgt_res;
-
 		if (ehdr.scale != tgt_res) { // rescale the data
 			double rescale = ehdr.scale / tgt_res;
 			for (i = 0; i < ndat; i++)
@@ -371,8 +368,8 @@ INT16 *SurfTile::ReadElevationFile (const char *name, int lvl, int ilat, int iln
 				phdr->scale = 1.0;
 #endif
 				p += phdr->hdrsize;
-				rescale = (do_rescale = (phdr->scale != 1.0)) ? phdr->scale : 1.0;
-				offset = (do_shift = (phdr->offset != 0.0)) ? INT16(phdr->offset) : 0;
+				rescale = (do_rescale = (phdr->scale != tgt_res)) ? phdr->scale/tgt_res : 1.0;
+				offset = (do_shift = (phdr->offset != 0.0)) ? INT16(phdr->offset/tgt_res) : 0;
 
 				switch(phdr->dtype) {
 				case 0:

diff --git a/Src/Orbiter/elevmgr.cpp b/Src/Orbiter/elevmgr.cpp
@@ -11,7 +11,7 @@ using std::max;
 
 static int elev_grid = 256;
 static int elev_stride = elev_grid+3;
-static int MAXLVL_LIMIT = 13;
+static int MAXLVL_LIMIT = SURF_MAX_PATCHLEVEL2 - 7;
 
 extern Orbiter *g_pOrbiter;
 extern TimeData td;
@@ -43,7 +43,6 @@ ElevationManager::ElevationManager (const CelestialBody *_cbody)
 	elev_res = 1.0;
 	if (cbody->Type() == OBJTP_PLANET) {
 		maxlvl = min ((DWORD)maxlvl, ((Planet*)cbody)->MaxPatchLevel()-7);
-		maxlvl++;
 		// -7: -4 for level offset of quadtree root, -3 for great-grandfather elevation access mode
 		elev_res = ((Planet*)cbody)->ElevationResolution();
 	}