matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for msvc warnings

Browse Source
This commit is contained in:
mniip 2020-03-25 00:06:01 +03:00
parent 8e67a6ff89
commit e317164c2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/localization/EN.cpp
View File

@ -25,7 +25,7 @@ struct LocaleEN : public Locale
{ {
return return
U"\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - https://powdertoy.co.uk, irc.freenode.net #powder\n" U"\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - https://powdertoy.co.uk, irc.freenode.net #powder\n"
"\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\n" U"\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\uE069\n"
"\n" "\n"
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n" "\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
"\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n" "\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"

2
src/gui/interface/DropDown.cpp
View File

@ -120,7 +120,7 @@ std::pair<String, int> DropDown::GetOption()
{ {
return options[optionIndex]; return options[optionIndex];
} }
return std::pair<String, int>("", -1); return std::pair<String, int>(""_ascii, -1);
} }
void DropDown::SetOption(String option) void DropDown::SetOption(String option)