Skip to content

fix(lobby): Keep Unicode characters in the saved lobby name #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tintinhamans wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −30
Open

fix(lobby): Keep Unicode characters in the saved lobby name #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Core/GameEngine/Include/Common/UserPreferences.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ class UserPreferences : public PreferenceMap
Real getReal(AsciiString key, Real defaultValue) const;
Int getInt(AsciiString key, Int defaultValue) const;
AsciiString getAsciiString(AsciiString key, AsciiString defaultValue) const;
UnicodeString getUnicodeString(AsciiString key, UnicodeString defaultValue) const;

void setBool(AsciiString key, Bool val);
void setReal(AsciiString key, Real val);
void setInt(AsciiString key, Int val);
void setAsciiString(AsciiString key, AsciiString val);
void setUnicodeString(AsciiString key, UnicodeString val);

protected:
AsciiString m_filename;
Expand Down
34 changes: 24 additions & 10 deletions Core/GameEngine/Source/Common/UserPreferences.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,19 @@ AsciiString UserPreferences::getAsciiString(AsciiString key, AsciiString default
return it->second;
}

UnicodeString UserPreferences::getUnicodeString(AsciiString key, UnicodeString defaultValue) const
{
UserPreferences::const_iterator it = find(key);
if (it == end())
{
return defaultValue;
}

UnicodeString ret;
ret.translate(it->second);
return ret;
}

void UserPreferences::setBool(AsciiString key, Bool val)
{
(*this)[key] = boolAsStr(val);
Expand All @@ -280,6 +293,13 @@ void UserPreferences::setAsciiString(AsciiString key, AsciiString val)
(*this)[key] = val;
}

void UserPreferences::setUnicodeString(AsciiString key, UnicodeString val)
{
AsciiString str;
str.translate(val);
(*this)[key] = str;
}

//-----------------------------------------------------------------------------
// QuickMatchPreferences base class
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -515,22 +535,16 @@ void CustomMatchPreferences::setLastLadder(const AsciiString& addr, UnsignedShor
(*this)["LastLadderPort"] = strVal;
}

AsciiString CustomMatchPreferences::getLastLobbyName() const
UnicodeString CustomMatchPreferences::getLastLobbyName() const
{
CustomMatchPreferences::const_iterator it = find("LastLobbyName");
if (it == end())
{
return AsciiString::TheEmptyString;
}

AsciiString ret = it->second;
UnicodeString ret = getUnicodeString("LastLobbyName", UnicodeString::TheEmptyString);
ret.trim();
return ret;
}

void CustomMatchPreferences::setLastLobbyName(const AsciiString& name)
void CustomMatchPreferences::setLastLobbyName(const UnicodeString& name)
{
(*this)["LastLobbyName"] = name;
setUnicodeString("LastLobbyName", name);
}

AsciiString CustomMatchPreferences::getLastLadderAddr( void )
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ class CustomMatchPreferences : public UserPreferences
CustomMatchPreferences();
virtual ~CustomMatchPreferences() override;

AsciiString getLastLobbyName() const;
void setLastLobbyName(const AsciiString& name);
UnicodeString getLastLobbyName() const;
void setLastLobbyName(const UnicodeString& name);

void setLastLadder(const AsciiString& addr, UnsignedShort port);
AsciiString getLastLadderAddr();
Expand Down
21 changes: 3 additions & 18 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,8 @@ void PopupHostGameInit( WindowLayout *layout, void *userData )
#if defined(GENERALS_ONLINE)
{
CustomMatchPreferences pref;
AsciiString lastLobbyName = pref.getLastLobbyName();
if (!lastLobbyName.isEmpty())
{
name.translate(lastLobbyName.str());
}
else
name = pref.getLastLobbyName();
if (name.isEmpty())
{
name.translate("Generals Online Lobby");
}
Expand Down Expand Up @@ -605,19 +601,8 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
#if defined(GENERALS_ONLINE)
// save last used lobby name to CustomPref.ini
{
char buffer[256];
const WideChar* w = name.str();
int i = 0;
for (; w[i] != 0 && i < 255; ++i)
{
buffer[i] = (char)(w[i] & 0xFF);
}
buffer[i] = 0;

AsciiString lobbyNameAscii = buffer;

CustomMatchPreferences pref;
pref.setLastLobbyName(lobbyNameAscii);
pref.setLastLobbyName(name);
pref.write();
}
#endif
Expand Down
Loading