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

refactor: nuke all widestrings and widechars everywhere

Browse Source
This commit is contained in:
Tropical
2026-04-07 23:20:09 -05:00
parent f1f1d116b3
commit 2912e9ae2e
1323 changed files with 23207 additions and 23399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
targets/app/common/Tutorial/Tutorial.cpp
View File

@@ -2442,27 +2442,27 @@ bool Tutorial::setMessage(PopupMessageDetails* message) {
if (!message->m_replaceCurrent)
lastMessageTime = time_util::clock::now();
std::wstring text;
std::string text;
if (!message->m_messageString.empty()) {
text = message->m_messageString;
} else {
auto it = messages.find(message->m_messageId);
if (it != messages.end() && it->second != nullptr) {
TutorialMessage* messageString = it->second;
text = std::wstring(messageString->getMessageForDisplay());
text = std::string(messageString->getMessageForDisplay());
// 4J Stu - Quick fix for boat tutorial being incorrect
if (message->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) {
text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}",
L"{*CONTROLLER_ACTION_DISMOUNT*}");
text = replaceAll(text, "{*CONTROLLER_ACTION_USE*}",
"{*CONTROLLER_ACTION_DISMOUNT*}");
}
} else {
text = std::wstring(app.GetString(message->m_messageId));
text = std::string(app.GetString(message->m_messageId));
// 4J Stu - Quick fix for boat tutorial being incorrect
if (message->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) {
text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}",
L"{*CONTROLLER_ACTION_DISMOUNT*}");
text = replaceAll(text, "{*CONTROLLER_ACTION_USE*}",
"{*CONTROLLER_ACTION_DISMOUNT*}");
}
}
}
@@ -2477,7 +2477,7 @@ bool Tutorial::setMessage(PopupMessageDetails* message) {
}
}
std::wstring title;
std::string title;
TutorialPopupInfo popupInfo;
popupInfo.interactScene = m_UIScene;
popupInfo.desc = text.c_str();
@@ -2488,7 +2488,7 @@ bool Tutorial::setMessage(PopupMessageDetails* message) {
popupInfo.tutorial = this;
if (!message->m_titleString.empty() || message->m_titleId > 0) {
if (message->m_titleString.empty())
title = std::wstring(app.GetString(message->m_titleId));
title = std::string(app.GetString(message->m_titleId));
else
title = message->m_titleString;
@@ -2541,7 +2541,7 @@ bool Tutorial::setMessage(TutorialHint* hint, PopupMessageDetails* message) {
return messageShown;
}
bool Tutorial::setMessage(const std::wstring& messageString, int icon,
bool Tutorial::setMessage(const std::string& messageString, int icon,
int auxValue) {
PopupMessageDetails* message = new PopupMessageDetails();
message->m_messageString = messageString;