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 14:11:54 +00:00
commit 2b4b57c6eb
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -8,15 +8,19 @@ ASSETS_DIRECTORY = assets
# Default options # Default options
RENDERER ?= Texture RENDERER ?= Texture
ifeq ($(WINDOWS), 1)
EXE_EXTENSION = .exe
endif
ifeq ($(RELEASE), 1) ifeq ($(RELEASE), 1)
CXXFLAGS = -O3 CXXFLAGS = -O3
LDFLAGS = -s LDFLAGS = -s
FILENAME_DEF = CSE2 FILENAME_DEF = CSE2$(EXE_EXTENSION)
DOCONFIG_FILENAME_DEF = DoConfig DOCONFIG_FILENAME_DEF = DoConfig$(EXE_EXTENSION)
else else
CXXFLAGS = -Og -ggdb3 CXXFLAGS = -Og -ggdb3
FILENAME_DEF = CSE2_debug FILENAME_DEF = CSE2_debug$(EXE_EXTENSION)
DOCONFIG_FILENAME_DEF = DoConfig_debug DOCONFIG_FILENAME_DEF = DoConfig_debug$(EXE_EXTENSION)
endif endif
ifeq ($(JAPANESE), 1) ifeq ($(JAPANESE), 1)

1
src/Draw.cpp
View file

@ -13,6 +13,7 @@
#include "Ending.h" #include "Ending.h"
#include "Generic.h" #include "Generic.h"
#include "MapName.h" #include "MapName.h"
#include "Main.h"
#include "Resource.h" #include "Resource.h"
#include "Tags.h" #include "Tags.h"
#include "TextScr.h" #include "TextScr.h"

2
src/Main.h
View file

@ -6,3 +6,5 @@ extern BOOL bFullscreen;
void PutFramePerSecound(void); void PutFramePerSecound(void);
unsigned long GetFramePerSecound(void); unsigned long GetFramePerSecound(void);
BOOL SystemTask(void);

3
src/Organya.cpp
View file

@ -617,14 +617,13 @@ BOOL OrgData::InitMusicData(const char *path)
// データを有効に (Enable data) // データを有効に (Enable data)
for (j = 0; j < MAXMELODY; j++) for (j = 0; j < MAXMELODY; j++)
MakeOrganyaWave(j,info.tdata[j].wave_no, info.tdata[j].pipi); MakeOrganyaWave(j,info.tdata[j].wave_no, info.tdata[j].pipi);
#ifndef FIX_BUGS
// Pixel ripped out some code so he could use PixTone sounds as drums, but he left this dead code // Pixel ripped out some code so he could use PixTone sounds as drums, but he left this dead code
for (j = MAXMELODY; j < MAXTRACK; j++) for (j = MAXMELODY; j < MAXTRACK; j++)
{ {
i = info.tdata[j].wave_no; i = info.tdata[j].wave_no;
//InitDramObject(dram_name[i], j - MAXMELODY); //InitDramObject(dram_name[i], j - MAXMELODY);
} }
#endif
SetPlayPointer(0); // 頭出し (Cue) SetPlayPointer(0); // 頭出し (Cue)

4
src/WindowsWrapper.h
View file

@ -26,8 +26,4 @@ struct RECT
rect.right = r; \ rect.right = r; \
rect.bottom = b; rect.bottom = b;
#ifndef MAX_PATH
#define MAX_PATH FILENAME_MAX #define MAX_PATH FILENAME_MAX
#endif
BOOL SystemTask();