The full version string is now printed in the log header and the main title screen when the -showversion argument is used. Also, fixed snapshot build watermark not showing the game version.

Author: AnotherCommander

Makefile

@@ -41,7 +41,7 @@ release-deployment:
 
 .PHONY: release-snapshot
 release-snapshot:
-	$(MAKE) -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no
+	$(MAKE) -f GNUmakefile SNAPSHOT_BUILD=yes debug=no
 	mkdir -p AddOns && rm -rf AddOns/Basic-debug.oxp && cp -rf DebugOXP/Debug.oxp AddOns/Basic-debug.oxp
 
 .PHONY: debug

src/Core/Entities/PlayerEntity.m

@@ -10075,7 +10075,7 @@ - (void) setGuiToIntroFirstGo:(BOOL)justCobra
 			if ([[arguments objectAtIndex:i] isEqual:@"-showversion"])
 			{
 				OOGUIRow ms_start = msgLine;
-				NSString *version = [NSString stringWithFormat:@"Version %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]];
+				NSString *version = [NSString stringWithFormat:@"Version %s", OO_VERSION_FULL];
 				OOGUIRow i = msgLine = [gui addLongText:version startingAtRow:ms_start align:GUI_ALIGN_CENTER];
 				for (i-- ; i >= ms_start; i--)
 				{

src/Core/OOLogHeader.m

@@ -161,10 +161,10 @@ void OOPrintLogHeader(void)
 	#endif
 
 	NSString *versionString = nil;
-	#if (defined (SNAPSHOT_BUILD) && defined (OOLITE_SNAPSHOT_VERSION))
-		versionString = @"development version " OOLITE_SNAPSHOT_VERSION;
+	#if (defined (SNAPSHOT_BUILD)) // && defined (OOLITE_SNAPSHOT_VERSION))
+		versionString = @"development version " @OO_VERSION_FULL;
 	#else
-		versionString = [NSString stringWithFormat:@"version %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]];
+		versionString = [NSString stringWithFormat:@"version %s", OO_VERSION_FULL];
 	#endif
 	if (versionString == nil)  versionString = @"<unknown version>";
 

src/Core/Universe.m

@@ -5229,8 +5229,8 @@ - (void) drawUniverse
 			// should come after the HUD to avoid it being overlapped by it
 			[self drawMessage];
 
-#if (defined (SNAPSHOT_BUILD) && defined (OOLITE_SNAPSHOT_VERSION))
-			[self drawWatermarkString:@"Development version " @OOLITE_SNAPSHOT_VERSION];
+#if (defined (SNAPSHOT_BUILD)) // && defined (OOLITE_SNAPSHOT_VERSION))
+			[self drawWatermarkString:@"Development version " @OO_VERSION_FULL];
 #endif
 
 			OOLog(@"universe.profile.drawHUD", @"%@", @"End HUD drawing");