Added incremental component to version number.

SockPuppet8 · Nov 2, 2018 · 1438d14 · 1438d14
1 parent 5b72574
commit 1438d14
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/src/Console/Interface/Title.cpp b/src/Console/Interface/Title.cpp
@@ -242,17 +242,16 @@ void Title::draw( AOutputWindow& window, AGameModel& in_model ) const
 
 	console.draw(atx, aty, '@', Console::Green);
 
-	static const char * border0 = "..................";
+	static const char * border0 = "....................";
 	std::string version = " Version " + std::string(GAMEMODEL_VERSION_STR) + std::string(" ");
-	static const char * border1 = "..................";
-	console.drawText(atx+4, title_base+10, border1, floor_col);
-	console.drawText(atx+4, title_base+11, version.c_str(), Console::Green);
-	console.drawText(atx+4, title_base+12, border1, floor_col);
+	console.drawText(atx+2, title_base+10, border0, floor_col);
+	console.drawText(atx+2, title_base+11, version.c_str(), Console::Green);
+	console.drawText(atx+2, title_base+12, border0, floor_col);
 
 	static const char * press_enter = " Press Enter ";
-	static const char * border2     = ".............";
+	static const char * border1     = ".............";
 	console.drawText(atx+9, title_base+13, press_enter, Console::BrightYellow);
-	console.drawText(atx+9, title_base+14, border2    , floor_col);
+	console.drawText(atx+9, title_base+14, border1    , floor_col);
 }
 
 bool Title::drawsWholeWindow(void) const

diff --git a/src/Model/save.cpp b/src/Model/save.cpp
@@ -34,15 +34,22 @@ bool isSaveFile(const char * filename)
 			std::getline(ifs, firstline);
 			if (0 == firstline.compare(0, 18, "AlienHack savefile")) {
 
-				int ver_maj, ver_min;
-				if (std::sscanf(firstline.c_str(), "AlienHack savefile %d %d", &ver_maj, &ver_min) != 2)
+				int ver_maj, ver_min, ver_incr;
+				if (std::sscanf(firstline.c_str(), "AlienHack savefile %d %d %d", &ver_maj, &ver_min, &ver_incr) != 3)
 					return false;
 
 				if (ver_maj < GAMEMODEL_SAVE_LAST_COMPATIBLE_MAJOR)
 					return false;
 
-				if (ver_maj == GAMEMODEL_SAVE_LAST_COMPATIBLE_MAJOR && ver_min < GAMEMODEL_SAVE_LAST_COMPATIBLE_MINOR)
-					return false;
+				if (ver_maj == GAMEMODEL_SAVE_LAST_COMPATIBLE_MAJOR)
+				{
+					if (ver_min < GAMEMODEL_SAVE_LAST_COMPATIBLE_MINOR)
+						return false;
+
+					if (ver_min == GAMEMODEL_SAVE_LAST_COMPATIBLE_MINOR)
+						if (ver_incr < GAMEMODEL_SAVE_LAST_COMPATIBLE_INCREMENTAL)
+							return false;
+				}
 
 				return true;
 			}
@@ -61,7 +68,8 @@ bool saveGame(AHGameModel& model, const char * filename)
 	{
 		ofs << "AlienHack savefile " << 
 			boost::lexical_cast<std::string>(GAMEMODEL_VERSION_MAJOR) << " " << 
-			boost::lexical_cast<std::string>(GAMEMODEL_VERSION_MINOR) << " ##\n";
+			boost::lexical_cast<std::string>(GAMEMODEL_VERSION_MINOR) << " " << 
+			boost::lexical_cast<std::string>(GAMEMODEL_VERSION_INCREMENTAL) << " ##\n";
 
 		boost::archive::text_oarchive oa(ofs);
 

diff --git a/src/Model/version.hpp b/src/Model/version.hpp
@@ -2,11 +2,13 @@
 #define	ALIENHACK_MODEL_VERSION_HPP
 
 
-#define GAMEMODEL_VERSION_MAJOR	0
-#define GAMEMODEL_VERSION_MINOR	9
-#define GAMEMODEL_VERSION_STR	"0.9 beta"
-
-#define GAMEMODEL_SAVE_LAST_COMPATIBLE_MAJOR	0
-#define GAMEMODEL_SAVE_LAST_COMPATIBLE_MINOR	9
+#define GAMEMODEL_VERSION_MAJOR			0
+#define GAMEMODEL_VERSION_MINOR			9
+#define GAMEMODEL_VERSION_INCREMENTAL	1
+#define GAMEMODEL_VERSION_STR	"0.9.1 beta"
+
+#define GAMEMODEL_SAVE_LAST_COMPATIBLE_MAJOR		0
+#define GAMEMODEL_SAVE_LAST_COMPATIBLE_MINOR		9
+#define GAMEMODEL_SAVE_LAST_COMPATIBLE_INCREMENTAL	1
 
 #endif