fix CPatternIterator::GetCursor

HertzDevil · May 20, 2018 · 3fa2cf4 · 3fa2cf4
1 parent 626c181
commit 3fa2cf4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/0CC-FamiTracker.rc b/0CC-FamiTracker.rc
@@ -533,8 +533,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,15,2
- PRODUCTVERSION 0,3,15,2
+ FILEVERSION 0,3,15,3
+ PRODUCTVERSION 0,3,15,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -551,12 +551,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "HertzDevil"
             VALUE "FileDescription", "0CC-FamiTracker, Extension of FamiTracker"
-            VALUE "FileVersion", "0.3.15.2"
+            VALUE "FileVersion", "0.3.15.3"
             VALUE "InternalName", "0CC-FamiTracker.exe"
             VALUE "LegalCopyright", " (c) jsr, HertzDevil 2005-2018 All rights reserved."
             VALUE "OriginalFilename", "0CC-FamiTracker.exe"
             VALUE "ProductName", "0CC-FamiTracker"
-            VALUE "ProductVersion", "0.3.15.2"
+            VALUE "ProductVersion", "0.3.15.3"
         END
     END
     BLOCK "VarFileInfo"
@@ -1038,7 +1038,7 @@ BEGIN
     ICON            IDR_MAINFRAME,IDC_STATIC,12,63,20,20,SS_REALSIZEIMAGE
     LTEXT           "0CC-FamiTracker",IDC_ABOUT1,54,58,219,11,SS_NOPREFIX
     LTEXT           "Extension of FamiTracker",IDC_ABOUT2,54,76,167,11,SS_NOPREFIX
-    LTEXT           "Copyright (C) 2005 - 2015 jsr, 2014 - 2017 HertzDevil",IDC_ABOUT3,54,92,215,11
+    LTEXT           "Copyright (C) 2005 - 2015 jsr, 2014 - 2018 HertzDevil",IDC_ABOUT3,54,92,215,11
     LTEXT           "E-mail:",IDC_STATIC,54,107,24,10
     LTEXT           "[email protected]",IDC_MAIL,84,107,70,10,SS_NOTIFY
     LTEXT           "Web:",IDC_STATIC,54,117,24,9

diff --git a/0CC-readme.txt b/0CC-readme.txt
@@ -1,7 +1,7 @@
 0CC-FamiTracker Mod
 Readme / Manual
 Written by HertzDevil
-Version 0.3.15.2 - May 20 2018
+Version 0.3.15.3 - May 20 2018
 
 --------------------------------------------------------------------------------
 

diff --git a/Source/SelectionRange.cpp b/Source/SelectionRange.cpp
@@ -54,7 +54,7 @@ std::pair<CPatternIterator, CPatternIterator> CPatternIterator::FromSelection(co
 }
 
 CCursorPos CPatternIterator::GetCursor() const {
-	return {m_iFrame, m_iRow, m_iColumn, m_iChannel};
+	return {m_iRow, m_iChannel, m_iColumn, m_iFrame};
 }
 
 const stChanNote &CPatternIterator::Get(int Channel) const

diff --git a/Source/version.h b/Source/version.h
@@ -32,7 +32,7 @@
 #define VERSION_API  0
 #define VERSION_MAJ  3
 #define VERSION_MIN  15
-#define VERSION_REV  2
+#define VERSION_REV  3
 
 constexpr int Compare0CCFTVersion(int api, int maj, int min, int rev) noexcept {
 	if (api > VERSION_API)

diff --git a/changelog.txt b/changelog.txt
@@ -2,10 +2,19 @@
 Change Log
 Written by HertzDevil
 
-Version 0.3.15.2 - May 20 2018
+Version 0.3.15.3 - May 20 2018
 
 --------------------------------------------------------------------------------
 
+V0.3.15.3 - 05/20/18
+
+Bug fixes:
+
+- Fixed a fatal issue that caused drag and paste operations to create incorrect
+   pattern selections
+
+
+
 V0.3.15.2 - 05/20/18
 
 Additions: