Merge pull request mrkite#142 from cpforbes/cpf-recenter

Restore location on reload & Add y coordinate to status bar
cre4ture · Oct 9, 2018 · cee1468 · cee1468
2 parents ddcc266 + 45459f9
commit cee1468
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mapview.cpp b/mapview.cpp
@@ -616,14 +616,14 @@ void MapView::getToolTip(int x, int z) {
   Chunk *chunk = cache.fetch(cx, cz);
   int offset = (x & 0xf) + (z & 0xf) * 16;
   int id = 0, bd = 0;
+  int y = 0;
 
   QString name = "Unknown";
   QString biome = "Unknown Biome";
   QMap<QString, int> entityIds;
 
   if (chunk) {
     int top = qMin(depth, chunk->highest);
-    int y = 0;
     for (y = top; y >= 0; y--) {
       int sec = y >> 4;
       ChunkSection *section = chunk->sections[sec];
@@ -663,8 +663,9 @@ void MapView::getToolTip(int x, int z) {
     entityStr = entities.join(", ");
   }
 
-  emit hoverTextChanged(tr("X:%1 Z:%2 - %3 - %4 (%5:%6) %7")
+  emit hoverTextChanged(tr("X:%1 Y:%2 Z:%3 - %4 - %5 (%6:%7) %8")
                         .arg(x)
+                        .arg(y)
                         .arg(z)
                         .arg(biome)
                         .arg(name)

diff --git a/minutor.cpp b/minutor.cpp
@@ -123,7 +123,10 @@ void Minutor::open() {
 }
 
 void Minutor::reload() {
+  auto loc = *(mapview->getLocation());
+
   loadWorld(currentWorld);
+  mapview->setLocation(loc.x, loc.y, loc.z, false, true);
 }
 
 void Minutor::save() {