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

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

Revision: 1563
          http://sourceforge.net/p/modplug/code/1563
Author:   saga-games
Date:     2013-03-12 01:56:50 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
[Ref] More include file juggling
[Fix] Accidentally broke version comparison when loading ini file in previous commit.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/PatternClipboard.h
    trunk/OpenMPT/mptrack/PatternCursor.h
    trunk/OpenMPT/mptrack/TrackerSettings.cpp

Modified: trunk/OpenMPT/mptrack/PatternClipboard.h
===================================================================
--- trunk/OpenMPT/mptrack/PatternClipboard.h	2013-03-12 01:41:35 UTC (rev 1562)
+++ trunk/OpenMPT/mptrack/PatternClipboard.h	2013-03-12 01:56:50 UTC (rev 1563)
@@ -11,10 +11,11 @@
 #pragma once
 
 #include <deque>
-#include "Sndfile.h"
+#include "Snd_defs.h"
 #include "PatternCursor.h"
 
 struct ModCommandPos;
+class CSoundFile;
 
 //===========================
 class PatternClipboardElement

Modified: trunk/OpenMPT/mptrack/PatternCursor.h
===================================================================
--- trunk/OpenMPT/mptrack/PatternCursor.h	2013-03-12 01:41:35 UTC (rev 1562)
+++ trunk/OpenMPT/mptrack/PatternCursor.h	2013-03-12 01:56:50 UTC (rev 1563)
@@ -187,8 +187,10 @@
 		{
 			chn = maxChans - 1;
 			col = lastColumn;
+		} else if(col > lastColumn)
+		{
+			col = lastColumn;
 		}
-		LimitMax(col, lastColumn);
 		Set(row, chn, col);
 	};
 

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-03-12 01:41:35 UTC (rev 1562)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-03-12 01:56:50 UTC (rev 1563)
@@ -231,11 +231,10 @@
 void TrackerSettings::LoadINISettings(const CString &iniFile)
 //----------------------------------------------------------
 {
-	//CHAR collectedString[INIBUFFERSIZE];
 	MptVersion::VersionNum vIniVersion;
 
 	vIniVersion = gcsPreviousVersion = MptVersion::ToNum(CMainFrame::GetPrivateProfileCString("Version", "Version", "", iniFile));
-	if(vIniVersion = 0)
+	if(vIniVersion == 0)
 		vIniVersion = MptVersion::num;
 
 	gcsInstallGUID = CMainFrame::GetPrivateProfileCString("Version", "InstallGUID", "", iniFile);

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