AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 09:35:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

NDS: Fix log messages logging extra blank lines

Browse Source
This commit is contained in:
UnknownShadow200 2025-03-02 08:51:23 +11:00
parent 022855eca2
commit 49cc96b0c4
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/ds/Makefile.arm9
View File

@ -60,7 +60,7 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \
CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \ CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -O2 -ffunction-sections -fdata-sections \ $(ARCH) -O2 -ffunction-sections -fdata-sections \
-specs=$(SPECS) -specs=$(SPECS) -Wstack-usage=10000
LDFLAGS := $(ARCH) $(LIBDIRSFLAGS) -Wl,-Map,$(MAP) $(DEFINES) \ LDFLAGS := $(ARCH) $(LIBDIRSFLAGS) -Wl,-Map,$(MAP) $(DEFINES) \
-Wl,--start-group $(LIBS) -Wl,--end-group -specs=$(SPECS) -Wl,--start-group $(LIBS) -Wl,--end-group -specs=$(SPECS)

3
src/MenuOptions.c
View File

@ -471,8 +471,7 @@ static void MenuOptionsScreen_Render(void* screen, float delta) {
} }
static void MenuOptionsScreen_Free(void* screen) { static void MenuOptionsScreen_Free(void* screen) {
struct MenuOptionsScreen* s = (struct MenuOptionsScreen*)screen; Event_Unregister_(&UserEvents.HackPermsChanged, screen, MenuOptionsScreen_OnHacksChanged);
Event_Unregister_(&UserEvents.HackPermsChanged, screen, MenuOptionsScreen_OnHacksChanged);
Event_Unregister_(&WorldEvents.LightingModeChanged, screen, MenuOptionsScreen_OnLightingModeServerChanged); Event_Unregister_(&WorldEvents.LightingModeChanged, screen, MenuOptionsScreen_OnLightingModeServerChanged);
MenuInputOverlay_Close(false); MenuInputOverlay_Close(false);
} }

8
src/Platform_NDS.c
View File

@ -76,13 +76,7 @@ cc_uint64 Stopwatch_Measure(void) {
static void LogNocash(const char* msg, int len) { static void LogNocash(const char* msg, int len) {
// Can only be up to 120 bytes total // Can only be up to 120 bytes total
char buffer[120]; nocashWrite(msg, min(len, 120));
len = min(len, 118);
Mem_Copy(buffer, msg, len);
buffer[len + 0] = '\n';
buffer[len + 1] = '\0';
nocashWrite(buffer, len + 2);
} }
extern void Console_Clear(void); extern void Console_Clear(void);

5
src/TouchUI.c
View File

@ -532,10 +532,9 @@ static void TouchScreen_TabClick(void* s, void* w) {
} }
static void TouchScreen_BindClick(void* screen, void* widget) { static void TouchScreen_BindClick(void* screen, void* widget) {
struct TouchScreen* s = (struct TouchScreen*)screen; struct ButtonWidget* btn = (struct ButtonWidget*)widget;
struct ButtonWidget* btn = (struct ButtonWidget*)widget;
struct TouchButtonDesc* desc = (struct TouchButtonDesc*)btn->meta.ptr; struct TouchButtonDesc* desc = (struct TouchButtonDesc*)btn->meta.ptr;
if (!Bind_OnTriggered[desc->bind]) return; if (!Bind_OnTriggered[desc->bind]) return;
Bind_OnTriggered[desc->bind](0, &TouchDevice); Bind_OnTriggered[desc->bind](0, &TouchDevice);
} }