ref: 79759145c0b1a6b938687a55f42303bbd092c1c9
parent: 6932e01650ca61fc9e2cb5573bc5dd424d64b88b
parent: 44f3b15348b7794d28e59b258d8b59d0fbbb09fc
author: Clownacy <Clownacy@users.noreply.github.com>
date: Tue Sep 3 21:53:58 EDT 2019
Merge branch 'accurate' into portable
--- a/Makefile
+++ b/Makefile
@@ -262,7 +262,7 @@
include $(wildcard $(DEPENDENCIES))
-obj/$(FILENAME)/windows_resources.o: msvc2003/CSE2.rc
+obj/$(FILENAME)/windows_resources.o: assets/resources/CSE2.rc
@mkdir -p $(@D)
@$(WINDRES) $< $@
--- /dev/null
+++ b/assets/resources/CSE2.rc
@@ -1,0 +1,195 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource1.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Japanese resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
+#ifdef _WIN32
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+#pragma code_page(932)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,6
+ PRODUCTVERSION 1,0,0,6
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "041104b0"
+ BEGIN
+ VALUE "FileDescription", "Doukutsu"
+ VALUE "FileVersion", "1, 0, 0, 6"
+ VALUE "InternalName", "Doukutsu Monogatari"
+ VALUE "LegalCopyright", "I can't get MSVC2003 to understand Japanese so here's a placeholder"
+ VALUE "OriginalFilename", "Doukutsu.exe"
+ VALUE "ProductName", "I can't get MSVC2003 to understand Japanese so here's a placeholder"
+ VALUE "ProductVersion", "1, 0, 0, 6"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x411, 1200
+ END
+END
+
+CURSOR_IKA CURSOR "CURSOR\\CURSOR_IKA.cur"
+
+CURSOR_NORMAL CURSOR "CURSOR\\CURSOR_NORMAL.cur"
+
+0 ICON "ICON\\0.ico"
+
+ICON_MINI ICON "ICON\\ICON_MINI.ico"
+
+#endif // Japanese resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource1.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+MENU_MAIN MENU
+BEGIN
+ MENUITEM "Quit", 40001
+ MENUITEM "Volume", 40004
+ MENUITEM "Version", 40002
+ MENUITEM "Debug Save", 40005
+ MENUITEM "Mute", 40007
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+DLG_ABOUT DIALOGEX 0, 0, 123, 75
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 9, "Arial", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",1,37,54,50,14,BS_FLAT
+ CTEXT "---",1011,7,14,109,35
+END
+
+DLG_MUTE DIALOGEX 0, 0, 118, 111
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Mute"
+FONT 9, "Arial", 400, 0, 0x80
+BEGIN
+ DEFPUSHBUTTON "OK",1,7,90,50,14
+ PUSHBUTTON "Cancel",2,61,90,50,14
+ CONTROL "0",1010,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,7,7,20,10
+ CONTROL "1",1018,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,17,15,20,10
+ CONTROL "2",1019,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,26,24,20,10
+ CONTROL "3",1020,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,35,33,20,10
+ CONTROL "4",1021,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,45,41,20,10
+ CONTROL "5",1022,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,54,50,20,10
+ CONTROL "6",1023,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,63,58,20,10
+ CONTROL "7",1024,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
+ WS_TABSTOP,73,67,20,10
+END
+
+DLG_SAVE DIALOGEX 0, 0, 118, 47
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Save"
+FONT 9, "Arial", 0, 0, 0x1
+BEGIN
+ EDITTEXT 1008,36,8,72,12,ES_AUTOHSCROLL
+ DEFPUSHBUTTON "OK",1,8,28,48,12
+ PUSHBUTTON "Cancel",2,60,28,48,12
+ LTEXT "Name",-1,8,8,20,12,SS_CENTERIMAGE
+END
+
+DLG_YESNO DIALOGEX 0, 0, 119, 49
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
+FONT 9, "Arial", 400, 0, 0x80
+BEGIN
+ PUSHBUTTON "Yes",1,7,28,50,14,BS_FLAT
+ PUSHBUTTON "No",2,62,28,50,14,BS_FLAT
+ CTEXT "---",1009,7,8,105,15,SS_CENTERIMAGE
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
--- /dev/null
+++ b/assets/resources/resource1.h
@@ -1,0 +1,16 @@
+//{{NO_DEPENDENCIES}}+// Microsoft Visual C++ generated include file.
+// Used by CSE2.rc
+//
+
+// Next default values for new objects
+//
+
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 172
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
--- a/msvc2003/CSE2.rc
+++ /dev/null
@@ -1,195 +1,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource1.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Japanese resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,6
- PRODUCTVERSION 1,0,0,6
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "041104b0"
- BEGIN
- VALUE "FileDescription", "Doukutsu"
- VALUE "FileVersion", "1, 0, 0, 6"
- VALUE "InternalName", "Doukutsu Monogatari"
- VALUE "LegalCopyright", "I can't get MSVC2003 to understand Japanese so here's a placeholder"
- VALUE "OriginalFilename", "Doukutsu.exe"
- VALUE "ProductName", "I can't get MSVC2003 to understand Japanese so here's a placeholder"
- VALUE "ProductVersion", "1, 0, 0, 6"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x411, 1200
- END
-END
-
-CURSOR_IKA CURSOR "..\\assets\\resources\\CURSOR\\CURSOR_IKA.cur"
-
-CURSOR_NORMAL CURSOR "..\\assets\\resources\\CURSOR\\CURSOR_NORMAL.cur"
-
-0 ICON "..\\assets\\resources\\ICON\\0.ico"
-
-ICON_MINI ICON "..\\assets\\resources\\ICON\\ICON_MINI.ico"
-
-#endif // Japanese resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource1.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MENU_MAIN MENU
-BEGIN
- MENUITEM "Quit", 40001
- MENUITEM "Volume", 40004
- MENUITEM "Version", 40002
- MENUITEM "Debug Save", 40005
- MENUITEM "Mute", 40007
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLG_ABOUT DIALOGEX 0, 0, 123, 75
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 9, "Arial", 400, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",1,37,54,50,14,BS_FLAT
- CTEXT "---",1011,7,14,109,35
-END
-
-DLG_MUTE DIALOGEX 0, 0, 118, 111
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Mute"
-FONT 9, "Arial", 400, 0, 0x80
-BEGIN
- DEFPUSHBUTTON "OK",1,7,90,50,14
- PUSHBUTTON "Cancel",2,61,90,50,14
- CONTROL "0",1010,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,7,7,20,10
- CONTROL "1",1018,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,17,15,20,10
- CONTROL "2",1019,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,26,24,20,10
- CONTROL "3",1020,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,35,33,20,10
- CONTROL "4",1021,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,45,41,20,10
- CONTROL "5",1022,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,54,50,20,10
- CONTROL "6",1023,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,63,58,20,10
- CONTROL "7",1024,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
- WS_TABSTOP,73,67,20,10
-END
-
-DLG_SAVE DIALOGEX 0, 0, 118, 47
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Save"
-FONT 9, "Arial", 0, 0, 0x1
-BEGIN
- EDITTEXT 1008,36,8,72,12,ES_AUTOHSCROLL
- DEFPUSHBUTTON "OK",1,8,28,48,12
- PUSHBUTTON "Cancel",2,60,28,48,12
- LTEXT "Name",-1,8,8,20,12,SS_CENTERIMAGE
-END
-
-DLG_YESNO DIALOGEX 0, 0, 119, 49
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
-FONT 9, "Arial", 400, 0, 0x80
-BEGIN
- PUSHBUTTON "Yes",1,7,28,50,14,BS_FLAT
- PUSHBUTTON "No",2,62,28,50,14,BS_FLAT
- CTEXT "---",1009,7,8,105,15,SS_CENTERIMAGE
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
--- a/msvc2003/resource1.h
+++ /dev/null
@@ -1,16 +1,0 @@
-//{{NO_DEPENDENCIES}}-// Microsoft Visual C++ generated include file.
-// Used by CSE2.rc
-//
-
-// Next default values for new objects
-//
-
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 172
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -69,7 +69,7 @@
unsigned short alloc_note; // Number of allocated notes
long repeat_x; // Repeat
long end_x; // End of song (Return to repeat)
- TRACKDATA tdata[16];
+ TRACKDATA tdata[MAXTRACK];
} MUSICINFO;
// メインクラス。このアプリケーションの中心。（クラスってやつを初めて使う） (Main class. The heart of this application. (Class is used for the first time))
--
⑨