diff --git a/Makefile_PS2 b/Makefile_PS2 index 9dcdbfc..158e5d2 100644 --- a/Makefile_PS2 +++ b/Makefile_PS2 @@ -13,7 +13,7 @@ EE_BIN = $(PROGRAM_PS2).elf # NOTE: CANNOT USE JUST 'PS2' AS A DEFINE, IT BREAKS EVERYTHING! EE_OBJS = $(PROGRAM_PS2).o -EE_CFLAGS += -DBUILDTOYS_PS2 -fdata-sections -ffunction-sections -I$(PS2SDK)/ports/include -Wformat=0 +EE_CFLAGS += -fdata-sections -ffunction-sections -I$(PS2SDK)/ports/include -Wformat=0 EE_LDFLAGS += -L$(PS2SDK)/ports/lib -L$(GSKIT)/lib -lSDL2 -lgskit -ldmakit -lps2_drivers -lm -Wl,--gc-sections ifeq ($(DUMMY_TIMEZONE), 1) diff --git a/make_ps2.sh b/make_ps2.sh index ee64278..38091c2 100755 --- a/make_ps2.sh +++ b/make_ps2.sh @@ -11,5 +11,6 @@ make -f Makefile_PS2 PROGRAM_PS2="$1" if [ "$#" -gt "1" ]; then echo "Running on $2" ps2client -h "$2" reset + sleep 1 ps2client -h "$2" execee host:$1.elf fi diff --git a/maze.c b/maze.c index 87c7422..2249aa9 100644 --- a/maze.c +++ b/maze.c @@ -1,5 +1,5 @@ // NOTE: CANNOT USE JUST 'PS2' AS A DEFINE, IT BREAKS EVERYTHING -#ifdef BUILDTOYS_PS2 +#ifdef _EE #define DIRECTBUILD #define H3D_VOLATILE_FLOATS #endif @@ -47,14 +47,13 @@ #define NUMMICE 1 // #define NOWALLS -#ifdef BUILDTOYS_PS2 +#ifdef _EE #define WIDTH 160 #define HEIGHT 120 #define SCREENSCALE 4 #define DITHERSTART 2.5 #define DITHEREND 3.5 -int fps = 24; -uint16_t sky = 0xF644; +int fps = 20; #else #define WIDTH 480 #define HEIGHT 300 @@ -63,7 +62,6 @@ uint16_t sky = 0xF644; #define DITHERSTART 10000 #define DITHEREND 10000 int fps = 30; -uint16_t sky = 0xF000; #endif #define ASPECT ((float)WIDTH / HEIGHT) @@ -128,6 +126,7 @@ const char POLYNAMES[NUMPOLYS][20] = {"tetrahedron"}; float fov = 90.0; float minlight = 0.15; float speed = 1.0; +uint16_t sky = 0xF644; struct vec2i dirtovec(uint8_t dir) { struct vec2i result; diff --git a/unigi.platform.sdl2 b/unigi.platform.sdl2 index f5adfe0..7761a39 160000 --- a/unigi.platform.sdl2 +++ b/unigi.platform.sdl2 @@ -1 +1 @@ -Subproject commit f5adfe0495095576721ab639fe4044147488c473 +Subproject commit 7761a397a86b0e94bf5d7280b3c2c65e3713fae8