[OMPT-svn-commit] SF.net SVN: modplug:[3526] trunk/OpenMPT

[<sag...@us...>]

Revision: 3526
          http://sourceforge.net/p/modplug/code/3526
Author:   saga-games
Date:     2013-12-24 14:25:15 +0000 (Tue, 24 Dec 2013)
Log Message:
-----------
[Fix] Empty settings paths were changed to "\" since a few revisions ago.
[Mod] OpenMPT: Version is now 1.22.07.10

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2013-12-24 14:05:12 UTC (rev 3525)
+++ trunk/OpenMPT/common/versionNumber.h	2013-12-24 14:25:15 UTC (rev 3526)
@@ -17,7 +17,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
 #define VER_MINOR               07
-#define VER_MINORMINOR          09
+#define VER_MINORMINOR          10
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-12-24 14:05:12 UTC (rev 3525)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-12-24 14:25:15 UTC (rev 3526)
@@ -463,15 +463,15 @@
 	}
 	if(storedVersion < MAKE_VERSION_NUMERIC(1,20,00,04))
 	{
-		m_dwPatternSetup &= ~0x200000;				// dito
+		m_dwPatternSetup &= ~0x200000;				// ditto
 	}
 	if(storedVersion < MAKE_VERSION_NUMERIC(1,20,00,07))
 	{
-		m_dwPatternSetup &= ~0x400000;				// dito
+		m_dwPatternSetup &= ~0x400000;				// ditto
 	}
 	if(storedVersion < MAKE_VERSION_NUMERIC(1,20,00,39))
 	{
-		m_dwPatternSetup &= ~0x10000000;			// dito
+		m_dwPatternSetup &= ~0x10000000;			// ditto
 	}
 
 	// Effects
@@ -949,22 +949,22 @@
 }
 
 
-
-// retrieve / set default directory from given string and store it our setup variables
-void TrackerDirectories::SetDirectory(const mpt::PathString &szFilenameFrom, Directory dir, mpt::PathString (&directories)[NUM_DIRS], bool bStripFilename)
-//--------------------------------------------------------------------------------------------------------------------------------------------------------
+// Retrieve / set default directory from given string and store it our setup variables
+// If stripFilename is true, the filenameFrom parameter is assumed to be a full path including a filename.
+void TrackerDirectories::SetDirectory(const mpt::PathString &filenameFrom, Directory dir, mpt::PathString (&directories)[NUM_DIRS], bool stripFilename)
+//-----------------------------------------------------------------------------------------------------------------------------------------------------
 {
 	mpt::PathString path;
 
-	if(bStripFilename)
+	if(stripFilename)
 	{
-		path = szFilenameFrom.GetDrive() + szFilenameFrom.GetDir();
+		path = filenameFrom.GetDrive() + filenameFrom.GetDir();
 	} else
 	{
-		path = szFilenameFrom;
+		path = filenameFrom;
 	}
 
-	if(!path.HasTrailingSlash())
+	if(!path.empty() && !path.HasTrailingSlash())
 	{
 		path += MPT_PATHSTRING("\\");
 	}
@@ -981,6 +981,7 @@
 	}
 }
 
+
 void TrackerDirectories::SetDefaultDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename)
 //---------------------------------------------------------------------------------------------------------------------
 {
@@ -995,6 +996,7 @@
 }
 
 
+// Get slash-terminated default directory of given type.
 mpt::PathString TrackerDirectories::GetDefaultDirectory(Directory dir) const
 //--------------------------------------------------------------------------
 {
@@ -1002,6 +1004,7 @@
 }
 
 
+// Get slash-terminated working directory of given type.
 mpt::PathString TrackerDirectories::GetWorkingDirectory(Directory dir) const
 //--------------------------------------------------------------------------
 {

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2013-12-24 14:05:12 UTC (rev 3525)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2013-12-24 14:25:15 UTC (rev 3526)
@@ -415,9 +415,9 @@
 	~TrackerDirectories();
 
 	// access to default + working directories
-	void SetWorkingDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename = false);
+	void SetWorkingDirectory(const mpt::PathString &filenameFrom, Directory dir, bool stripFilename = false);
 	mpt::PathString GetWorkingDirectory(Directory dir) const;
-	void SetDefaultDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename = false);
+	void SetDefaultDirectory(const mpt::PathString &filenameFrom, Directory dir, bool stripFilename = false);
 	mpt::PathString GetDefaultDirectory(Directory dir) const;
 
 	static TrackerDirectories &Instance();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.