Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[786] trunk/OpenMPT
|
From: <sag...@us...> - 2011-01-15 16:27:57
|
Revision: 786
http://modplug.svn.sourceforge.net/modplug/?rev=786&view=rev
Author: saga-games
Date: 2011-01-15 16:27:50 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
[Fix] Pattern Editor: Queueing a "---" or "+++" item now automatically moves the queue "cursor" to the next available pattern. Previously, queueing a "---" pattern restarted the song.
[Imp] Pattern Editor: Just like normal selections, the row selection feature now also suppresses pattern scrolling.
[Mod] OpenMPT: Version is now 1.19.00.19
Modified Paths:
--------------
trunk/OpenMPT/installer/install-unmo3-free.iss
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/version.h
Modified: trunk/OpenMPT/installer/install-unmo3-free.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free.iss 2011-01-15 16:25:29 UTC (rev 785)
+++ trunk/OpenMPT/installer/install-unmo3-free.iss 2011-01-15 16:27:50 UTC (rev 786)
@@ -12,33 +12,50 @@
#define DOWNLOAD_MO3
#define BaseNameAddition "_sf"
#include "install.iss"
+#include "it_download.iss"
-[_ISToolDownload]
-Source: http://openmpt.com/download/unmo3.dll; DestDir: {tmp}; DestName: openmpt-unmo3.dll.tmp; Tasks: downloadmo3
[Code]
// Verify checksum of downloaded file, and if it is OK, copy it to the app directory.
procedure VerifyUNMO3Checksum();
begin
if(IsTaskSelected('downloadmo3') And FileExists(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'))) then
begin
- if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '2e17f7bb6d19ce326851333b918070c5357cacd1') then
- begin
- MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that either the downloaded file is corrupted or that a newer version of unmo3.dll is available. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.com/ and verify its checksum.', mbCriticalError, MB_OK)
- end else
- begin
- FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
- end;
- DeleteFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '2e17f7bb6d19ce326851333b918070c5357cacd1') then
+ begin
+ MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that either the downloaded file is corrupted or that a newer version of unmo3.dll is available. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.com/ and verify its checksum.', mbCriticalError, MB_OK)
+ end else
+ begin
+ FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
+ end;
+ DeleteFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
end;
end;
function IsUNMO3Installed(): Boolean;
begin
- Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
+ Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
end;
+procedure InitializeWizard();
+begin
+ ITD_Init();
+ ITD_DownloadAfter(wpReady);
+end;
+
// Function generated by ISTool.
-function NextButtonClick(CurPage: Integer): Boolean;
+procedure CurPageChanged(CurPage: Integer);
begin
- Result := istool_download(CurPage);
+ case CurPage of
+ CurPage:
+ begin
+ if(IsTaskSelected('downloadmo3')) then
+ begin
+ ITD_AddMirror('http://openmpt.org/download/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ ITD_AddFile('ftp://ftp.untergrund.net/users/sagamusix/openmpt/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ end else
+ begin
+ ITD_ClearFiles();
+ end;
+ end;
+ end;
end;
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2011-01-15 16:25:29 UTC (rev 785)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2011-01-15 16:27:50 UTC (rev 786)
@@ -1041,7 +1041,7 @@
if(bPatternExists) break;
}
- DWORD greyed = bPatternExists ? 0 : MF_GRAYED;
+ const DWORD greyed = bPatternExists ? 0 : MF_GRAYED;
CInputHandler* ih = (CMainFrame::GetMainFrame())->GetInputHandler();
@@ -1432,13 +1432,24 @@
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if(pSndFile == nullptr) return;
+ const PATTERNINDEX nIgnore = pSndFile->Order.GetIgnoreIndex();
+ const PATTERNINDEX nInvalid = pSndFile->Order.GetInvalidPatIndex();
+ const ORDERINDEX nLength = pSndFile->Order.GetLength();
ORDERINDEX nOrder = GetOrderFromPoint(rect, pt);
- if (nOrder < pSndFile->Order.GetLength())
+ // If this is not a playable order item, find the next valid item.
+ while(nOrder < nLength && (pSndFile->Order[nOrder] == nIgnore || pSndFile->Order[nOrder] == nInvalid))
{
- if (pSndFile->m_nSeqOverride == static_cast<UINT>(nOrder) + 1) {
+ nOrder++;
+ }
+
+ if (nOrder < nLength)
+ {
+ if (pSndFile->m_nSeqOverride == static_cast<UINT>(nOrder) + 1)
+ {
pSndFile->m_nSeqOverride = 0;
- } else {
+ } else
+ {
pSndFile->m_nSeqOverride = nOrder + 1;
}
InvalidateRect(NULL, FALSE);
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2011-01-15 16:25:29 UTC (rev 785)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2011-01-15 16:27:50 UTC (rev 786)
@@ -3018,7 +3018,7 @@
m_pEffectVis->SetPlayCursor(nPat, nRow);
}
- if ((m_dwStatus & (PATSTATUS_FOLLOWSONG|PATSTATUS_DRAGVSCROLL|PATSTATUS_DRAGHSCROLL|PATSTATUS_MOUSEDRAGSEL)) == PATSTATUS_FOLLOWSONG)
+ if ((m_dwStatus & (PATSTATUS_FOLLOWSONG|PATSTATUS_DRAGVSCROLL|PATSTATUS_DRAGHSCROLL|PATSTATUS_MOUSEDRAGSEL|PATSTATUS_SELECTROW)) == PATSTATUS_FOLLOWSONG)
{
if (nPat < pSndFile->Patterns.Size())
{
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2011-01-15 16:25:29 UTC (rev 785)
+++ trunk/OpenMPT/mptrack/version.h 2011-01-15 16:27:50 UTC (rev 786)
@@ -15,7 +15,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 19
#define VER_MINOR 00
-#define VER_MINORMINOR 18
+#define VER_MINORMINOR 19
//Creates version number from version parts that appears in version string.
//For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
