Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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 a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Minecraft.Client/PSVita/PSVitaExtras/user_new.cpp
View File

@@ -28,13 +28,13 @@ void *user_new(std::size_t size) throw(std::bad_alloc)
if (size == 0)
size = 1;
while ((ptr = (void *)std::malloc(size)) == nullptr) {
while ((ptr = (void *)std::malloc(size)) == NULL) {
/**E Obtain new_handler */
/**J new_handler を取得する */
std::new_handler handler = std::_get_new_handler();
/**E When new_handler is a nullptr pointer, bad_alloc is send. If not, new_handler is called. */
/**J new_handler が nullptr ポインタの場合、bad_alloc を送出する、そうでない場合、new_handler を呼び出す */
/**E When new_handler is a NULL pointer, bad_alloc is send. If not, new_handler is called. */
/**J new_handler が NULL ポインタの場合、bad_alloc を送出する、そうでない場合、new_handler を呼び出す */
if (!handler)
throw std::bad_alloc();
else
@@ -56,22 +56,22 @@ void *user_new(std::size_t size, const std::nothrow_t& x) throw()
if (size == 0)
size = 1;
while ((ptr = (void *)std::malloc(size)) == nullptr) {
while ((ptr = (void *)std::malloc(size)) == NULL) {
/**E Obtain new_handler */
/**J new_handler を取得する */
std::new_handler handler = std::_get_new_handler();
/**E When new_handler is a nullptr pointer, nullptr is returned. */
/**J new_handler が nullptr ポインタの場合、nullptr を返す */
/**E When new_handler is a NULL pointer, NULL is returned. */
/**J new_handler が NULL ポインタの場合、NULL を返す */
if (!handler)
return nullptr;
return NULL;
/**E Call new_handler. If new_handler sends bad_alloc, nullptr is returned. */
/**J new_handler を呼び出す、new_handler が bad_alloc を送出した場合、nullptr を返す */
/**E Call new_handler. If new_handler sends bad_alloc, NULL is returned. */
/**J new_handler を呼び出す、new_handler が bad_alloc を送出した場合、NULL を返す */
try {
(*handler)();
} catch (std::bad_alloc) {
return nullptr;
return NULL;
}
}
return ptr;
@@ -98,9 +98,9 @@ void *user_new_array(std::size_t size, const std::nothrow_t& x) throw()
void user_delete(void *ptr) throw()
{
// SCE_DBG_LOG_TRACE("Called operator delete(%p)", ptr);
/**E In the case of the nullptr pointer, no action will be taken. */
/**J nullptr ポインタの場合、何も行わない */
if (ptr != nullptr)
/**E In the case of the NULL pointer, no action will be taken. */
/**J NULL ポインタの場合、何も行わない */
if (ptr != NULL)
std::free(ptr);
}