duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2019-09-04 01:53:58 +01:00
commit 79759145c0
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -262,7 +262,7 @@ obj/bin2h: bin2h/bin2h.c
include $(wildcard $(DEPENDENCIES)) include $(wildcard $(DEPENDENCIES))
obj/$(FILENAME)/windows_resources.o: msvc2003/CSE2.rc obj/$(FILENAME)/windows_resources.o: assets/resources/CSE2.rc
@mkdir -p $(@D) @mkdir -p $(@D)
@$(WINDRES) $< $@ @$(WINDRES) $< $@

8
msvc2003/CSE2.rc → assets/resources/CSE2.rc
View file

@ -58,13 +58,13 @@ BEGIN
END END
END END
CURSOR_IKA CURSOR "..\\assets\\resources\\CURSOR\\CURSOR_IKA.cur" CURSOR_IKA CURSOR "CURSOR\\CURSOR_IKA.cur"
CURSOR_NORMAL CURSOR "..\\assets\\resources\\CURSOR\\CURSOR_NORMAL.cur" CURSOR_NORMAL CURSOR "CURSOR\\CURSOR_NORMAL.cur"
0 ICON "..\\assets\\resources\\ICON\\0.ico" 0 ICON "ICON\\0.ico"
ICON_MINI ICON "..\\assets\\resources\\ICON\\ICON_MINI.ico" ICON_MINI ICON "ICON\\ICON_MINI.ico"
#endif // Japanese resources #endif // Japanese resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

0
msvc2003/resource1.h → assets/resources/resource1.h
View file

2
src/Organya.cpp
View file

@ -69,7 +69,7 @@ typedef struct MUSICINFO
unsigned short alloc_note; // Number of allocated notes unsigned short alloc_note; // Number of allocated notes
long repeat_x; // Repeat long repeat_x; // Repeat
long end_x; // End of song (Return to repeat) long end_x; // End of song (Return to repeat)
TRACKDATA tdata[16]; TRACKDATA tdata[MAXTRACK];
} MUSICINFO; } MUSICINFO;
// メインクラス。このアプリケーションの中心。（クラスってやつを初めて使う） (Main class. The heart of this application. (Class is used for the first time)) // メインクラス。このアプリケーションの中心。（クラスってやつを初めて使う） (Main class. The heart of this application. (Class is used for the first time))