AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-10 07:49:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Saturn/32x: Avoid TINYSTACK, fixes normal world generation not working on Saturn

Browse Source
This commit is contained in:
UnknownShadow200 2025-01-22 20:11:01 +11:00
parent 8a9c38f05c
commit 76f98d30f0
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/saturn/Makefile
View File

@ -20,7 +20,8 @@ IP_RELEASE_DATE:= 20230101
IP_AREAS:= JTUBKAEL IP_AREAS:= JTUBKAEL
IP_PERIPHERALS:= JAMKST IP_PERIPHERALS:= JAMKST
IP_TITLE:= ClassiCube IP_TITLE:= ClassiCube
IP_MASTER_STACK_ADDR:= 0x06004000 #IP_MASTER_STACK_ADDR:= 0x06004000
IP_MASTER_STACK_ADDR:= 0x06100000
IP_SLAVE_STACK_ADDR:= 0x06001E00 IP_SLAVE_STACK_ADDR:= 0x06001E00
IP_1ST_READ_ADDR:= 0x06004000 IP_1ST_READ_ADDR:= 0x06004000
IP_1ST_READ_SIZE:= 0 IP_1ST_READ_SIZE:= 0

4
src/Bitmap.c
View File

@ -358,11 +358,7 @@ cc_result Png_Decode(struct Bitmap* bmp, struct Stream* stream) {
int curY; int curY;
/* idat decompressor */ /* idat decompressor */
#ifdef CC_BUILD_TINYSTACK
static struct InflateState inflate;
#else
struct InflateState inflate; struct InflateState inflate;
#endif
struct Stream compStream, datStream; struct Stream compStream, datStream;
struct ZLibHeader zlibHeader; struct ZLibHeader zlibHeader;
cc_uint8* data = NULL; cc_uint8* data = NULL;

6
src/Builder.c
View File

@ -364,11 +364,15 @@ void Builder_MakeChunk(struct ChunkInfo* info) {
/* The Saturn build only has 16 kb stack, not large enough */ /* The Saturn build only has 16 kb stack, not large enough */
static BlockID chunk[EXTCHUNK_SIZE_3]; static BlockID chunk[EXTCHUNK_SIZE_3];
static cc_uint8 counts[CHUNK_SIZE_3 * FACE_COUNT]; static cc_uint8 counts[CHUNK_SIZE_3 * FACE_COUNT];
static int bitFlags[1];
#else #else
BlockID chunk[EXTCHUNK_SIZE_3]; BlockID chunk[EXTCHUNK_SIZE_3];
cc_uint8 counts[CHUNK_SIZE_3 * FACE_COUNT]; cc_uint8 counts[CHUNK_SIZE_3 * FACE_COUNT];
#endif
#ifdef CC_BUILD_ADVLIGHTING
int bitFlags[EXTCHUNK_SIZE_3]; int bitFlags[EXTCHUNK_SIZE_3];
#else
int bitFlags[1];
#endif #endif
cc_bool allAir, allSolid, onBorder; cc_bool allAir, allSolid, onBorder;

2
src/Core.h
View File

@ -490,7 +490,6 @@ typedef cc_uint8 cc_bool;
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#define CC_BUILD_SMALLSTACK #define CC_BUILD_SMALLSTACK
#define CC_BUILD_TINYSTACK
#define CC_BUILD_NOFPU #define CC_BUILD_NOFPU
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#undef CC_BUILD_NETWORKING #undef CC_BUILD_NETWORKING
@ -507,7 +506,6 @@ typedef cc_uint8 cc_bool;
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#define CC_BUILD_SMALLSTACK #define CC_BUILD_SMALLSTACK
#define CC_BUILD_TINYSTACK
#define CC_BUILD_NOFPU #define CC_BUILD_NOFPU
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#undef CC_BUILD_NETWORKING #undef CC_BUILD_NETWORKING