From 0e80ed450b1dda71234c0f164bf8c1a55bceafe7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Dec 2023 01:28:22 -0800 Subject: [PATCH] d_resorce match thanks to hatal175 --- src/d/d_resorce.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 6d87a1177..ca09df9b5 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -706,17 +706,8 @@ int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoNum) { /* 8006F430-8006F500 .text setStageRes__14dRes_control_cFPCcP7JKRHeap */ int dRes_control_c::setStageRes(char const* pArcName, JKRHeap* pHeap) { - // very strange ordering of loads for the snprintf call - - bool special = false; - - if (strcmp(dComIfGp_getStartStageName(), "ma2room") == 0 && dComIfGs_isEventBit(0x1820)) - special = true; - - const char *fmt = "/res/Stage/%s/"; - char path[20]; - snprintf(path, sizeof(path), fmt, special ? "ma3room" : dComIfGp_getStartStageName()); + snprintf(path, sizeof(path), "/res/Stage/%s/", strcmp(dComIfGp_getStartStageName(), "ma2room") == 0 && dComIfGs_isEventBit(0x1820) ? "ma3room" : dComIfGp_getStartStageName()); return setRes(pArcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo), path, 1, pHeap); }