shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge branch 'accurate' into portable

--- a/Makefile

+++ b/Makefile

@@ -8,15 +8,19 @@

 # Default options

 RENDERER ?= Texture

+ifeq ($(WINDOWS), 1)

+	EXE_EXTENSION = .exe

+endif

+

 ifeq ($(RELEASE), 1)

 	CXXFLAGS = -O3

 	LDFLAGS = -s

-	FILENAME_DEF = CSE2

-	DOCONFIG_FILENAME_DEF = DoConfig

+	FILENAME_DEF = CSE2$(EXE_EXTENSION)

+	DOCONFIG_FILENAME_DEF = DoConfig$(EXE_EXTENSION)

 else

 	CXXFLAGS = -Og -ggdb3

-	FILENAME_DEF = CSE2_debug

-	DOCONFIG_FILENAME_DEF = DoConfig_debug

+	FILENAME_DEF = CSE2_debug$(EXE_EXTENSION)

+	DOCONFIG_FILENAME_DEF = DoConfig_debug$(EXE_EXTENSION)

 endif

 ifeq ($(JAPANESE), 1)

--- a/src/Draw.cpp

+++ b/src/Draw.cpp

@@ -13,6 +13,7 @@

 #include "Ending.h"

 #include "Generic.h"

 #include "MapName.h"

+#include "Main.h"

 #include "Resource.h"

 #include "Tags.h"

 #include "TextScr.h"

--- a/src/Main.h

+++ b/src/Main.h

@@ -6,3 +6,5 @@

 void PutFramePerSecound(void);

 unsigned long GetFramePerSecound(void);

+

+BOOL SystemTask(void);

--- a/src/Organya.cpp

+++ b/src/Organya.cpp

@@ -617,7 +617,7 @@

 	// データを有効に (Enable data)

 	for (j = 0; j < MAXMELODY; j++)

 		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

 	for (j = MAXMELODY; j < MAXTRACK; j++)

 	{

@@ -624,7 +624,6 @@

 		i = info.tdata[j].wave_no;

 		//InitDramObject(dram_name[i], j - MAXMELODY);

 	}

-#endif

 	SetPlayPointer(0);	// 頭出し (Cue)

--- a/src/WindowsWrapper.h

+++ b/src/WindowsWrapper.h

@@ -26,8 +26,4 @@

 	rect.right = r; \

 	rect.bottom = b;

-#ifndef MAX_PATH

 #define MAX_PATH FILENAME_MAX

-#endif

-

-BOOL SystemTask();

-- 

⑨