diff --git a/src/Core.h b/src/Core.h index a1c8cc04b..20538c5c8 100644 --- a/src/Core.h +++ b/src/Core.h @@ -475,6 +475,7 @@ typedef cc_uint8 cc_bool; #undef CC_BUILD_ADVLIGHTING #undef CC_BUILD_FILESYSTEM #define CC_GFX_BACKEND CC_GFX_BACKEND_SOFTGPU + #define CC_DISABLE_EXTRA_MODELS #endif #endif @@ -506,7 +507,9 @@ typedef cc_uint8 cc_bool; #ifndef CC_BUILD_LOWMEM #define EXTENDED_BLOCKS #endif +#ifndef CC_BUILD_TINYMEM #define EXTENDED_TEXTURES +#endif #ifdef EXTENDED_BLOCKS typedef cc_uint16 BlockID; diff --git a/src/Model.c b/src/Model.c index 81ea7af61..b32af9f48 100644 --- a/src/Model.c +++ b/src/Model.c @@ -2381,6 +2381,7 @@ static void HoldModel_Register(void) { *#########################################################################################################################*/ static void RegisterDefaultModels(void) { Model_RegisterTexture(&human_tex); +#ifndef CC_DISABLE_EXTRA_MODELS Model_RegisterTexture(&chicken_tex); Model_RegisterTexture(&creeper_tex); Model_RegisterTexture(&pig_tex); @@ -2390,12 +2391,14 @@ static void RegisterDefaultModels(void) { Model_RegisterTexture(&spider_tex); Model_RegisterTexture(&zombie_tex); Model_RegisterTexture(&skinnedCube_tex); +#endif HumanoidModel_Register(); MakeModel(&human_model); Models.Human = &human_model; BlockModel_Register(); +#ifndef CC_DISABLE_EXTRA_MODELS ChickenModel_Register(); CreeperModel_Register(); PigModel_Register(); @@ -2411,6 +2414,7 @@ static void RegisterDefaultModels(void) { CorpseModel_Register(); SkinnedCubeModel_Register(); HoldModel_Register(); +#endif } static void OnContextLost(void* obj) { diff --git a/src/Screens.c b/src/Screens.c index a7a458215..ff022e506 100644 --- a/src/Screens.c +++ b/src/Screens.c @@ -435,6 +435,7 @@ void HUDScreen_Show(void) { /*########################################################################################################################* *----------------------------------------------------TabListOverlay-----------------------------------------------------* *#########################################################################################################################*/ +#ifdef CC_BUILD_NETWORKING #define GROUP_NAME_ID UInt16_MaxValue #define LIST_COLUMN_PADDING 5 #define LIST_NAMES_PER_COLUMN 16 @@ -883,6 +884,9 @@ void TabListOverlay_Show(cc_bool staysOpen) { s->staysOpen = staysOpen; Gui_Add((struct Screen*)s, GUI_PRIORITY_TABLIST); } +#else +void TabListOverlay_Show(cc_bool staysOpen) { } +#endif /*########################################################################################################################* diff --git a/src/TexturePack.h b/src/TexturePack.h index a2883d727..a3b14a255 100644 --- a/src/TexturePack.h +++ b/src/TexturePack.h @@ -21,8 +21,10 @@ extern struct IGameComponent Textures_Component; #define ATLAS2D_MASK 15 #define ATLAS2D_SHIFT 4 /* Maximum supported number of rows in the atlas. */ -#ifdef EXTENDED_TEXTURES +#if defined EXTENDED_TEXTURES #define ATLAS2D_MAX_ROWS_COUNT 32 +#elif defined CC_BUILD_TINYMEM + #define ATLAS2D_MAX_ROWS_COUNT 8 #else #define ATLAS2D_MAX_ROWS_COUNT 16 #endif