LegacyConsole/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-23 02:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::wstring

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:50:22 -06:00
parent 41db813a6d
commit cdc08700e4
581 changed files with 2156 additions and 2154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.Client/UI/Screens/JoinMultiplayerScreen.cpp
View File

@@ -24,7 +24,7 @@ void JoinMultiplayerScreen::init()
buttons.clear();
buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + 12, language->getElement(L"multiplayer.connect")));
buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + 12, language->getElement(L"gui.cancel")));
wstring ip = replaceAll(minecraft->options->lastMpIp,L"_", L":");
std::wstring ip = replaceAll(minecraft->options->lastMpIp,L"_", L":");
buttons[0]->active = ip.length() > 0;
ipEdit = new EditBox(this, font, width / 2 - 100, height / 4 - 10 + 50 + 18, 200, 20, ip);
@@ -47,19 +47,19 @@ void JoinMultiplayerScreen::buttonClicked(Button *button)
}
else if (button->id == 0)
{
wstring ip = trimString(ipEdit->getValue());
std::wstring ip = trimString(ipEdit->getValue());
minecraft->options->lastMpIp = replaceAll(ip,L":", L"_");
minecraft->options->save();
vector<wstring> parts = stringSplit(ip,L'L');
vector<std::wstring> parts = stringSplit(ip,L'L');
if (ip[0]==L'[')
{
int pos = (int)ip.find(L"]");
if (pos != wstring::npos)
if (pos != std::wstring::npos)
{
wstring path = ip.substr(1, pos);
wstring port = trimString(ip.substr(pos + 1));
std::wstring path = ip.substr(1, pos);
std::wstring port = trimString(ip.substr(pos + 1));
if (port[0]==L':' && port.length() > 0)
{
port = port.substr(1);
@@ -86,7 +86,7 @@ void JoinMultiplayerScreen::buttonClicked(Button *button)
}
}
int JoinMultiplayerScreen::parseInt(const wstring& str, int def)
int JoinMultiplayerScreen::parseInt(const std::wstring& str, int def)
{
return _fromString<int>(str);
}