yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Option to allow use of unicode or not

Browse Source
This commit is contained in:
yvt 2013-12-31 14:06:17 +09:00
parent d3efc0dca2
commit 2fdf763481
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Scripts/Gui/Preferences.as
View File

@ -643,8 +643,8 @@ namespace spades {
layouter.AddToggleField("Chat Notify Sounds", "cg_chatBeep");
layouter.AddToggleField("Hit Indicator", "cg_hitIndicator");
//layouter.AddHeading("AoS 0.75/0.76 Compatibility");
//layouter.AddToggleField("Compatible Charset", "cg_legacyCharset");
layouter.AddHeading("AoS 0.75/0.76 Compatibility");
layouter.AddToggleField("Allow Unicode", "cg_unicode");
layouter.AddHeading("Misc");
layouter.AddSliderField("Field of View", "cg_fov", 30, 90, 1,

15
Sources/Client/NetClient.cpp
View File

@ -42,7 +42,7 @@
#include <Core/CP437.h>
SPADES_SETTING(cg_protocolVersion, "3");
SPADES_SETTING(cg_legacyCharset, "1");
SPADES_SETTING(cg_unicode, "1");
namespace spades {
namespace client {
@ -97,13 +97,15 @@ namespace spades {
static std::string EncodeString(std::string str) {
auto str2 = CP437::Encode(str, -1);
if(!cg_unicode) {
// ignore fallbacks
return str2;
}
if(str2.find(-1) != std::string::npos) {
// some fallbacks; always use UTF8
str.insert(0, &UtfSign, 1);
}else{
if(cg_legacyCharset) {
str = str2;
}
str = str2;
}
return str;
}
@ -112,10 +114,7 @@ namespace spades {
if(s.size() > 0 && s[0] == UtfSign){
return s.substr(1);
}
if(cg_legacyCharset) {
return CP437::Decode(s);
}
return s;
return CP437::Decode(s);
}
class NetPacketReader {