From 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a Mon Sep 17 00:00:00 2001 From: Loki Rautio Date: Sat, 7 Mar 2026 21:12:22 -0600 Subject: Revert "Project modernization (#630)" This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817. --- Minecraft.Client/Orbis/user_malloc_for_tls.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Minecraft.Client/Orbis/user_malloc_for_tls.cpp') diff --git a/Minecraft.Client/Orbis/user_malloc_for_tls.cpp b/Minecraft.Client/Orbis/user_malloc_for_tls.cpp index d862b6b9..d1a8d255 100644 --- a/Minecraft.Client/Orbis/user_malloc_for_tls.cpp +++ b/Minecraft.Client/Orbis/user_malloc_for_tls.cpp @@ -39,7 +39,7 @@ int user_malloc_init_for_tls(void) return 1; } - addr = nullptr; + addr = NULL; //E Map direct memory to the process address space //J ダイレクトメモリをプロセスアドレス空間にマップする res = sceKernelMapDirectMemory(&addr, HEAP_SIZE, SCE_KERNEL_PROT_CPU_READ | SCE_KERNEL_PROT_CPU_WRITE, 0, s_memStart, s_memAlign); @@ -52,7 +52,7 @@ int user_malloc_init_for_tls(void) //E Generate mspace //J mspace を生成する s_mspace = sceLibcMspaceCreate("User Malloc For TLS", addr, HEAP_SIZE, 0); - if (s_mspace == nullptr) { + if (s_mspace == NULL) { //E Error handling //J エラー処理 return 1; @@ -67,7 +67,7 @@ int user_malloc_fini_for_tls(void) { int res; - if (s_mspace != nullptr) { + if (s_mspace != NULL) { //E Free mspace //J mspace を解放する res = sceLibcMspaceDestroy(s_mspace); -- cgit v1.2.3