backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-03 10:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed more inconsistencies around win64 macro and iggy

Browse source
This commit is contained in:
niansa 2026-03-11 23:13:33 +01:00
parent a20ca009b5
commit dcb409631c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
View file

@ -21,7 +21,7 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
value[0].number = (F64)4; value[0].number = (F64)4;
#elif defined __PSVITA__ #elif defined __PSVITA__
value[0].number = (F64)5; value[0].number = (F64)5;
#elif defined _WINDOWS64 #elif defined _WINDOWS64 || defined __linux__
value[0].number = (F64)0; value[0].number = (F64)0;
#endif #endif
IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value ); IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value );
@ -30,4 +30,4 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
std::wstring UIComponent_DebugUIMarketingGuide::getMoviePath() std::wstring UIComponent_DebugUIMarketingGuide::getMoviePath()
{ {
return L"DebugUIMarketingGuide"; return L"DebugUIMarketingGuide";
} }

6
Minecraft.Client/Platform/Common/UI/UIController.cpp
View file

@ -566,7 +566,7 @@ void UIController::ReloadSkin()
m_iggyLibraries[i] = IGGY_INVALID_LIBRARY; m_iggyLibraries[i] = IGGY_INVALID_LIBRARY;
} }
#ifdef _WINDOWS64 || defined(__linux__)) #if defined _WINDOWS64 || defined __linux__
// 4J Stu - Don't load on a thread on windows. I haven't investigated this in detail, so a quick fix // 4J Stu - Don't load on a thread on windows. I haven't investigated this in detail, so a quick fix
reloadSkinThreadProc(this); reloadSkinThreadProc(this);
#else #else
@ -613,7 +613,7 @@ int UIController::reloadSkinThreadProc(void* lpParam)
controller->m_groups[eUIGroup_Fullscreen]->ReloadAll(); controller->m_groups[eUIGroup_Fullscreen]->ReloadAll();
// 4J Stu - Don't do this on windows, as we never navigated forwards to start with // 4J Stu - Don't do this on windows, as we never navigated forwards to start with
#ifndef _WINDOW64 #if ! (defined _WINDOWS64 || defined __linux__)
controller->NavigateBack(0, false, eUIScene_COUNT, eUILayer_Tooltips); controller->NavigateBack(0, false, eUIScene_COUNT, eUILayer_Tooltips);
#endif #endif
LeaveCriticalSection(&ms_reloadSkinCS); LeaveCriticalSection(&ms_reloadSkinCS);
@ -2546,7 +2546,7 @@ void UIController::setFontCachingCalculationBuffer(int length)
draw call is not large enough, Iggy will crash or otherwise behave draw call is not large enough, Iggy will crash or otherwise behave
incorrectly. incorrectly.
*/ */
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 #if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __linux__
static const int CHAR_SIZE = 24; static const int CHAR_SIZE = 24;
#else #else
static const int CHAR_SIZE = 16; static const int CHAR_SIZE = 16;