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

fix: accidentally declared static in the implementation

Browse source
This commit is contained in:
Tropical 2026-03-12 03:14:32 -05:00
parent b20c17c4b7
commit 682c898563
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Platform/Common/UI/UIScene.cpp
View file

@ -1248,7 +1248,7 @@ bool UIScene::isReadyToDelete()
return true; return true;
} }
static int UIScene::parseSlotId(const char16_t *s) { int UIScene::parseSlotId(const char16_t *s) {
// must be nonnull, must start with 'slot_', first char after the underscore must be a digit // must be nonnull, must start with 'slot_', first char after the underscore must be a digit
if (!s || if (!s ||
(s[0] != u's' || s[1] != u'l' || s[2] != u'o' || s[3] != u't' || (s[0] != u's' || s[1] != u'l' || s[2] != u'o' || s[3] != u't' ||

2
Minecraft.Client/Platform/Common/UI/UIScene_DebugOverlay.cpp
View file

@ -120,7 +120,7 @@ void UIScene_DebugOverlay::customDraw(IggyCustomDrawCallbackRegion *region)
if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return; if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
int itemId = -1; int itemId = -1;
// 4jcraft: TODO: UB on our platform since this casts char16_t* to wchar_t* // 4jcraft TODO: UB on our platform since this casts char16_t* to wchar_t*
swscanf((wchar_t*)region->name,L"item_%d",&itemId); swscanf((wchar_t*)region->name,L"item_%d",&itemId);
if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == NULL) if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == NULL)
{ {

1
Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp
View file

@ -714,6 +714,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion *region) void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion *region)
{ {
int characterId = -1; int characterId = -1;
// 4jcraft TODO: undefined behavior
swscanf((wchar_t*)region->name,L"Character%d",&characterId); swscanf((wchar_t*)region->name,L"Character%d",&characterId);
if (characterId == -1) if (characterId == -1)
{ {