Merge branch 'master' of https://github.com/cuckydev/Cave-Story-Engine-2

.gitignore

@@ -4,7 +4,7 @@
 # Misc
 /obj
 Config.dat
-Profile.dat
+*rofile.dat
 build.7z
 build.zip
 

Makefile

@@ -1,18 +1,18 @@
 ifeq ($(RELEASE), 1)
 CXXFLAGS := -O3 -s
-FILENAME := release
+FILENAME ?= release
 else
 CXXFLAGS := -O0 -g
-FILENAME := debug
+FILENAME ?= debug
 endif
 
 ifeq ($(JAPANESE), 1)
 CXXFLAGS += -DJAPANESE
 LIBS += -liconv
 	ifeq ($(RELEASE), 1)
-	FILENAME := releasejp
+	FILENAME ?= releasejp
 	else
-	FILENAME := debugjp
+	FILENAME ?= debugjp
 	endif
 endif
 
@@ -21,14 +21,13 @@ CXXFLAGS += -DFIX_BUGS
 endif
 
 ifeq ($(WINDOWS), 1)
+	ifeq ($(CONSOLE), 1)
+		CXXFLAGS += -mconsole
+	endif
 	CXXFLAGS += -DWINDOWS
 	LIBS += -lkernel32
 endif
 
-ifeq ($(CONSOLE), 1)
-	CXXFLAGS += -mconsole
-endif
-
 CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags`
 LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs`
 

src/CommonDefines.h

@@ -1,5 +1,5 @@
 #pragma once
 #define PATH_LENGTH 260 //Pixel had the path size locked to 260 (dangerously low), if you tried to open the executable in a path with more than around 220 characters, it'd crash.
 
-#define WINDOW_WIDTH ((320*16)/9)
-#define WINDOW_HEIGHT 320
+#define WINDOW_WIDTH 320
+#define WINDOW_HEIGHT 240