From 6279bbeed36754eb9678309972ae515ab063c961 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Thu, 29 Aug 2019 22:49:04 -0400 Subject: [PATCH] Fix missing period in update notification, --no-fft compile fix --- src/gui/game/GameController.cpp | 4 ++-- src/simulation/Gravity.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index c926ba322..90efc7371 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -1714,7 +1714,7 @@ void GameController::NotifyUpdateAvailable(Client * sender) updateMessage << "\nNew version:\n "; if (info.Type == UpdateInfo::Beta) - updateMessage << info.Major << " " << info.Minor << " Beta, Build " << info.Build; + updateMessage << info.Major << "." << info.Minor << " Beta, Build " << info.Build; else if (info.Type == UpdateInfo::Snapshot) #if MOD_ID > 0 updateMessage << "Mod version " << info.Time; @@ -1722,7 +1722,7 @@ void GameController::NotifyUpdateAvailable(Client * sender) updateMessage << "Snapshot " << info.Time; #endif else if(info.Type == UpdateInfo::Stable) - updateMessage << info.Major << " " << info.Minor << " Stable, Build " << info.Build; + updateMessage << info.Major << "." << info.Minor << " Stable, Build " << info.Build; if (info.Changelog.length()) updateMessage << "\n\nChangelog:\n" << info.Changelog; diff --git a/src/simulation/Gravity.cpp b/src/simulation/Gravity.cpp index 7dc43af86..4fc74e0b0 100755 --- a/src/simulation/Gravity.cpp +++ b/src/simulation/Gravity.cpp @@ -376,7 +376,6 @@ void Gravity::update_grav(void) } fin: memcpy(th_ogravmap, th_gravmap, (XRES/CELL)*(YRES/CELL)*sizeof(float)); - memcpy(obmap, bmap, (XRES/CELL)*(YRES/CELL)*sizeof(unsigned char)); } #endif