From 6aeb0aa74bad7abb5a9a19c2c7a35eab2ac76823 Mon Sep 17 00:00:00 2001 From: mniip Date: Tue, 31 Mar 2020 06:30:56 +0300 Subject: [PATCH] remove _ascii and undeprecate conversions from string literals --- data/localization/EN.cpp | 6 +- src/PowderToySDL.cpp | 4 +- src/client/Client.cpp | 36 ++++---- src/client/Client.h | 2 +- src/client/GameSave.cpp | 22 ++--- src/client/MD5.cpp | 2 +- src/client/MD5.h | 2 +- src/client/SaveFile.cpp | 2 +- src/client/SaveInfo.cpp | 2 +- src/common/String.h | 22 +++-- src/debug/DebugLines.cpp | 4 +- src/debug/DebugParts.cpp | 2 +- src/debug/ElementPopulation.cpp | 2 +- src/graphics/Graphics.cpp | 4 +- src/gui/colourpicker/ColourPickerActivity.cpp | 10 +-- src/gui/console/ConsoleController.cpp | 2 +- src/gui/console/ConsoleModel.cpp | 4 +- src/gui/console/ConsoleView.cpp | 8 +- .../elementsearch/ElementSearchActivity.cpp | 8 +- src/gui/filebrowser/FileBrowserActivity.cpp | 6 +- src/gui/font/FontEditor.cpp | 24 +++--- src/gui/game/GameController.cpp | 8 +- src/gui/game/GameModel.cpp | 18 ++-- src/gui/game/GameView.cpp | 60 ++++++------- src/gui/game/PropertyTool.cpp | 16 ++-- src/gui/game/QuickOptions.cpp | 12 +-- src/gui/game/RenderPreset.h | 2 +- src/gui/game/SignTool.cpp | 2 +- src/gui/game/Tool.h | 6 +- src/gui/interface/Button.cpp | 2 +- src/gui/interface/DropDown.cpp | 2 +- src/gui/interface/Label.cpp | 4 +- src/gui/interface/ProgressBar.cpp | 2 +- src/gui/interface/RichLabel.cpp | 4 +- src/gui/interface/SaveButton.cpp | 4 +- src/gui/interface/Textbox.cpp | 14 +-- src/gui/interface/Window.cpp | 4 +- src/gui/localbrowser/LocalBrowserView.cpp | 4 +- src/gui/login/LoginView.cpp | 4 +- src/gui/options/OptionsView.cpp | 26 +++--- src/gui/preview/PreviewView.cpp | 40 ++++----- src/gui/profile/ProfileActivity.cpp | 2 +- src/gui/render/RenderView.cpp | 10 +-- src/gui/save/LocalSaveActivity.cpp | 2 +- src/gui/save/ServerSaveActivity.cpp | 6 +- src/gui/search/SearchController.cpp | 2 +- src/gui/search/SearchModel.cpp | 12 +-- src/gui/search/SearchView.cpp | 18 ++-- src/gui/tags/TagsView.cpp | 4 +- src/lua/LegacyLuaAPI.cpp | 6 +- src/lua/LuaCheckbox.cpp | 2 +- src/lua/LuaScriptInterface.cpp | 54 ++++++------ src/lua/TPTSTypes.cpp | 2 +- src/lua/TPTScriptInterface.cpp | 58 ++++++------- src/simulation/Element.cpp | 2 +- src/simulation/Sign.cpp | 24 +++--- src/simulation/SimTool.cpp | 2 +- src/simulation/SimulationData.cpp | 86 +++++++++---------- src/simulation/elements/ACEL.cpp | 2 +- src/simulation/elements/ACID.cpp | 2 +- src/simulation/elements/AMTR.cpp | 2 +- src/simulation/elements/ANAR.cpp | 2 +- src/simulation/elements/ARAY.cpp | 2 +- src/simulation/elements/BANG.cpp | 2 +- src/simulation/elements/BCLN.cpp | 2 +- src/simulation/elements/BCOL.cpp | 2 +- src/simulation/elements/BGLA.cpp | 2 +- src/simulation/elements/BHOL.cpp | 2 +- src/simulation/elements/BIZR.cpp | 2 +- src/simulation/elements/BIZRG.cpp | 2 +- src/simulation/elements/BIZRS.cpp | 2 +- src/simulation/elements/BMTL.cpp | 2 +- src/simulation/elements/BOMB.cpp | 2 +- src/simulation/elements/BOYL.cpp | 2 +- src/simulation/elements/BRAY.cpp | 2 +- src/simulation/elements/BRCK.cpp | 2 +- src/simulation/elements/BREC.cpp | 2 +- src/simulation/elements/BRMT.cpp | 2 +- src/simulation/elements/BTRY.cpp | 2 +- src/simulation/elements/BVBR.cpp | 2 +- src/simulation/elements/C5.cpp | 2 +- src/simulation/elements/CAUS.cpp | 2 +- src/simulation/elements/CBNW.cpp | 2 +- src/simulation/elements/CFLM.cpp | 2 +- src/simulation/elements/CLNE.cpp | 2 +- src/simulation/elements/CLST.cpp | 2 +- src/simulation/elements/CNCT.cpp | 2 +- src/simulation/elements/CO2.cpp | 2 +- src/simulation/elements/COAL.cpp | 2 +- src/simulation/elements/CONV.cpp | 2 +- src/simulation/elements/CRAY.cpp | 2 +- src/simulation/elements/CRMC.cpp | 2 +- src/simulation/elements/DCEL.cpp | 2 +- src/simulation/elements/DESL.cpp | 2 +- src/simulation/elements/DEST.cpp | 2 +- src/simulation/elements/DEUT.cpp | 2 +- src/simulation/elements/DLAY.cpp | 2 +- src/simulation/elements/DMG.cpp | 2 +- src/simulation/elements/DMND.cpp | 2 +- src/simulation/elements/DRAY.cpp | 2 +- src/simulation/elements/DRIC.cpp | 2 +- src/simulation/elements/DSTW.cpp | 2 +- src/simulation/elements/DTEC.cpp | 2 +- src/simulation/elements/DUST.cpp | 2 +- src/simulation/elements/DYST.cpp | 2 +- src/simulation/elements/E116.cpp | 2 +- src/simulation/elements/E146.cpp | 2 +- src/simulation/elements/ELEC.cpp | 2 +- src/simulation/elements/EMBR.cpp | 2 +- src/simulation/elements/EMP.cpp | 2 +- src/simulation/elements/ETRD.cpp | 2 +- src/simulation/elements/EXOT.cpp | 2 +- src/simulation/elements/FIGH.cpp | 2 +- src/simulation/elements/FILT.cpp | 2 +- src/simulation/elements/FIRE.cpp | 2 +- src/simulation/elements/FIRW.cpp | 2 +- src/simulation/elements/FOG.cpp | 2 +- src/simulation/elements/FRAY.cpp | 2 +- src/simulation/elements/FRME.cpp | 2 +- src/simulation/elements/FRZW.cpp | 2 +- src/simulation/elements/FRZZ.cpp | 2 +- src/simulation/elements/FSEP.cpp | 2 +- src/simulation/elements/FUSE.cpp | 2 +- src/simulation/elements/FWRK.cpp | 2 +- src/simulation/elements/GAS.cpp | 2 +- src/simulation/elements/GBMB.cpp | 2 +- src/simulation/elements/GEL.cpp | 2 +- src/simulation/elements/GLAS.cpp | 2 +- src/simulation/elements/GLOW.cpp | 2 +- src/simulation/elements/GOLD.cpp | 2 +- src/simulation/elements/GOO.cpp | 2 +- src/simulation/elements/GPMP.cpp | 2 +- src/simulation/elements/GRAV.cpp | 2 +- src/simulation/elements/GRVT.cpp | 2 +- src/simulation/elements/GUNP.cpp | 2 +- src/simulation/elements/H2.cpp | 2 +- src/simulation/elements/HEAC.cpp | 2 +- src/simulation/elements/HSWC.cpp | 2 +- src/simulation/elements/ICEI.cpp | 2 +- src/simulation/elements/IGNT.cpp | 2 +- src/simulation/elements/INSL.cpp | 2 +- src/simulation/elements/INST.cpp | 2 +- src/simulation/elements/INVIS.cpp | 2 +- src/simulation/elements/INWR.cpp | 2 +- src/simulation/elements/IRON.cpp | 2 +- src/simulation/elements/ISOZ.cpp | 2 +- src/simulation/elements/ISZS.cpp | 2 +- src/simulation/elements/LAVA.cpp | 2 +- src/simulation/elements/LCRY.cpp | 2 +- src/simulation/elements/LDTC.cpp | 2 +- src/simulation/elements/LIFE.cpp | 2 +- src/simulation/elements/LIGH.cpp | 2 +- src/simulation/elements/LNTG.cpp | 2 +- src/simulation/elements/LO2.cpp | 2 +- src/simulation/elements/LOLZ.cpp | 2 +- src/simulation/elements/LOVE.cpp | 2 +- src/simulation/elements/LRBD.cpp | 2 +- src/simulation/elements/LSNS.cpp | 2 +- src/simulation/elements/MERC.cpp | 2 +- src/simulation/elements/METL.cpp | 2 +- src/simulation/elements/MORT.cpp | 2 +- src/simulation/elements/MWAX.cpp | 2 +- src/simulation/elements/NBHL.cpp | 2 +- src/simulation/elements/NBLE.cpp | 2 +- src/simulation/elements/NEUT.cpp | 2 +- src/simulation/elements/NICE.cpp | 2 +- src/simulation/elements/NITR.cpp | 2 +- src/simulation/elements/NONE.cpp | 2 +- src/simulation/elements/NSCN.cpp | 2 +- src/simulation/elements/NTCT.cpp | 2 +- src/simulation/elements/NWHL.cpp | 2 +- src/simulation/elements/O2.cpp | 2 +- src/simulation/elements/OIL.cpp | 2 +- src/simulation/elements/PBCN.cpp | 2 +- src/simulation/elements/PCLN.cpp | 2 +- src/simulation/elements/PHOT.cpp | 2 +- src/simulation/elements/PIPE.cpp | 2 +- src/simulation/elements/PLEX.cpp | 2 +- src/simulation/elements/PLNT.cpp | 2 +- src/simulation/elements/PLSM.cpp | 2 +- src/simulation/elements/PLUT.cpp | 2 +- src/simulation/elements/POLO.cpp | 2 +- src/simulation/elements/PPIP.cpp | 2 +- src/simulation/elements/PQRT.cpp | 2 +- src/simulation/elements/PROT.cpp | 2 +- src/simulation/elements/PRTI.cpp | 2 +- src/simulation/elements/PRTO.cpp | 2 +- src/simulation/elements/PSCN.cpp | 2 +- src/simulation/elements/PSNS.cpp | 2 +- src/simulation/elements/PSTE.cpp | 2 +- src/simulation/elements/PSTN.cpp | 2 +- src/simulation/elements/PSTS.cpp | 2 +- src/simulation/elements/PTCT.cpp | 2 +- src/simulation/elements/PUMP.cpp | 2 +- src/simulation/elements/PVOD.cpp | 2 +- src/simulation/elements/QRTZ.cpp | 2 +- src/simulation/elements/RBDM.cpp | 2 +- src/simulation/elements/RFGL.cpp | 2 +- src/simulation/elements/RFRG.cpp | 2 +- src/simulation/elements/RIME.cpp | 2 +- src/simulation/elements/RPEL.cpp | 2 +- src/simulation/elements/SALT.cpp | 2 +- src/simulation/elements/SAND.cpp | 2 +- src/simulation/elements/SAWD.cpp | 2 +- src/simulation/elements/SHLD1.cpp | 2 +- src/simulation/elements/SHLD2.cpp | 2 +- src/simulation/elements/SHLD3.cpp | 2 +- src/simulation/elements/SHLD4.cpp | 2 +- src/simulation/elements/SING.cpp | 2 +- src/simulation/elements/SLTW.cpp | 2 +- src/simulation/elements/SMKE.cpp | 2 +- src/simulation/elements/SNOW.cpp | 2 +- src/simulation/elements/SOAP.cpp | 2 +- src/simulation/elements/SPAWN.cpp | 2 +- src/simulation/elements/SPAWN2.cpp | 2 +- src/simulation/elements/SPNG.cpp | 2 +- src/simulation/elements/SPRK.cpp | 2 +- src/simulation/elements/STKM.cpp | 2 +- src/simulation/elements/STKM2.cpp | 2 +- src/simulation/elements/STNE.cpp | 2 +- src/simulation/elements/STOR.cpp | 2 +- src/simulation/elements/SWCH.cpp | 2 +- src/simulation/elements/TESC.cpp | 2 +- src/simulation/elements/THDR.cpp | 2 +- src/simulation/elements/THRM.cpp | 2 +- src/simulation/elements/TRON.cpp | 2 +- src/simulation/elements/TSNS.cpp | 2 +- src/simulation/elements/TTAN.cpp | 2 +- src/simulation/elements/TUNG.cpp | 2 +- src/simulation/elements/URAN.cpp | 2 +- src/simulation/elements/VIBR.cpp | 2 +- src/simulation/elements/VINE.cpp | 2 +- src/simulation/elements/VIRS.cpp | 2 +- src/simulation/elements/VOID.cpp | 2 +- src/simulation/elements/VRSG.cpp | 2 +- src/simulation/elements/VRSS.cpp | 2 +- src/simulation/elements/WARP.cpp | 2 +- src/simulation/elements/WATR.cpp | 2 +- src/simulation/elements/WAX.cpp | 2 +- src/simulation/elements/WHOL.cpp | 2 +- src/simulation/elements/WIFI.cpp | 2 +- src/simulation/elements/WIRE.cpp | 2 +- src/simulation/elements/WOOD.cpp | 2 +- src/simulation/elements/WTRV.cpp | 2 +- src/simulation/elements/YEST.cpp | 2 +- src/simulation/simtools/AIR.cpp | 2 +- src/simulation/simtools/COOL.cpp | 2 +- src/simulation/simtools/CYCL.cpp | 2 +- src/simulation/simtools/HEAT.cpp | 2 +- src/simulation/simtools/MIX.cpp | 2 +- src/simulation/simtools/NGRV.cpp | 2 +- src/simulation/simtools/PGRV.cpp | 2 +- src/simulation/simtools/VAC.cpp | 2 +- src/tasks/Task.cpp | 2 +- src/tasks/TaskWindow.cpp | 4 +- 255 files changed, 547 insertions(+), 549 deletions(-) diff --git a/data/localization/EN.cpp b/data/localization/EN.cpp index f8b953a57..625276478 100644 --- a/data/localization/EN.cpp +++ b/data/localization/EN.cpp @@ -4,7 +4,7 @@ struct LocaleEN : public Locale { - String GetName() const { return "English"_ascii; } + String GetName() const { return "English"; } size_t GetPluralIndex(size_t n) const { @@ -17,8 +17,8 @@ struct LocaleEN : public Locale using i18n::translation; using i18n::pluralForm; - pluralForm("save") = {"save"_ascii, "saves"_ascii}; - pluralForm("stamp") = {"stamp"_ascii, "stamps"_ascii}; + pluralForm("save") = {"save", "saves"}; + pluralForm("stamp") = {"stamp", "stamps"}; } String GetIntroText() const diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index a8c36c56a..059244bc2 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -687,7 +687,7 @@ int main(int argc, char * argv[]) } #endif // I18N_DEBUG - String localeName = Client::Ref().GetPrefString("Locale", ""_ascii); + String localeName = Client::Ref().GetPrefString("Locale", ""); currentLocale = locales[0]; for(Locale const *locale : locales) if(locale->GetName() == localeName) @@ -733,7 +733,7 @@ int main(int argc, char * argv[]) Client::Ref().SetPref("Proxy", arguments["proxy"]); } } - else if(Client::Ref().GetPrefString("Proxy", ""_ascii).length()) + else if(Client::Ref().GetPrefString("Proxy", "").length()) { proxyString = (Client::Ref().GetPrefByteString("Proxy", "")); } diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 6885b792a..b42109bdc 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -648,7 +648,7 @@ std::vector > Client::GetServerNotifications() RequestStatus Client::ParseServerReturn(ByteString &result, int status, bool json) { - lastError = ""_ascii; + lastError = ""; // no server response, return "Malformed Response" if (status == 200 && !result.size()) { @@ -957,7 +957,7 @@ User Client::GetAuthUser() RequestStatus Client::UploadSave(SaveInfo & save) { - lastError = ""_ascii; + lastError = ""; unsigned int gameDataLength; char * gameData = NULL; int dataStatus; @@ -1166,7 +1166,7 @@ std::vector Client::GetStamps(int start, int count) RequestStatus Client::ExecVote(int saveID, int direction) { - lastError = ""_ascii; + lastError = ""; int dataStatus; ByteString data; @@ -1190,7 +1190,7 @@ RequestStatus Client::ExecVote(int saveID, int direction) std::vector Client::GetSaveData(int saveID, int saveDate) { - lastError = ""_ascii; + lastError = ""; int dataStatus; ByteString data; ByteString urlStr; @@ -1212,7 +1212,7 @@ std::vector Client::GetSaveData(int saveID, int saveDate) LoginStatus Client::Login(ByteString username, ByteString password, User & user) { - lastError = ""_ascii; + lastError = ""; char passwordHash[33]; char totalHash[33]; @@ -1222,10 +1222,10 @@ LoginStatus Client::Login(ByteString username, ByteString password, User & user) user.SessionKey = ""; //Doop - md5_ascii(passwordHash, (const unsigned char *)password.c_str(), password.length()); + md5(passwordHash, (const unsigned char *)password.c_str(), password.length()); passwordHash[32] = 0; ByteString total = ByteString::Build(username, "-", passwordHash); - md5_ascii(totalHash, (const unsigned char *)(total.c_str()), total.size()); + md5(totalHash, (const unsigned char *)(total.c_str()), total.size()); totalHash[32] = 0; ByteString data; @@ -1283,7 +1283,7 @@ LoginStatus Client::Login(ByteString username, ByteString password, User & user) RequestStatus Client::DeleteSave(int saveID) { - lastError = ""_ascii; + lastError = ""; ByteString data; ByteString url = ByteString::Build(SCHEME, SERVER, "/Browse/Delete.json?ID=", saveID, "&Mode=Delete&Key=", authUser.SessionKey); int dataStatus; @@ -1303,7 +1303,7 @@ RequestStatus Client::DeleteSave(int saveID) RequestStatus Client::AddComment(int saveID, String comment) { - lastError = ""_ascii; + lastError = ""; ByteString data; int dataStatus; ByteString url = ByteString::Build(SCHEME, SERVER, "/Browse/Comments.json?ID=", saveID); @@ -1325,7 +1325,7 @@ RequestStatus Client::AddComment(int saveID, String comment) RequestStatus Client::FavouriteSave(int saveID, bool favourite) { - lastError = ""_ascii; + lastError = ""; ByteStringBuilder urlStream; ByteString data; int dataStatus; @@ -1348,7 +1348,7 @@ RequestStatus Client::FavouriteSave(int saveID, bool favourite) RequestStatus Client::ReportSave(int saveID, String message) { - lastError = ""_ascii; + lastError = ""; ByteString data; int dataStatus; ByteString url = ByteString::Build(SCHEME, SERVER, "/Browse/Report.json?ID=", saveID, "&Key=", authUser.SessionKey); @@ -1370,7 +1370,7 @@ RequestStatus Client::ReportSave(int saveID, String message) RequestStatus Client::UnpublishSave(int saveID) { - lastError = ""_ascii; + lastError = ""; ByteString data; int dataStatus; ByteString url = ByteString::Build(SCHEME, SERVER, "/Browse/Delete.json?ID=", saveID, "&Mode=Unpublish&Key=", authUser.SessionKey); @@ -1390,7 +1390,7 @@ RequestStatus Client::UnpublishSave(int saveID) RequestStatus Client::PublishSave(int saveID) { - lastError = ""_ascii; + lastError = ""; ByteString data; int dataStatus; ByteString url = ByteString::Build(SCHEME, SERVER, "/Browse/View.json?ID=", saveID, "&Key=", authUser.SessionKey); @@ -1412,7 +1412,7 @@ RequestStatus Client::PublishSave(int saveID) SaveInfo * Client::GetSave(int saveID, int saveDate) { - lastError = ""_ascii; + lastError = ""; ByteStringBuilder urlStream; urlStream << SCHEME << SERVER << "/Browse/View.json?ID=" << saveID; if(saveDate) @@ -1501,7 +1501,7 @@ SaveFile * Client::LoadSaveFile(ByteString filename) std::vector > * Client::GetTags(int start, int count, String query, int & resultCount) { - lastError = ""_ascii; + lastError = ""; resultCount = 0; std::vector > * tagArray = new std::vector >(); ByteStringBuilder urlStream; @@ -1547,7 +1547,7 @@ std::vector > * Client::GetTags(int start, int count, std::vector * Client::SearchSaves(int start, int count, String query, ByteString sort, ByteString category, int & resultCount) { - lastError = ""_ascii; + lastError = ""; resultCount = 0; std::vector * saveArray = new std::vector(); ByteStringBuilder urlStream; @@ -1617,7 +1617,7 @@ std::vector * Client::SearchSaves(int start, int count, String query, std::list * Client::RemoveTag(int saveID, ByteString tag) { - lastError = ""_ascii; + lastError = ""; std::list * tags = NULL; ByteString data; int dataStatus; @@ -1656,7 +1656,7 @@ std::list * Client::RemoveTag(int saveID, ByteString tag) std::list * Client::AddTag(int saveID, ByteString tag) { - lastError = ""_ascii; + lastError = ""; std::list * tags = NULL; ByteString data; int dataStatus; diff --git a/src/client/Client.h b/src/client/Client.h index ea5eed8ef..bce8f6670 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -35,7 +35,7 @@ public: int Build; int Time; BuildType Type; - UpdateInfo() : File(""), Changelog(""_ascii), Major(0), Minor(0), Build(0), Time(0), Type(Stable) {} + UpdateInfo() : File(""), Changelog(""), Major(0), Minor(0), Build(0), Time(0), Type(Stable) {} UpdateInfo(int major, int minor, int build, ByteString file, String changelog, BuildType type) : File(file), Changelog(changelog), Major(major), Minor(minor), Build(build), Time(0), Type(type) {} UpdateInfo(int time, ByteString file, String changelog, BuildType type) : File(file), Changelog(changelog), Major(0), Minor(0), Build(0), Time(time), Type(type) {} }; diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index 94fcdbbfc..7fc6fc2f8 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -675,7 +675,7 @@ void GameSave::readOPS(char * data, int dataLength) bson_iterator signiter; bson_iterator_subiterator(&subiter, &signiter); - sign tempSign(""_ascii, 0, 0, sign::Left); + sign tempSign("", 0, 0, sign::Left); while (bson_iterator_next(&signiter)) { if (!strcmp(bson_iterator_key(&signiter), "text") && bson_iterator_type(&signiter) == BSON_STRING) @@ -683,13 +683,13 @@ void GameSave::readOPS(char * data, int dataLength) tempSign.text = format::CleanString(ByteString(bson_iterator_string(&signiter)).FromUtf8(), true, true, true).Substr(0, 45); if (majorVersion < 94 || (majorVersion == 94 && minorVersion < 2)) { - if (tempSign.text == "{t}"_ascii) + if (tempSign.text == "{t}") { - tempSign.text = "Temp: {t}"_ascii; + tempSign.text = "Temp: {t}"; } - else if (tempSign.text == "{p}"_ascii) + else if (tempSign.text == "{p}") { - tempSign.text = "Pressure: {p}"_ascii; + tempSign.text = "Pressure: {p}"; } } } @@ -826,7 +826,7 @@ void GameSave::readOPS(char * data, int dataLength) if (major > SAVE_VERSION || (major == SAVE_VERSION && minor > MINOR_VERSION)) #endif { - String errorMessage = String::Build("Save from a newer version: Requires version "_i18n, major, "."_ascii, minor); + String errorMessage = String::Build("Save from a newer version: Requires version "_i18n, major, ".", minor); throw ParseException(ParseException::WrongVersion, errorMessage); } #if defined(SNAPSHOT) || defined(DEBUG) @@ -1358,7 +1358,7 @@ void GameSave::readPSv(char * saveDataChar, int dataLength) std::vector tempSigns; char tempSignText[255]; - sign tempSign(""_ascii, 0, 0, sign::Left); + sign tempSign("", 0, 0, sign::Left); //Gol data used to read older saves std::vector goltype = LoadGOLTypes(); @@ -1979,13 +1979,13 @@ void GameSave::readPSv(char * saveDataChar, int dataLength) memcpy(tempSignText, data+p, x); tempSignText[x] = 0; tempSign.text = format::CleanString(ByteString(tempSignText).FromUtf8(), true, true, true).Substr(0, 45); - if (tempSign.text == "{t}"_ascii) + if (tempSign.text == "{t}") { - tempSign.text = "Temp: {t}"_ascii; + tempSign.text = "Temp: {t}"; } - else if (tempSign.text == "{p}"_ascii) + else if (tempSign.text == "{p}") { - tempSign.text = "Pressure: {p}"_ascii; + tempSign.text = "Pressure: {p}"; } tempSigns.push_back(tempSign); p += x; diff --git a/src/client/MD5.cpp b/src/client/MD5.cpp index b85b4c828..250997c9d 100644 --- a/src/client/MD5.cpp +++ b/src/client/MD5.cpp @@ -209,7 +209,7 @@ void md5_transform(unsigned buf[4], const unsigned char inraw[64]) } static char hexChars[] = "0123456789abcdef"; -void md5_ascii(char *result, unsigned char const *buf, unsigned len) +void md5(char *result, unsigned char const *buf, unsigned len) { struct md5_context md5; unsigned char hash[16]; diff --git a/src/client/MD5.h b/src/client/MD5.h index a8ef123b2..7e245cecd 100644 --- a/src/client/MD5.h +++ b/src/client/MD5.h @@ -13,6 +13,6 @@ void md5_update(struct md5_context *context, unsigned char const *buf, unsigned void md5_final(unsigned char digest[16], struct md5_context *context); void md5_transform(unsigned buf[4], const unsigned char in[64]); -void md5_ascii(char *result, unsigned char const *buf, unsigned len); +void md5(char *result, unsigned char const *buf, unsigned len); #endif diff --git a/src/client/SaveFile.cpp b/src/client/SaveFile.cpp index d233c7999..4e4702c73 100644 --- a/src/client/SaveFile.cpp +++ b/src/client/SaveFile.cpp @@ -15,7 +15,7 @@ SaveFile::SaveFile(ByteString filename): gameSave(NULL), filename(filename), displayName(filename.FromUtf8()), - loadingError(""_ascii) + loadingError("") { } diff --git a/src/client/SaveInfo.cpp b/src/client/SaveInfo.cpp index 4e2df2aab..bfa9fb439 100644 --- a/src/client/SaveInfo.cpp +++ b/src/client/SaveInfo.cpp @@ -38,7 +38,7 @@ SaveInfo::SaveInfo(int _id, int _createdDate, int _updatedDate, int _votesUp, in Version(0), userName(_userName), name(_name), - Description(""_ascii), + Description(""), Published(false), tags(), gameSave(NULL) diff --git a/src/common/String.h b/src/common/String.h index 9947e886b..d39287fee 100644 --- a/src/common/String.h +++ b/src/common/String.h @@ -401,7 +401,7 @@ public: inline String(super &&other): super(std::move(other)) {} inline String(String const &other): super(other) {} inline String(String &&other): super(std::move(other)) {} - template [[deprecated]] inline String(ByteString::value_type const (&ch)[N]): super(ByteString(ch, N - 1).FromAscii()) {} + template inline String(ByteString::value_type const (&ch)[N]): super(ByteString(ch, N - 1).FromAscii()) {} inline String &operator=(String const &other) { super::operator=(other); return *this; } inline String &operator=(String &&other) { super::operator=(other); return *this; } @@ -549,26 +549,26 @@ inline String operator+(String::value_type lhs, String const &rhs) { return lhs inline String operator+(String::value_type lhs, String &&rhs) { return lhs + static_cast &&>(rhs); } inline String operator+(String::value_type const *lhs, String const &rhs) { return lhs + static_cast const &>(rhs); } inline String operator+(String::value_type const *lhs, String &&rhs) { return lhs + static_cast &&>(rhs); } -template [[deprecated]] inline String operator+(String const &lhs, ByteString::value_type const (&rhs)[N]) { return static_cast const &>(lhs) + ByteString(rhs).FromAscii(); } -template [[deprecated]] inline String operator+(String &&lhs, ByteString::value_type const (&rhs)[N]) { return static_cast &&>(lhs) + ByteString(rhs).FromAscii(); } -template [[deprecated]] inline String operator+(ByteString::value_type const (&lhs)[N], String const &rhs) { return ByteString(lhs).FromAscii() + static_cast const &>(rhs); } -template [[deprecated]] inline String operator+(ByteString::value_type const (&lhs)[N], String &&rhs) { return ByteString(lhs).FromAscii() + static_cast &&>(rhs); } +template inline String operator+(String const &lhs, ByteString::value_type const (&rhs)[N]) { return static_cast const &>(lhs) + ByteString(rhs).FromAscii(); } +template inline String operator+(String &&lhs, ByteString::value_type const (&rhs)[N]) { return static_cast &&>(lhs) + ByteString(rhs).FromAscii(); } +template inline String operator+(ByteString::value_type const (&lhs)[N], String const &rhs) { return ByteString(lhs).FromAscii() + static_cast const &>(rhs); } +template inline String operator+(ByteString::value_type const (&lhs)[N], String &&rhs) { return ByteString(lhs).FromAscii() + static_cast &&>(rhs); } inline bool operator==(String const &lhs, String const &rhs) { return static_cast const &>(lhs) == static_cast const &>(rhs); } inline bool operator==(String const &lhs, std::basic_string const &rhs) { return static_cast const &>(lhs) == rhs; } inline bool operator==(String const &lhs, String::value_type const *rhs) { return static_cast const &>(lhs) == rhs; } inline bool operator==(std::basic_string const &lhs, String const &rhs) { return lhs == static_cast const &>(rhs); } inline bool operator==(String::value_type const *lhs, String const &rhs) { return lhs == static_cast const &>(rhs); } -template [[deprecated]] inline bool operator==(String const &lhs, ByteString::value_type const (&rhs)[N]) { return static_cast const &>(lhs) == ByteString(rhs).FromAscii(); } -template [[deprecated]] inline bool operator==(ByteString::value_type const (&lhs)[N], String const &rhs) { return ByteString(lhs).FromAscii() == static_cast const &>(rhs); } +template inline bool operator==(String const &lhs, ByteString::value_type const (&rhs)[N]) { return static_cast const &>(lhs) == ByteString(rhs).FromAscii(); } +template inline bool operator==(ByteString::value_type const (&lhs)[N], String const &rhs) { return ByteString(lhs).FromAscii() == static_cast const &>(rhs); } inline bool operator!=(String const &lhs, String const &rhs) { return static_cast const &>(lhs) != static_cast const &>(rhs); } inline bool operator!=(String const &lhs, std::basic_string const &rhs) { return static_cast const &>(lhs) != rhs; } inline bool operator!=(String const &lhs, String::value_type const *rhs) { return static_cast const &>(lhs) != rhs; } inline bool operator!=(std::basic_string const &lhs, String const &rhs) { return lhs != static_cast const &>(rhs); } inline bool operator!=(String::value_type const *lhs, String const &rhs) { return lhs != static_cast const &>(rhs); } -template [[deprecated]] inline bool operator!=(String const &lhs, ByteString::value_type const (&rhs)[N]) { return static_cast const &>(lhs) != ByteString(rhs).FromAscii(); } -template [[deprecated]] inline bool operator!=(ByteString::value_type const (&lhs)[N], String const &rhs) { return ByteString(lhs).FromAscii() != static_cast const &>(rhs); } +template inline bool operator!=(String const &lhs, ByteString::value_type const (&rhs)[N]) { return static_cast const &>(lhs) != ByteString(rhs).FromAscii(); } +template inline bool operator!=(ByteString::value_type const (&lhs)[N], String const &rhs) { return ByteString(lhs).FromAscii() != static_cast const &>(rhs); } inline String ByteString::FromAscii() const { @@ -673,7 +673,7 @@ StringBuilder &operator<<(StringBuilder &, String::value_type const *); StringBuilder &operator<<(StringBuilder &, String const &); StringBuilder &operator<<(StringBuilder &, float); StringBuilder &operator<<(StringBuilder &, double); -template [[deprecated]] StringBuilder &operator<<(StringBuilder &b, ByteString::value_type const (&data)[N]) { return b << ByteString(data).FromUtf8(); } +template StringBuilder &operator<<(StringBuilder &b, ByteString::value_type const (&data)[N]) { return b << ByteString(data).FromUtf8(); } template String String::Build(Ts&&... args) { @@ -682,7 +682,5 @@ template String String::Build(Ts&&... args) return b.Build(); } -inline String operator""_ascii(ByteString::value_type const *ch, size_t N) { return ByteString(ch, N).FromAscii(); } - #include "common/Format.h" #include "common/Internationalization.h" diff --git a/src/debug/DebugLines.cpp b/src/debug/DebugLines.cpp index 5dbebe8c5..12e9521a3 100644 --- a/src/debug/DebugLines.cpp +++ b/src/debug/DebugLines.cpp @@ -32,10 +32,10 @@ void DebugLines::Draw() g->draw_line(drawPoint2.X, 0, drawPoint2.X, YRES, 255, 255, 255, 120); String info; - info = String::Build(drawPoint2.X, " x "_ascii, drawPoint2.Y); + info = String::Build(drawPoint2.X, " x ", drawPoint2.Y); g->drawtext_outline(drawPoint2.X+(drawPoint2.X>drawPoint1.X?3:-g->textwidth(info)-3), drawPoint2.Y+(drawPoint2.Ydrawtext_outline(drawPoint1.X+(drawPoint2.Xtextwidth(info)-2), drawPoint1.Y+(drawPoint2.Y>drawPoint1.Y?-10:3), info, 255, 255, 255, 200); info = String::Build(std::abs(drawPoint2.X-drawPoint1.X)); diff --git a/src/debug/DebugParts.cpp b/src/debug/DebugParts.cpp index 6e4ea8ada..0d75a338c 100644 --- a/src/debug/DebugParts.cpp +++ b/src/debug/DebugParts.cpp @@ -18,7 +18,7 @@ void DebugParts::Draw() Graphics * g = ui::Engine::Ref().g; int x = 0, y = 0, lpx = 0, lpy = 0; - String info = String::Build(sim->parts_lastActiveIndex, '/', NPART, " ("_ascii, Format::Precision((float)sim->parts_lastActiveIndex/(NPART)*100.0f, 2), "%)"_ascii); + String info = String::Build(sim->parts_lastActiveIndex, '/', NPART, " (", Format::Precision((float)sim->parts_lastActiveIndex/(NPART)*100.0f, 2), "%)"); for (int i = 0; i < NPART; i++) { if (sim->parts[i].type) diff --git a/src/debug/ElementPopulation.cpp b/src/debug/ElementPopulation.cpp index ee699c78f..a6fa75284 100644 --- a/src/debug/ElementPopulation.cpp +++ b/src/debug/ElementPopulation.cpp @@ -74,7 +74,7 @@ void ElementPopulationDebug::Draw() } } - g->drawtext(xStart + bars + 5, yBottom-5, "0"_ascii, 255, 255, 255, 255); + g->drawtext(xStart + bars + 5, yBottom-5, "0", 255, 255, 255, 255); g->drawtext(xStart + bars + 5, yBottom-132, halfValString, 255, 255, 255, 255); g->drawtext(xStart + bars + 5, yBottom-260, maxValString, 255, 255, 255, 255); } diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp index 1e3851e42..94b26f75a 100644 --- a/src/graphics/Graphics.cpp +++ b/src/graphics/Graphics.cpp @@ -592,7 +592,7 @@ void Graphics::textnpos(String str, int n, int w, int *cx, int *cy) while (*s&&n) { wordlen = 0; - while(*s && String(" .,!?\n"_ascii).Contains(*s)) + while(*s && String(" .,!?\n").Contains(*s)) s++; charspace = textwidthx(s, w-x); if (charspaceSetActionCallback({ colourChange }); rValue->SetLimit(3); rValue->SetInputType(ui::Textbox::Number); AddComponent(rValue); - gValue = new ui::Textbox(ui::Point(40, Size.Y-23), ui::Point(30, 17), "255"_ascii); + gValue = new ui::Textbox(ui::Point(40, Size.Y-23), ui::Point(30, 17), "255"); gValue->SetActionCallback({ colourChange }); gValue->SetLimit(3); gValue->SetInputType(ui::Textbox::Number); AddComponent(gValue); - bValue = new ui::Textbox(ui::Point(75, Size.Y-23), ui::Point(30, 17), "255"_ascii); + bValue = new ui::Textbox(ui::Point(75, Size.Y-23), ui::Point(30, 17), "255"); bValue->SetActionCallback({ colourChange }); bValue->SetLimit(3); bValue->SetInputType(ui::Textbox::Number); AddComponent(bValue); - aValue = new ui::Textbox(ui::Point(110, Size.Y-23), ui::Point(30, 17), "255"_ascii); + aValue = new ui::Textbox(ui::Point(110, Size.Y-23), ui::Point(30, 17), "255"); aValue->SetActionCallback({ colourChange }); aValue->SetLimit(3); aValue->SetInputType(ui::Textbox::Number); AddComponent(aValue); - hexValue = new::ui::Label(ui::Point(150, Size.Y-23), ui::Point(53, 17), "0xFFFFFFFF"_ascii); + hexValue = new::ui::Label(ui::Point(150, Size.Y-23), ui::Point(53, 17), "0xFFFFFFFF"); AddComponent(hexValue); ui::Button * doneButton = new ui::Button(ui::Point(Size.X-45, Size.Y-23), ui::Point(40, 17), "Done"_i18n); diff --git a/src/gui/console/ConsoleController.cpp b/src/gui/console/ConsoleController.cpp index 315bf4d25..0a31c798f 100644 --- a/src/gui/console/ConsoleController.cpp +++ b/src/gui/console/ConsoleController.cpp @@ -23,7 +23,7 @@ void ConsoleController::EvaluateCommand(String command) { if(command.length()) { - if (command.BeginsWith("!load "_ascii)) + if (command.BeginsWith("!load ")) CloseConsole(); int returnCode = commandInterface->Command(command); consoleModel->AddLastCommand(ConsoleCommand(command, returnCode, commandInterface->GetLastError())); diff --git a/src/gui/console/ConsoleModel.cpp b/src/gui/console/ConsoleModel.cpp index f49c30b4b..6470f0aa4 100644 --- a/src/gui/console/ConsoleModel.cpp +++ b/src/gui/console/ConsoleModel.cpp @@ -10,7 +10,7 @@ ConsoleModel::ConsoleModel() { { if(previousCommands.size()<25) { - previousCommands.push_front(ConsoleCommand(*iter, 0, ""_ascii)); + previousCommands.push_front(ConsoleCommand(*iter, 0, "")); currentCommandIndex = previousCommands.size(); } } @@ -37,7 +37,7 @@ ConsoleCommand ConsoleModel::GetCurrentCommand() { if (currentCommandIndex >= previousCommands.size()) { - return ConsoleCommand(""_ascii, 0, ""_ascii); + return ConsoleCommand("", 0, ""); } return previousCommands[currentCommandIndex]; } diff --git a/src/gui/console/ConsoleView.cpp b/src/gui/console/ConsoleView.cpp index 49d9a8c56..9c2848199 100644 --- a/src/gui/console/ConsoleView.cpp +++ b/src/gui/console/ConsoleView.cpp @@ -19,7 +19,7 @@ ConsoleView::ConsoleView(): ui::Window(ui::Point(0, 0), ui::Point(WINDOWW, 150)), commandField(NULL) { - commandField = new ui::Textbox(ui::Point(0, Size.Y-16), ui::Point(Size.X, 16), ""_ascii); + commandField = new ui::Textbox(ui::Point(0, Size.Y-16), ui::Point(Size.X, 16), ""); commandField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; commandField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; commandField->SetActionCallback({ [this] { commandField->SetDisplayText(c->FormatCommand(commandField->GetText())); } }); @@ -41,8 +41,8 @@ void ConsoleView::DoKeyPress(int key, int scan, bool repeat, bool shift, bool ct case SDLK_RETURN: case SDLK_KP_ENTER: c->EvaluateCommand(commandField->GetText()); - commandField->SetText(""_ascii); - commandField->SetDisplayText(""_ascii); + commandField->SetText(""); + commandField->SetDisplayText(""); break; case SDLK_DOWN: c->NextCommand(); @@ -62,7 +62,7 @@ void ConsoleView::DoKeyPress(int key, int scan, bool repeat, bool shift, bool ct void ConsoleView::DoTextInput(String text) { - if (text == "~"_ascii) + if (text == "~") doClose = false; if (!doClose) Window::DoTextInput(text); diff --git a/src/gui/elementsearch/ElementSearchActivity.cpp b/src/gui/elementsearch/ElementSearchActivity.cpp index b39c6626b..56043ebe3 100644 --- a/src/gui/elementsearch/ElementSearchActivity.cpp +++ b/src/gui/elementsearch/ElementSearchActivity.cpp @@ -20,7 +20,7 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st firstResult(NULL), gameController(gameController), tools(tools), - toolTip(""_ascii), + toolTip(""), toolTipPresence(0), shiftPressed(false), ctrlPressed(false), @@ -33,7 +33,7 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st title->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; AddComponent(title); - searchField = new ui::Textbox(ui::Point(8, 23), ui::Point(Size.X-16, 17), ""_ascii); + searchField = new ui::Textbox(ui::Point(8, 23), ui::Point(Size.X-16, 17), ""); searchField->SetActionCallback({ [this] { searchTools(searchField->GetText()); } }); searchField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; AddComponent(searchField); @@ -50,7 +50,7 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st AddComponent(okButton); AddComponent(closeButton); - searchTools(""_ascii); + searchTools(""); } void ElementSearchActivity::searchTools(String query) @@ -143,7 +143,7 @@ void ElementSearchActivity::searchTools(String query) ToolButton * tempButton; if(tempTexture) - tempButton = new ToolButton(current+viewPosition, ui::Point(30, 18), ""_ascii, tool->GetIdentifier(), tool->GetDescription()); + tempButton = new ToolButton(current+viewPosition, ui::Point(30, 18), "", tool->GetIdentifier(), tool->GetDescription()); else tempButton = new ToolButton(current+viewPosition, ui::Point(30, 18), tool->GetName(), tool->GetIdentifier(), tool->GetDescription()); diff --git a/src/gui/filebrowser/FileBrowserActivity.cpp b/src/gui/filebrowser/FileBrowserActivity.cpp index 9a5b3d2d6..dfe383ab6 100644 --- a/src/gui/filebrowser/FileBrowserActivity.cpp +++ b/src/gui/filebrowser/FileBrowserActivity.cpp @@ -93,7 +93,7 @@ FileBrowserActivity::FileBrowserActivity(ByteString directory, OnSelected onSele titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(titleLabel); - ui::Textbox * textField = new ui::Textbox(ui::Point(8, 25), ui::Point(Size.X-16, 16), ""_ascii, "[search]"_i18n); + ui::Textbox * textField = new ui::Textbox(ui::Point(8, 25), ui::Point(Size.X-16, 16), "", "[search]"_i18n); textField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; textField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; textField->SetActionCallback({ [this, textField] { DoSearch(textField->GetText().ToUtf8()); } }); @@ -144,7 +144,7 @@ void FileBrowserActivity::SelectSave(SaveFile * file) void FileBrowserActivity::DeleteSave(SaveFile * file) { auto deleteConfirm = i18nMulti("Are you sure you want to delete ", "?"); - String deleteMessage = deleteConfirm[0] + file->GetDisplayName() + ".cps"_ascii + deleteConfirm[1]; + String deleteMessage = deleteConfirm[0] + file->GetDisplayName() + ".cps" + deleteConfirm[1]; if (ConfirmPrompt::Blocking("Delete Save"_i18n, deleteMessage)) { remove(file->GetName().c_str()); @@ -154,7 +154,7 @@ void FileBrowserActivity::DeleteSave(SaveFile * file) void FileBrowserActivity::RenameSave(SaveFile * file) { - ByteString newName = TextPrompt::Blocking("Rename"_i18n, "Change save name"_i18n, file->GetDisplayName(), ""_ascii, 0).ToUtf8(); + ByteString newName = TextPrompt::Blocking("Rename"_i18n, "Change save name"_i18n, file->GetDisplayName(), "", 0).ToUtf8(); if (newName.length()) { newName = directory + PATH_SEP + newName + ".cps"; diff --git a/src/gui/font/FontEditor.cpp b/src/gui/font/FontEditor.cpp index 26c4c861d..09288dccf 100644 --- a/src/gui/font/FontEditor.cpp +++ b/src/gui/font/FontEditor.cpp @@ -313,17 +313,17 @@ FontEditor::FontEditor(ByteString _dataFile): next->SetActionCallback({ [this] { NextChar(); } }); AddComponent(next); - ui::Button *shrink = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), "><"_ascii); + ui::Button *shrink = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), "><"); currentX += 18; shrink->SetActionCallback({ [this] { ShrinkChar(); } }); AddComponent(shrink); - ui::Button *grow = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), "<>"_ascii); + ui::Button *grow = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), "<>"); currentX += 18; grow->SetActionCallback({ [this] { GrowChar(); } }); AddComponent(grow); - ui::Button *add = new ui::Button(ui::Point(currentX, baseline), ui::Point(36, 17), "Add"_ascii); + ui::Button *add = new ui::Button(ui::Point(currentX, baseline), ui::Point(36, 17), "Add"); currentX += 37; add->SetActionCallback({ [this] { if (fontWidths.find(currentChar) == fontWidths.end()) @@ -335,7 +335,7 @@ FontEditor::FontEditor(ByteString _dataFile): } }); AddComponent(add); - ui::Button *remove = new ui::Button(ui::Point(currentX, baseline), ui::Point(36, 17), "Remove"_ascii); + ui::Button *remove = new ui::Button(ui::Point(currentX, baseline), ui::Point(36, 17), "Remove"); currentX += 37; remove->SetActionCallback({ [this] { if (fontWidths.find(currentChar) != fontWidths.end()) @@ -347,7 +347,7 @@ FontEditor::FontEditor(ByteString _dataFile): } }); AddComponent(remove); - ui::Button *showGrid = new ui::Button(ui::Point(currentX, baseline), ui::Point(32, 17), "Grid"_ascii); + ui::Button *showGrid = new ui::Button(ui::Point(currentX, baseline), ui::Point(32, 17), "Grid"); currentX += 33; showGrid->SetTogglable(true); showGrid->SetToggleState(grid); @@ -356,7 +356,7 @@ FontEditor::FontEditor(ByteString _dataFile): } }); AddComponent(showGrid); - ui::Button *showRulers = new ui::Button(ui::Point(currentX, baseline), ui::Point(32, 17), "Rulers"_ascii); + ui::Button *showRulers = new ui::Button(ui::Point(currentX, baseline), ui::Point(32, 17), "Rulers"); currentX += 33; showRulers->SetTogglable(true); showRulers->SetToggleState(rulers); @@ -382,12 +382,12 @@ FontEditor::FontEditor(ByteString _dataFile): baseline += 18; currentX = 1; - ui::Button *render = new ui::Button(ui::Point(currentX, baseline), ui::Point(50, 17), "Render"_ascii); + ui::Button *render = new ui::Button(ui::Point(currentX, baseline), ui::Point(50, 17), "Render"); currentX += 51; render->SetActionCallback({ [this] { Render(); } }); AddComponent(render); - savedButton = new ui::Button(ui::Point(currentX, baseline), ui::Point(50, 17), "Save"_ascii); + savedButton = new ui::Button(ui::Point(currentX, baseline), ui::Point(50, 17), "Save"); currentX += 51; savedButton->SetTogglable(true); savedButton->SetToggleState(true); @@ -398,7 +398,7 @@ FontEditor::FontEditor(ByteString _dataFile): ui::ScrollPanel *outputPanel = new ui::ScrollPanel(ui::Point(Size.X / 2, baseline), ui::Point(Size.X / 2, Size.Y - baseline)); AddComponent(outputPanel); - StretchLabel *outputPreview = new StretchLabel(ui::Point(0, 0), ui::Point(Size.X / 2, 0), ""_ascii); + StretchLabel *outputPreview = new StretchLabel(ui::Point(0, 0), ui::Point(Size.X / 2, 0), ""); outputPreview->SetMultiline(true); outputPreview->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; outputPreview->Appearance.VerticalAlign = ui::Appearance::AlignTop; @@ -454,9 +454,9 @@ FontEditor::FontEditor(ByteString _dataFile): if(p[0] < 0x20) p[0] = 0x20; if(p[0] == p[1]) - input << p[0] << "\n"_ascii; + input << p[0] << "\n"; else - input << p[0] << ":"_ascii << p[1] << "\n"_ascii; + input << p[0] << ":" << p[1] << "\n"; } inputPreview->SetText(input.Build()); textChangedCallback(); @@ -530,7 +530,7 @@ void FontEditor::OnDraw() } else { - g->drawtext(8, 8, "No character"_ascii, 255, 0, 0, 255); + g->drawtext(8, 8, "No character", 255, 0, 0, 255); } } diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 91d088b20..47d45f80b 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -1403,7 +1403,7 @@ void GameController::OpenSaveWindow() } else { - SaveInfo tempSave(0, 0, 0, 0, 0, gameModel->GetUser().Username, ""_ascii); + SaveInfo tempSave(0, 0, 0, 0, 0, gameModel->GetUser().Username, ""); tempSave.SetGameSave(gameSave); new ServerSaveActivity(tempSave, [this](SaveInfo &save) { save.SetVote(1); @@ -1441,7 +1441,7 @@ void GameController::SaveAsCurrent() } else { - SaveInfo tempSave(0, 0, 0, 0, 0, gameModel->GetUser().Username, ""_ascii); + SaveInfo tempSave(0, 0, 0, 0, 0, gameModel->GetUser().Username, ""); tempSave.SetGameSave(gameSave); new ServerSaveActivity(tempSave, true, [this](SaveInfo &save) { LoadSave(&save); }); } @@ -1498,7 +1498,7 @@ String GameController::ElementResolve(int type, int ctype) { return gameModel->GetSimulation()->ElementResolve(type, ctype); } - return ""_ascii; + return ""; } String GameController::BasicParticleInfo(Particle const &sample_part) @@ -1507,7 +1507,7 @@ String GameController::BasicParticleInfo(Particle const &sample_part) { return gameModel->GetSimulation()->BasicParticleInfo(sample_part); } - return ""_ascii; + return ""; } void GameController::ReloadSim() diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp index d736c082c..a36c27398 100644 --- a/src/gui/game/GameModel.cpp +++ b/src/gui/game/GameModel.cpp @@ -310,7 +310,7 @@ void GameModel::BuildMenus() //Build other menus from wall data for(int i = 0; i < UI_WALLCOUNT; i++) { - Tool * tempTool = new WallTool(i, ""_ascii, sim->wtypes[i].descs, PIXR(sim->wtypes[i].colour), PIXG(sim->wtypes[i].colour), PIXB(sim->wtypes[i].colour), sim->wtypes[i].identifier, sim->wtypes[i].textureGen); + Tool * tempTool = new WallTool(i, "", sim->wtypes[i].descs, PIXR(sim->wtypes[i].colour), PIXG(sim->wtypes[i].colour), PIXB(sim->wtypes[i].colour), sim->wtypes[i].identifier, sim->wtypes[i].textureGen); menuList[SC_WALL]->AddTool(tempTool); //sim->wtypes[i] } @@ -330,19 +330,19 @@ void GameModel::BuildMenus() menuList[SC_TOOL]->AddTool(tempTool); } //Add special sign and prop tools - menuList[SC_TOOL]->AddTool(new WindTool(0, "WIND"_ascii, "Creates air movement."_i18n, 64, 64, 64, "DEFAULT_UI_WIND")); + menuList[SC_TOOL]->AddTool(new WindTool(0, "WIND", "Creates air movement."_i18n, 64, 64, 64, "DEFAULT_UI_WIND")); menuList[SC_TOOL]->AddTool(new PropertyTool()); menuList[SC_TOOL]->AddTool(new SignTool(this)); menuList[SC_TOOL]->AddTool(new SampleTool(this)); //Add decoration tools to menu - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_ADD, "ADD"_ascii, "Colour blending: Add."_i18n, 0, 0, 0, "DEFAULT_DECOR_ADD")); - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_SUBTRACT, "SUB"_ascii, "Colour blending: Subtract."_i18n, 0, 0, 0, "DEFAULT_DECOR_SUB")); - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_MULTIPLY, "MUL"_ascii, "Colour blending: Multiply."_i18n, 0, 0, 0, "DEFAULT_DECOR_MUL")); - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_DIVIDE, "DIV"_ascii, "Colour blending: Divide."_i18n , 0, 0, 0, "DEFAULT_DECOR_DIV")); - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_SMUDGE, "SMDG"_ascii, "Smudge tool, blends surrounding deco together."_i18n, 0, 0, 0, "DEFAULT_DECOR_SMDG")); - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_CLEAR, "CLR"_ascii, "Erase any set decoration."_i18n, 0, 0, 0, "DEFAULT_DECOR_CLR")); - menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_DRAW, "SET"_ascii, "Draw decoration (No blending)."_i18n, 0, 0, 0, "DEFAULT_DECOR_SET")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_ADD, "ADD", "Colour blending: Add."_i18n, 0, 0, 0, "DEFAULT_DECOR_ADD")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_SUBTRACT, "SUB", "Colour blending: Subtract."_i18n, 0, 0, 0, "DEFAULT_DECOR_SUB")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_MULTIPLY, "MUL", "Colour blending: Multiply."_i18n, 0, 0, 0, "DEFAULT_DECOR_MUL")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_DIVIDE, "DIV", "Colour blending: Divide."_i18n , 0, 0, 0, "DEFAULT_DECOR_DIV")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_SMUDGE, "SMDG", "Smudge tool, blends surrounding deco together."_i18n, 0, 0, 0, "DEFAULT_DECOR_SMDG")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_CLEAR, "CLR", "Erase any set decoration."_i18n, 0, 0, 0, "DEFAULT_DECOR_CLR")); + menuList[SC_DECO]->AddTool(new DecorationTool(ren, DECO_DRAW, "SET", "Draw decoration (No blending)."_i18n, 0, 0, 0, "DEFAULT_DECOR_SET")); SetColourSelectorColour(colour); // update tool colors decoToolset[0] = GetToolFromIdentifier("DEFAULT_DECOR_SET"); decoToolset[1] = GetToolFromIdentifier("DEFAULT_DECOR_CLR"); diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index 0d753ad86..8659e2b27 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -180,16 +180,16 @@ GameView::GameView(): lastMenu(-1), toolTipPresence(0), - toolTip(""_ascii), + toolTip(""), isToolTipFadingIn(false), toolTipPosition(-1, -1), infoTipPresence(0), - infoTip(""_ascii), + infoTip(""), buttonTipShow(0), - buttonTip(""_ascii), + buttonTip(""), isButtonTipFadingIn(false), introText(2048), - introTextMessage(currentLocale->GetIntroText() + "\n\bt" BUILD_FLAVOR_STRING ""_ascii), + introTextMessage(currentLocale->GetIntroText() + "\n\bt" BUILD_FLAVOR_STRING ""), doScreenshot(false), screenshotIndex(0), @@ -216,14 +216,14 @@ GameView::GameView(): int currentX = 1; //Set up UI - scrollBar = new ui::Button(ui::Point(0,YRES+21), ui::Point(XRES, 2), ""_ascii); + scrollBar = new ui::Button(ui::Point(0,YRES+21), ui::Point(XRES, 2), ""); scrollBar->Appearance.BorderHover = ui::Colour(200, 200, 200); scrollBar->Appearance.BorderActive = ui::Colour(200, 200, 200); scrollBar->Appearance.HorizontalAlign = ui::Appearance::AlignCentre; scrollBar->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(scrollBar); - searchButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(17, 15), ""_ascii, "Find & open a simulation. Hold Ctrl to load offline saves."_i18n); //Open + searchButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(17, 15), "", "Find & open a simulation. Hold Ctrl to load offline saves."_i18n); //Open searchButton->SetIcon(IconOpen); currentX+=18; searchButton->SetTogglable(false); @@ -231,18 +231,18 @@ GameView::GameView(): if (CtrlBehaviour()) c->OpenLocalBrowse(); else - c->OpenSearch(""_ascii); + c->OpenSearch(""); } }); AddComponent(searchButton); - reloadButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(17, 15), ""_ascii, "Reload the simulation"_i18n); + reloadButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(17, 15), "", "Reload the simulation"_i18n); reloadButton->SetIcon(IconReload); reloadButton->Appearance.Margin.Left+=2; currentX+=18; reloadButton->SetActionCallback({ [this] { c->ReloadSim(); }, [this] { c->OpenSavePreview(); } }); AddComponent(reloadButton); - saveSimulationButton = new SplitButton(ui::Point(currentX, Size.Y-16), ui::Point(150, 15), "[untitled simulation]"_i18n, ""_ascii, ""_ascii, 19); + saveSimulationButton = new SplitButton(ui::Point(currentX, Size.Y-16), ui::Point(150, 15), "[untitled simulation]"_i18n, "", "", 19); saveSimulationButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; saveSimulationButton->SetIcon(IconSave); currentX+=151; @@ -263,7 +263,7 @@ GameView::GameView(): SetSaveButtonTooltips(); AddComponent(saveSimulationButton); - upVoteButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(39, 15), ""_ascii, "Like this save"_i18n); + upVoteButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(39, 15), "", "Like this save"_i18n); upVoteButton->SetIcon(IconVoteUp); upVoteButton->Appearance.Margin.Top+=2; upVoteButton->Appearance.Margin.Left+=2; @@ -271,7 +271,7 @@ GameView::GameView(): upVoteButton->SetActionCallback({ [this] { c->Vote(1); } }); AddComponent(upVoteButton); - downVoteButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(15, 15), ""_ascii, "Dislike this save"_i18n); + downVoteButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(15, 15), "", "Dislike this save"_i18n); downVoteButton->SetIcon(IconVoteDown); downVoteButton->Appearance.Margin.Bottom+=2; downVoteButton->Appearance.Margin.Left+=2; @@ -286,7 +286,7 @@ GameView::GameView(): tagSimulationButton->SetActionCallback({ [this] { c->OpenTags(); } }); AddComponent(tagSimulationButton); - clearSimButton = new ui::Button(ui::Point(Size.X-159, Size.Y-16), ui::Point(17, 15), ""_ascii, "Erase everything"_i18n); + clearSimButton = new ui::Button(ui::Point(Size.X-159, Size.Y-16), ui::Point(17, 15), "", "Erase everything"_i18n); clearSimButton->SetIcon(IconNew); clearSimButton->Appearance.Margin.Left+=2; clearSimButton->SetActionCallback({ [this] { c->ClearSim(); } }); @@ -301,19 +301,19 @@ GameView::GameView(): }); AddComponent(loginButton); - simulationOptionButton = new ui::Button(ui::Point(Size.X-48, Size.Y-16), ui::Point(15, 15), ""_ascii, "Simulation options"_i18n); + simulationOptionButton = new ui::Button(ui::Point(Size.X-48, Size.Y-16), ui::Point(15, 15), "", "Simulation options"_i18n); simulationOptionButton->SetIcon(IconSimulationSettings); simulationOptionButton->Appearance.Margin.Left+=2; simulationOptionButton->SetActionCallback({ [this] { c->OpenOptions(); } }); AddComponent(simulationOptionButton); - displayModeButton = new ui::Button(ui::Point(Size.X-32, Size.Y-16), ui::Point(15, 15), ""_ascii, "Renderer options"_i18n); + displayModeButton = new ui::Button(ui::Point(Size.X-32, Size.Y-16), ui::Point(15, 15), "", "Renderer options"_i18n); displayModeButton->SetIcon(IconRenderSettings); displayModeButton->Appearance.Margin.Left+=2; displayModeButton->SetActionCallback({ [this] { c->OpenRenderOptions(); } }); AddComponent(displayModeButton); - pauseButton = new ui::Button(ui::Point(Size.X-16, Size.Y-16), ui::Point(15, 15), ""_ascii, "Pause/Resume the simulation"_i18n); //Pause + pauseButton = new ui::Button(ui::Point(Size.X-16, Size.Y-16), ui::Point(15, 15), "", "Pause/Resume the simulation"_i18n); //Pause pauseButton->SetIcon(IconPause); pauseButton->SetTogglable(true); pauseButton->SetActionCallback({ [this] { c->SetPaused(pauseButton->GetToggleState()); } }); @@ -324,7 +324,7 @@ GameView::GameView(): tempButton->SetActionCallback({ [this] { c->OpenElementSearch(); } }); AddComponent(tempButton); - colourPicker = new ui::Button(ui::Point((XRES/2)-8, YRES+1), ui::Point(16, 16), ""_ascii, "Pick Colour"_i18n); + colourPicker = new ui::Button(ui::Point((XRES/2)-8, YRES+1), ui::Point(16, 16), "", "Pick Colour"_i18n); colourPicker->SetActionCallback({ [this] { c->OpenColourPicker(); } }); } @@ -411,7 +411,7 @@ void GameView::NotifyMenuListChanged(GameModel * sender) { if (menuList[i]->GetVisible()) { - String tempString = ""_ascii; + String tempString = ""; tempString += menuList[i]->GetIcon(); String description = menuList[i]->GetDescription(); if (i == SC_FAVORITES && !Favorite::Ref().AnyFavorites()) @@ -569,7 +569,7 @@ void GameView::NotifyToolListChanged(GameModel * sender) tempTexture = ((DecorationTool*)tool)->GetIcon(tool->GetToolID(), 26, 14); if(tempTexture) - tempButton = new ToolButton(ui::Point(currentX, YRES+1), ui::Point(30, 18), ""_ascii, tool->GetIdentifier(), tool->GetDescription()); + tempButton = new ToolButton(ui::Point(currentX, YRES+1), ui::Point(30, 18), "", tool->GetIdentifier(), tool->GetDescription()); else tempButton = new ToolButton(ui::Point(currentX, YRES+1), ui::Point(30, 18), tool->GetName(), tool->GetIdentifier(), tool->GetDescription()); @@ -684,7 +684,7 @@ void GameView::NotifyColourPresetsChanged(GameModel * sender) int i = 0; for(std::vector::iterator iter = colours.begin(), end = colours.end(); iter != end; ++iter) { - ToolButton * tempButton = new ToolButton(ui::Point(currentX, YRES+1), ui::Point(30, 18), ""_ascii, "", "Decoration Presets."_i18n); + ToolButton * tempButton = new ToolButton(ui::Point(currentX, YRES+1), ui::Point(30, 18), "", "", "Decoration Presets."_i18n); tempButton->Appearance.BackgroundInactive = *iter; tempButton->SetActionCallback({ [this, i, tempButton] { c->SetActiveColourPreset(i); @@ -816,7 +816,7 @@ void GameView::NotifySaveChanged(GameModel * sender) for (std::list::const_iterator iter = tags.begin(), begin = tags.begin(), end = tags.end(); iter != end; iter++) { if (iter != begin) - tagsStream << " "_ascii; + tagsStream << " "; tagsStream << iter->FromUtf8(); } tagSimulationButton->SetText(tagsStream.Build()); @@ -2150,7 +2150,7 @@ void GameView::OnDraw() sampleInfo << c->ElementResolve(type, ctype); auto filtModes = i18nMulti("set colour", "AND", "OR", "subtract colour", "red shift", "blue shift", "no effect", "XOR", "NOT", "old QRTZ scattering", "variable red shift", "variable blue shift"); if (sample.particle.tmp>=0 && sample.particle.tmp<=11) - sampleInfo << " ("_ascii << filtModes[sample.particle.tmp] << ")"_ascii; + sampleInfo << " (" << filtModes[sample.particle.tmp] << ")"; else sampleInfo << " (unknown mode)"_i18n; } @@ -2158,14 +2158,14 @@ void GameView::OnDraw() { sampleInfo << c->ElementResolve(type, ctype); if (wavelengthGfx) - sampleInfo << " ("_ascii << ctype << ")"_ascii; + sampleInfo << " (" << ctype << ")"; // Some elements store extra LIFE info in upper bits of ctype, instead of tmp/tmp2 else if (type == PT_CRAY || type == PT_DRAY || type == PT_CONV) - sampleInfo << " ("_ascii << c->ElementResolve(TYP(ctype), ID(ctype)) << ")"_ascii; + sampleInfo << " (" << c->ElementResolve(TYP(ctype), ID(ctype)) << ")"; else if (c->IsValidElement(ctype)) - sampleInfo << " ("_ascii << c->ElementResolve(ctype, -1) << ")"_ascii; + sampleInfo << " (" << c->ElementResolve(ctype, -1) << ")"; else - sampleInfo << " ()"_ascii; + sampleInfo << " ()"; } sampleInfo << ", Temp: "_i18n << (sample.particle.temp - 273.15f) << " C"_i18n; sampleInfo << ", Life: "_i18n << sample.particle.life; @@ -2176,7 +2176,7 @@ void GameView::OnDraw() String elemName = c->ElementResolve( TYP(sample.particle.tmp), ID(sample.particle.tmp)); - if (elemName == ""_ascii) + if (elemName == "") sampleInfo << ", Tmp: "_i18n << sample.particle.tmp; else sampleInfo << ", Tmp: "_i18n << elemName; @@ -2259,12 +2259,12 @@ void GameView::OnDraw() sampleInfo << Format::Precision(2); if (type) - sampleInfo << "#"_ascii << sample.ParticleID << ", "_ascii; + sampleInfo << "#" << sample.ParticleID << ", "; - sampleInfo << "X:"_ascii << sample.PositionX << " Y:"_ascii << sample.PositionY; + sampleInfo << "X:" << sample.PositionX << " Y:" << sample.PositionY; if (sample.Gravity) - sampleInfo << ", GX: "_ascii << sample.GravityVelocityX << " GY: "_ascii << sample.GravityVelocityY; + sampleInfo << ", GX: " << sample.GravityVelocityX << " GY: " << sample.GravityVelocityY; if (c->GetAHeatEnable()) sampleInfo << ", AHeat: "_i18n << sample.AirTemperature - 273.15f << " C"_i18n; @@ -2284,7 +2284,7 @@ void GameView::OnDraw() if (showDebug) { if (ren->findingElement) - fpsInfo << " Parts: "_i18n << ren->foundElements << "/"_ascii << sample.NumParts; + fpsInfo << " Parts: "_i18n << ren->foundElements << "/" << sample.NumParts; else fpsInfo << " Parts: "_i18n << sample.NumParts; } diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp index 66726d578..c64a631a6 100644 --- a/src/gui/game/PropertyTool.cpp +++ b/src/gui/game/PropertyTool.cpp @@ -69,10 +69,10 @@ sim(sim_) } property->SetOption(Client::Ref().GetPrefInteger("Prop.Type", 0)); - textField = new ui::Textbox(ui::Point(8, 46), ui::Point(Size.X-16, 16), ""_ascii, "[value]"_i18n); + textField = new ui::Textbox(ui::Point(8, 46), ui::Point(Size.X-16, 16), "", "[value]"_i18n); textField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; textField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; - textField->SetText(Client::Ref().GetPrefString("Prop.Value", ""_ascii)); + textField->SetText(Client::Ref().GetPrefString("Prop.Value", "")); AddComponent(textField); FocusComponent(textField); @@ -91,12 +91,12 @@ void PropertyWindow::SetProperty() case StructProperty::ParticleType: { int v; - if(value.length() > 2 && value.BeginsWith("0x"_ascii)) + if(value.length() > 2 && value.BeginsWith("0x")) { //0xC0FFEE v = value.Substr(2).ToNumber(Format::Hex()); } - else if(value.length() > 1 && value.BeginsWith("#"_ascii)) + else if(value.length() > 1 && value.BeginsWith("#")) { //#C0FFEE v = value.Substr(1).ToNumber(Format::Hex()); @@ -134,12 +134,12 @@ void PropertyWindow::SetProperty() case StructProperty::UInteger: { unsigned int v; - if(value.length() > 2 && value.BeginsWith("0x"_ascii)) + if(value.length() > 2 && value.BeginsWith("0x")) { //0xC0FFEE v = value.Substr(2).ToNumber(Format::Hex()); } - else if(value.length() > 1 && value.BeginsWith("#"_ascii)) + else if(value.length() > 1 && value.BeginsWith("#")) { //#C0FFEE v = value.Substr(1).ToNumber(Format::Hex()); @@ -156,12 +156,12 @@ void PropertyWindow::SetProperty() } case StructProperty::Float: { - if (value.EndsWith("C"_ascii)) + if (value.EndsWith("C")) { float v = value.SubstrFromEnd(1).ToNumber(); tool->propValue.Float = v + 273.15; } - else if(value.EndsWith("F"_ascii)) + else if(value.EndsWith("F")) { float v = value.SubstrFromEnd(1).ToNumber(); tool->propValue.Float = (v-32.0f)*5/9+273.15f; diff --git a/src/gui/game/QuickOptions.cpp b/src/gui/game/QuickOptions.cpp index 339b02662..854ed91c9 100644 --- a/src/gui/game/QuickOptions.cpp +++ b/src/gui/game/QuickOptions.cpp @@ -6,7 +6,7 @@ #include "simulation/Simulation.h" SandEffectOption::SandEffectOption(GameModel * m): -QuickOption("P"_ascii, "Sand effect"_i18n, m, Toggle) +QuickOption("P", "Sand effect"_i18n, m, Toggle) { } @@ -22,7 +22,7 @@ void SandEffectOption::perform() DrawGravOption::DrawGravOption(GameModel * m): -QuickOption("G"_ascii, "Draw gravity field \bg(ctrl+g)"_i18n, m, Toggle) +QuickOption("G", "Draw gravity field \bg(ctrl+g)"_i18n, m, Toggle) { } @@ -38,7 +38,7 @@ void DrawGravOption::perform() DecorationsOption::DecorationsOption(GameModel * m): -QuickOption("D"_ascii, "Draw decorations \bg(ctrl+b)"_i18n, m, Toggle) +QuickOption("D", "Draw decorations \bg(ctrl+b)"_i18n, m, Toggle) { } @@ -54,7 +54,7 @@ void DecorationsOption::perform() NGravityOption::NGravityOption(GameModel * m): -QuickOption("N"_ascii, "Newtonian Gravity \bg(n)"_i18n, m, Toggle) +QuickOption("N", "Newtonian Gravity \bg(n)"_i18n, m, Toggle) { } @@ -70,7 +70,7 @@ void NGravityOption::perform() AHeatOption::AHeatOption(GameModel * m): -QuickOption("A"_ascii, "Ambient heat \bg(u)"_i18n, m, Toggle) +QuickOption("A", "Ambient heat \bg(u)"_i18n, m, Toggle) { } @@ -86,7 +86,7 @@ void AHeatOption::perform() ConsoleShowOption::ConsoleShowOption(GameModel * m, GameController * c_): -QuickOption("C"_ascii, "Show Console \bg(~)"_i18n, m, Toggle) +QuickOption("C", "Show Console \bg(~)"_i18n, m, Toggle) { c = c_; } diff --git a/src/gui/game/RenderPreset.h b/src/gui/game/RenderPreset.h index c2c39728e..301d16ea5 100644 --- a/src/gui/game/RenderPreset.h +++ b/src/gui/game/RenderPreset.h @@ -8,7 +8,7 @@ public: std::vector DisplayModes; unsigned int ColourMode; - RenderPreset(): Name(""_ascii), ColourMode(0) {} + RenderPreset(): Name(""), ColourMode(0) {} RenderPreset(String name, std::vector renderModes, std::vector displayModes, unsigned int colourMode): Name(name), RenderModes(renderModes), diff --git a/src/gui/game/SignTool.cpp b/src/gui/game/SignTool.cpp index 06bcb3d3c..9cc04077e 100644 --- a/src/gui/game/SignTool.cpp +++ b/src/gui/game/SignTool.cpp @@ -100,7 +100,7 @@ SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Poi justification->SetOption(1); justification->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; - textField = new ui::Textbox(ui::Point(8, 25), ui::Point(Size.X-16, 17), ""_ascii, "[message]"_i18n); + textField = new ui::Textbox(ui::Point(8, 25), ui::Point(Size.X-16, 17), "", "[message]"_i18n); textField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; textField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; textField->SetLimit(45); diff --git a/src/gui/game/Tool.h b/src/gui/game/Tool.h index a64d7615f..92f87484e 100644 --- a/src/gui/game/Tool.h +++ b/src/gui/game/Tool.h @@ -47,7 +47,7 @@ class SignTool: public Tool public: GameModel * gameModel; SignTool(GameModel *model): - Tool(0, "SIGN"_ascii, "Sign. Displays text. Click on a sign to edit it or anywhere else to place a new one."_i18n, 0, 0, 0, "DEFAULT_UI_SIGN", SignTool::GetIcon), + Tool(0, "SIGN", "Sign. Displays text. Click on a sign to edit it or anywhere else to place a new one."_i18n, 0, 0, 0, "DEFAULT_UI_SIGN", SignTool::GetIcon), gameModel(model) { } @@ -65,7 +65,7 @@ class SampleTool: public Tool GameModel * gameModel; public: SampleTool(GameModel *model): - Tool(0, "SMPL"_ascii, "Sample an element on the screen."_i18n, 0, 0, 0, "DEFAULT_UI_SAMPLE", SampleTool::GetIcon), + Tool(0, "SMPL", "Sample an element on the screen."_i18n, 0, 0, 0, "DEFAULT_UI_SAMPLE", SampleTool::GetIcon), gameModel(model) { } @@ -82,7 +82,7 @@ class PropertyTool: public Tool { public: PropertyTool(): - Tool(0, "PROP"_ascii, "Property Drawing Tool. Use to alter the properties of elements in the field."_i18n, 0xfe, 0xa9, 0x00, "DEFAULT_UI_PROPERTY", NULL) + Tool(0, "PROP", "Property Drawing Tool. Use to alter the properties of elements in the field."_i18n, 0xfe, 0xa9, 0x00, "DEFAULT_UI_PROPERTY", NULL) { } StructProperty::PropertyType propType; diff --git a/src/gui/interface/Button.cpp b/src/gui/interface/Button.cpp index 53d2ccefa..e9e099b0d 100644 --- a/src/gui/interface/Button.cpp +++ b/src/gui/interface/Button.cpp @@ -29,7 +29,7 @@ void Button::TextPosition(String ButtonText) { int position = Graphics::textwidthx(buttonDisplayText, Size.X - (Appearance.icon? 38 : 22)); buttonDisplayText = buttonDisplayText.erase(position, buttonDisplayText.length()-position); - buttonDisplayText += "..."_ascii; + buttonDisplayText += "..."; } } diff --git a/src/gui/interface/DropDown.cpp b/src/gui/interface/DropDown.cpp index 58bde10d2..9c40964ea 100644 --- a/src/gui/interface/DropDown.cpp +++ b/src/gui/interface/DropDown.cpp @@ -120,7 +120,7 @@ std::pair DropDown::GetOption() { return options[optionIndex]; } - return std::pair(""_ascii, -1); + return std::pair("", -1); } void DropDown::SetOption(String option) diff --git a/src/gui/interface/Label.cpp b/src/gui/interface/Label.cpp index 8c55acfed..5cb95dc34 100644 --- a/src/gui/interface/Label.cpp +++ b/src/gui/interface/Label.cpp @@ -206,8 +206,8 @@ void Label::updateSelection() { auto indexL = displayTextWrapper.Clear2Index(selectionIndexL.clear_index); auto indexH = displayTextWrapper.Clear2Index(selectionIndexH.clear_index); - displayTextWithSelection.Insert(indexL.wrapped_index , "\x01"_ascii); - displayTextWithSelection.Insert(indexH.wrapped_index + 1, "\x01"_ascii); + displayTextWithSelection.Insert(indexL.wrapped_index , "\x01"); + displayTextWithSelection.Insert(indexH.wrapped_index + 1, "\x01"); } } diff --git a/src/gui/interface/ProgressBar.cpp b/src/gui/interface/ProgressBar.cpp index d4157d654..c5eb5f81e 100644 --- a/src/gui/interface/ProgressBar.cpp +++ b/src/gui/interface/ProgressBar.cpp @@ -12,7 +12,7 @@ ProgressBar::ProgressBar(Point position, Point size, int startProgress, String s Component(position, size), progress(0), intermediatePos(0.0f), - progressStatus(""_ascii) + progressStatus("") { SetStatus(startStatus); SetProgress(startProgress); diff --git a/src/gui/interface/RichLabel.cpp b/src/gui/interface/RichLabel.cpp index be3ac83f3..b4f4c91a8 100644 --- a/src/gui/interface/RichLabel.cpp +++ b/src/gui/interface/RichLabel.cpp @@ -29,7 +29,7 @@ public: RichLabel::RichLabel(Point position, Point size, String labelText): Component(position, size), textSource(labelText), - displayText(""_ascii) + displayText("") { updateRichText(); } @@ -42,7 +42,7 @@ RichLabel::~RichLabel() void RichLabel::updateRichText() { regions.clear(); - displayText = ""_ascii; + displayText = ""; if(textSource.length()) { diff --git a/src/gui/interface/SaveButton.cpp b/src/gui/interface/SaveButton.cpp index 09a5a156e..c3025d530 100644 --- a/src/gui/interface/SaveButton.cpp +++ b/src/gui/interface/SaveButton.cpp @@ -41,7 +41,7 @@ SaveButton::SaveButton(Point position, Point size, SaveInfo * save_) : SaveButto { int position = Graphics::textwidthx(name, Size.X - 22); name = name.erase(position, name.length()-position); - name += "..."_ascii; + name += "..."; } String votes, icon; @@ -102,7 +102,7 @@ SaveButton::SaveButton(Point position, Point size, SaveFile * file_) : SaveButto { int position = Graphics::textwidthx(name, Size.X - 22); name = name.erase(position, name.length()-position); - name += "..."_ascii; + name += "..."; } } } diff --git a/src/gui/interface/Textbox.cpp b/src/gui/interface/Textbox.cpp index 329f4911c..e1ff5771b 100644 --- a/src/gui/interface/Textbox.cpp +++ b/src/gui/interface/Textbox.cpp @@ -16,7 +16,7 @@ using namespace ui; Textbox::Textbox(Point position, Point size, String textboxText, String textboxPlaceholder): - Label(position, size, ""_ascii), + Label(position, size, ""), ReadOnly(false), inputType(All), limit(String::npos), @@ -369,8 +369,8 @@ void Textbox::OnVKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, if (ctrl) { size_t stopChar; - stopChar = backingText.SplitByNot(" .,!?\n"_ascii, cursor).PositionBefore(); - stopChar = backingText.SplitByAny(" .,!?\n"_ascii, stopChar).PositionBefore(); + stopChar = backingText.SplitByNot(" .,!?\n", cursor).PositionBefore(); + stopChar = backingText.SplitByAny(" .,!?\n", stopChar).PositionBefore(); backingText.EraseBetween(cursor, stopChar); } else @@ -395,11 +395,11 @@ void Textbox::OnVKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, if (ctrl) { size_t stopChar; - stopChar = backingText.SplitFromEndByNot(" .,!?\n"_ascii, cursor).PositionBefore(); + stopChar = backingText.SplitFromEndByNot(" .,!?\n", cursor).PositionBefore(); if (stopChar == backingText.npos) stopChar = -1; else - stopChar = backingText.SplitFromEndByAny(" .,!?\n"_ascii, stopChar).PositionBefore(); + stopChar = backingText.SplitFromEndByAny(" .,!?\n", stopChar).PositionBefore(); backingText.EraseBetween(stopChar+1, cursor); cursor = stopChar+1; } @@ -413,14 +413,14 @@ void Textbox::OnVKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, ClearSelection(); break; case SDLK_RETURN: - OnTextInput("\n"_ascii); + OnTextInput("\n"); break; } } catch (std::out_of_range &e) { cursor = 0; - backingText = ""_ascii; + backingText = ""; } AfterTextChange(changed); } diff --git a/src/gui/interface/Window.cpp b/src/gui/interface/Window.cpp index 2c7769302..fa47375b9 100644 --- a/src/gui/interface/Window.cpp +++ b/src/gui/interface/Window.cpp @@ -236,8 +236,8 @@ void Window::DoDraw() Graphics * g = ui::Engine::Ref().g; String tempString, tempString2; - tempString = String::Build("Position: L "_ascii, focusedComponent_->Position.X, ", R "_ascii, Size.X-(focusedComponent_->Position.X+focusedComponent_->Size.X), ", T: "_ascii, focusedComponent_->Position.Y, ", B: "_ascii, Size.Y-(focusedComponent_->Position.Y+focusedComponent_->Size.Y)); - tempString2 = String::Build("Size: "_ascii, focusedComponent_->Size.X, ", "_ascii, focusedComponent_->Size.Y); + tempString = String::Build("Position: L ", focusedComponent_->Position.X, ", R ", Size.X-(focusedComponent_->Position.X+focusedComponent_->Size.X), ", T: ", focusedComponent_->Position.Y, ", B: ", Size.Y-(focusedComponent_->Position.Y+focusedComponent_->Size.Y)); + tempString2 = String::Build("Size: ", focusedComponent_->Size.X, ", ", focusedComponent_->Size.Y); if (Graphics::textwidth(tempString)+xPos > WINDOWW) xPos = WINDOWW-(Graphics::textwidth(tempString)+5); diff --git a/src/gui/localbrowser/LocalBrowserView.cpp b/src/gui/localbrowser/LocalBrowserView.cpp index 6191e5bfa..8bd54f274 100644 --- a/src/gui/localbrowser/LocalBrowserView.cpp +++ b/src/gui/localbrowser/LocalBrowserView.cpp @@ -29,13 +29,13 @@ LocalBrowserView::LocalBrowserView(): AddComponent(previousButton); AddComponent(undeleteButton); - pageTextbox = new ui::Textbox(ui::Point(283, WINDOWH-18), ui::Point(41, 16), ""_ascii); + pageTextbox = new ui::Textbox(ui::Point(283, WINDOWH-18), ui::Point(41, 16), ""); pageTextbox->SetActionCallback({ [this] { textChanged(); } }); pageTextbox->SetInputType(ui::Textbox::Number); auto pageOf = i18nMulti("Page", "of "); //page [TEXTBOX] of y pageLabel = new ui::Label(ui::Point(0, WINDOWH-18), ui::Point(30, 16), pageOf[0]); pageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignRight; - pageCountLabel = new ui::Label(ui::Point(WINDOWW/2+6, WINDOWH-18), ui::Point(50, 16), ""_ascii); + pageCountLabel = new ui::Label(ui::Point(WINDOWW/2+6, WINDOWH-18), ui::Point(50, 16), ""); pageCountLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; AddComponent(pageLabel); AddComponent(pageCountLabel); diff --git a/src/gui/login/LoginView.cpp b/src/gui/login/LoginView.cpp index 5285b19c5..9e484e667 100644 --- a/src/gui/login/LoginView.cpp +++ b/src/gui/login/LoginView.cpp @@ -19,9 +19,9 @@ LoginView::LoginView(): loginButton(new ui::Button(ui::Point(200-100, 87-17), ui::Point(100, 17), "Sign in"_i18n)), cancelButton(new ui::Button(ui::Point(0, 87-17), ui::Point(101, 17), "Sign Out"_i18n)), titleLabel(new ui::Label(ui::Point(4, 5), ui::Point(200-16, 16), "Server login"_i18n)), - infoLabel(new ui::Label(ui::Point(8, 67), ui::Point(200-16, 16), ""_ascii)), + infoLabel(new ui::Label(ui::Point(8, 67), ui::Point(200-16, 16), "")), usernameField(new ui::Textbox(ui::Point(8, 25), ui::Point(200-16, 17), Client::Ref().GetAuthUser().Username.FromUtf8(), "[username]"_i18n)), - passwordField(new ui::Textbox(ui::Point(8, 46), ui::Point(200-16, 17), ""_ascii, "[password]"_i18n)), + passwordField(new ui::Textbox(ui::Point(8, 46), ui::Point(200-16, 17), "", "[password]"_i18n)), targetSize(0, 0) { targetSize = Size; diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp index e5b29ac88..a3eefc6f3 100644 --- a/src/gui/options/OptionsView.cpp +++ b/src/gui/options/OptionsView.cpp @@ -55,7 +55,7 @@ OptionsView::OptionsView(): AddComponent(scrollPanel); - heatSimulation = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Heat simulation \bgIntroduced in version 34"_i18n, ""_ascii); + heatSimulation = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Heat simulation \bgIntroduced in version 34"_i18n, ""); autowidth(heatSimulation); heatSimulation->SetActionCallback({ [this] { c->SetHeatSimulation(heatSimulation->GetChecked()); } }); scrollPanel->AddChild(heatSimulation); @@ -67,7 +67,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(tempLabel); currentY+=16; - ambientHeatSimulation = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Ambient heat simulation \bgIntroduced in version 50"_i18n, ""_ascii); + ambientHeatSimulation = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Ambient heat simulation \bgIntroduced in version 50"_i18n, ""); autowidth(ambientHeatSimulation); ambientHeatSimulation->SetActionCallback({ [this] { c->SetAmbientHeatSimulation(ambientHeatSimulation->GetChecked()); } }); scrollPanel->AddChild(ambientHeatSimulation); @@ -79,7 +79,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(tempLabel); currentY+=16; - newtonianGravity = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Newtonian gravity \bgIntroduced in version 48"_i18n, ""_ascii); + newtonianGravity = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Newtonian gravity \bgIntroduced in version 48"_i18n, ""); autowidth(newtonianGravity); newtonianGravity->SetActionCallback({ [this] { c->SetNewtonianGravity(newtonianGravity->GetChecked()); } }); scrollPanel->AddChild(newtonianGravity); @@ -91,7 +91,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(tempLabel); currentY+=16; - waterEqualisation = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Water equalisation \bgIntroduced in version 61"_i18n, ""_ascii); + waterEqualisation = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Water equalisation \bgIntroduced in version 61"_i18n, ""); autowidth(waterEqualisation); waterEqualisation->SetActionCallback({ [this] { c->SetWaterEqualisation(waterEqualisation->GetChecked()); } }); scrollPanel->AddChild(waterEqualisation); @@ -173,7 +173,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(tempLabel); currentY+=20; - resizable = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Resizable"_i18n, ""_ascii); + resizable = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Resizable"_i18n, ""); autowidth(resizable); resizable->SetActionCallback({ [this] { c->SetResizable(resizable->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(resizable->Position.X+Graphics::textwidth(resizable->GetText())+20, currentY), ui::Point(1, 16), "\bg- Allow resizing and maximizing window"_i18n); @@ -184,7 +184,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(resizable); currentY+=20; - fullscreen = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Fullscreen"_i18n, ""_ascii); + fullscreen = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Fullscreen"_i18n, ""); autowidth(fullscreen); fullscreen->SetActionCallback({ [this] { c->SetFullscreen(fullscreen->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(fullscreen->Position.X+Graphics::textwidth(fullscreen->GetText())+20, currentY), ui::Point(1, 16), "\bg- Fill the entire screen"_i18n); @@ -195,7 +195,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(fullscreen); currentY+=20; - altFullscreen = new ui::Checkbox(ui::Point(23, currentY), ui::Point(1, 16), "Change Resolution"_i18n, ""_ascii); + altFullscreen = new ui::Checkbox(ui::Point(23, currentY), ui::Point(1, 16), "Change Resolution"_i18n, ""); autowidth(altFullscreen); altFullscreen->SetActionCallback({ [this] { c->SetAltFullscreen(altFullscreen->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(altFullscreen->Position.X+Graphics::textwidth(altFullscreen->GetText())+20, currentY), ui::Point(1, 16), "\bg- Set optimal screen resolution"_i18n); @@ -206,7 +206,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(altFullscreen); currentY+=20; - forceIntegerScaling = new ui::Checkbox(ui::Point(23, currentY), ui::Point(1, 16), "Force Integer Scaling"_i18n, ""_ascii); + forceIntegerScaling = new ui::Checkbox(ui::Point(23, currentY), ui::Point(1, 16), "Force Integer Scaling"_i18n, ""); autowidth(forceIntegerScaling); forceIntegerScaling->SetActionCallback({ [this] { c->SetForceIntegerScaling(forceIntegerScaling->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(altFullscreen->Position.X+Graphics::textwidth(forceIntegerScaling->GetText())+20, currentY), ui::Point(1, 16), "\bg- Less blurry"_i18n); @@ -217,7 +217,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(forceIntegerScaling); currentY+=20; - fastquit = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Fast Quit"_i18n, ""_ascii); + fastquit = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Fast Quit"_i18n, ""); autowidth(fastquit); fastquit->SetActionCallback({ [this] { c->SetFastQuit(fastquit->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(fastquit->Position.X+Graphics::textwidth(fastquit->GetText())+20, currentY), ui::Point(1, 16), "\bg- Always exit completely when hitting close"_i18n); @@ -228,7 +228,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(fastquit); currentY+=20; - showAvatars = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Show Avatars"_i18n, ""_ascii); + showAvatars = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Show Avatars"_i18n, ""); autowidth(showAvatars); showAvatars->SetActionCallback({ [this] { c->SetShowAvatars(showAvatars->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(showAvatars->Position.X+Graphics::textwidth(showAvatars->GetText())+20, currentY), ui::Point(1, 16), "\bg- Disable if you have a slow connection"_i18n); @@ -239,7 +239,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(showAvatars); currentY+=20; - mouseClickRequired = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Sticky Categories"_i18n, ""_ascii); + mouseClickRequired = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Sticky Categories"_i18n, ""); autowidth(mouseClickRequired); mouseClickRequired->SetActionCallback({ [this] { c->SetMouseClickrequired(mouseClickRequired->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(mouseClickRequired->Position.X+Graphics::textwidth(mouseClickRequired->GetText())+20, currentY), ui::Point(1, 16), "\bg- Switch between categories by clicking"_i18n); @@ -250,7 +250,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(mouseClickRequired); currentY+=20; - includePressure = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Include Pressure"_i18n, ""_ascii); + includePressure = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Include Pressure"_i18n, ""); autowidth(includePressure); includePressure->SetActionCallback({ [this] { c->SetIncludePressure(includePressure->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(includePressure->Position.X+Graphics::textwidth(includePressure->GetText())+20, currentY), ui::Point(1, 16), "\bg- When saving, copying, stamping, etc."_i18n); @@ -261,7 +261,7 @@ OptionsView::OptionsView(): scrollPanel->AddChild(includePressure); currentY+=20; - perfectCirclePressure = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Perfect Circle"_i18n, ""_ascii); + perfectCirclePressure = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Perfect Circle"_i18n, ""); autowidth(perfectCirclePressure); perfectCirclePressure->SetActionCallback({ [this] { c->SetPerfectCircle(perfectCirclePressure->GetChecked()); } }); tempLabel = new ui::Label(ui::Point(perfectCirclePressure->Position.X+Graphics::textwidth(perfectCirclePressure->GetText())+20, currentY), ui::Point(1, 16), "\bg- Better circle brush, without incorrect points on edges"_i18n); diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp index 43d8a0125..263483506 100644 --- a/src/gui/preview/PreviewView.cpp +++ b/src/gui/preview/PreviewView.cpp @@ -40,7 +40,7 @@ PreviewView::PreviewView(): userIsAuthor(false), doOpen(false), doError(false), - doErrorMessage(""_ascii), + doErrorMessage(""), showAvatars(true), prevPage(false), commentBoxHeight(20), @@ -72,7 +72,7 @@ PreviewView::PreviewView(): reportButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; reportButton->SetIcon(IconReport); reportButton->SetActionCallback({ [this] { - new TextPrompt("Report Save"_i18n, "Things to consider when reporting:\n\bw1)\bg When reporting stolen saves, please include the ID of the original save.\n\bw2)\bg Do not ask for saves to be removed from front page unless they break the rules.\n\bw3)\bg You may report saves for comments or tags too (including your own saves)"_i18n, ""_ascii, "[reason]"_i18n, true, { [this](String const &resultText) { + new TextPrompt("Report Save"_i18n, "Things to consider when reporting:\n\bw1)\bg When reporting stolen saves, please include the ID of the original save.\n\bw2)\bg Do not ask for saves to be removed from front page unless they break the rules.\n\bw3)\bg You may report saves for comments or tags too (including your own saves)"_i18n, "", "[reason]"_i18n, true, { [this](String const &resultText) { c->Report(resultText); } }); } }); @@ -94,17 +94,17 @@ PreviewView::PreviewView(): AddComponent(browserOpenButton); if(showAvatars) - saveNameLabel = new ui::Label(ui::Point(39, (YRES/2)+4), ui::Point(100, 16), ""_ascii); + saveNameLabel = new ui::Label(ui::Point(39, (YRES/2)+4), ui::Point(100, 16), ""); else - saveNameLabel = new ui::Label(ui::Point(5, (YRES/2)+4), ui::Point(100, 16), ""_ascii); + saveNameLabel = new ui::Label(ui::Point(5, (YRES/2)+4), ui::Point(100, 16), ""); saveNameLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; saveNameLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(saveNameLabel); if(showAvatars) - saveDescriptionLabel = new ui::Label(ui::Point(5, (YRES/2)+4+15+21), ui::Point((XRES/2)-10, Size.Y-((YRES/2)+4+15+17)-25), ""_ascii); + saveDescriptionLabel = new ui::Label(ui::Point(5, (YRES/2)+4+15+21), ui::Point((XRES/2)-10, Size.Y-((YRES/2)+4+15+17)-25), ""); else - saveDescriptionLabel = new ui::Label(ui::Point(5, (YRES/2)+4+15+19), ui::Point((XRES/2)-10, Size.Y-((YRES/2)+4+15+17)-23), ""_ascii); + saveDescriptionLabel = new ui::Label(ui::Point(5, (YRES/2)+4+15+19), ui::Point((XRES/2)-10, Size.Y-((YRES/2)+4+15+17)-23), ""); saveDescriptionLabel->SetMultiline(true); saveDescriptionLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; saveDescriptionLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop; @@ -112,9 +112,9 @@ PreviewView::PreviewView(): AddComponent(saveDescriptionLabel); if(showAvatars) - authorDateLabel = new ui::Label(ui::Point(39, (YRES/2)+4+15), ui::Point(180, 16), ""_ascii); + authorDateLabel = new ui::Label(ui::Point(39, (YRES/2)+4+15), ui::Point(180, 16), ""); else - authorDateLabel = new ui::Label(ui::Point(5, (YRES/2)+4+15), ui::Point(200, 16), ""_ascii); + authorDateLabel = new ui::Label(ui::Point(5, (YRES/2)+4+15), ui::Point(200, 16), ""); authorDateLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; authorDateLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(authorDateLabel); @@ -131,12 +131,12 @@ PreviewView::PreviewView(): AddComponent(avatarButton); } - viewsLabel = new ui::Label(ui::Point((XRES/2)-80, (YRES/2)+4+15), ui::Point(80, 16), ""_ascii); + viewsLabel = new ui::Label(ui::Point((XRES/2)-80, (YRES/2)+4+15), ui::Point(80, 16), ""); viewsLabel->Appearance.HorizontalAlign = ui::Appearance::AlignRight; viewsLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(viewsLabel); - pageInfo = new ui::Label(ui::Point((XRES/2) + 85, Size.Y+1), ui::Point(70, 16), ""_ascii); + pageInfo = new ui::Label(ui::Point((XRES/2) + 85, Size.Y+1), ui::Point(70, 16), ""); pageInfo->Appearance.HorizontalAlign = ui::Appearance::AlignCentre; AddComponent(pageInfo); @@ -211,7 +211,7 @@ bool PreviewView::CheckSwearing(String text) for(auto const &pair : swearWords) for(size_t i = 0; i + pair.second <= bytes.length(); i++) { - md5_ascii(hash, (unsigned char *)(bytes.data() + i), pair.second); + md5(hash, (unsigned char *)(bytes.data() + i), pair.second); if(pair.first == hash) return true; } @@ -223,7 +223,7 @@ void PreviewView::CheckComment() if (!commentWarningLabel) return; String text = addCommentBox->GetText().ToLower(); - if (!userIsAuthor && (text.Contains("stolen"_ascii) || text.Contains("copied"_ascii))) + if (!userIsAuthor && (text.Contains("stolen") || text.Contains("copied"))) { if (!commentHelpText) { @@ -234,7 +234,7 @@ void PreviewView::CheckComment() commentHelpText = true; } } - else if (userIsAuthor && text.Contains("vote"_ascii)) + else if (userIsAuthor && text.Contains("vote")) { commentWarningLabel->SetText("Do not ask for votes"_i18n); commentHelpText = true; @@ -438,11 +438,11 @@ void PreviewView::NotifySaveChanged(PreviewModel * sender) if (showAvatars) { avatarButton->SetUsername(save->userName); - authorDateLabel->SetText("\bw"_ascii + save->userName.FromUtf8() + " \bg"_ascii + dateType + " \bw"_ascii + format::UnixtimeToDateMini(save->updatedDate).FromAscii()); + authorDateLabel->SetText("\bw" + save->userName.FromUtf8() + " \bg" + dateType + " \bw" + format::UnixtimeToDateMini(save->updatedDate).FromAscii()); } else { - authorDateLabel->SetText("\bgAuthor:\bw "_i18n + save->userName.FromUtf8() + " \bg"_ascii + dateType + " \bw"_ascii + format::UnixtimeToDateMini(save->updatedDate).FromAscii()); + authorDateLabel->SetText("\bgAuthor:\bw "_i18n + save->userName.FromUtf8() + " \bg" + dateType + " \bw" + format::UnixtimeToDateMini(save->updatedDate).FromAscii()); } if (Client::Ref().GetAuthUser().UserID && save->userName == Client::Ref().GetAuthUser().Username) userIsAuthor = true; @@ -490,9 +490,9 @@ void PreviewView::NotifySaveChanged(PreviewModel * sender) { votesUp = 0; votesDown = 0; - saveNameLabel->SetText(""_ascii); - authorDateLabel->SetText(""_ascii); - saveDescriptionLabel->SetText(""_ascii); + saveNameLabel->SetText(""); + authorDateLabel->SetText(""); + saveDescriptionLabel->SetText(""); favButton->Enabled = false; if (!sender->GetCanOpen()) openButton->Enabled = false; @@ -505,7 +505,7 @@ void PreviewView::submitComment() { String comment = addCommentBox->GetText(); submitCommentButton->Enabled = false; - addCommentBox->SetText(""_ascii); + addCommentBox->SetText(""); addCommentBox->SetPlaceholder("Submitting comment"_i18n); //This doesn't appear to ever show since no separate thread is created FocusComponent(NULL); @@ -540,7 +540,7 @@ void PreviewView::NotifyCommentBoxEnabledChanged(PreviewModel * sender) commentBoxSizeX = Size.X-(XRES/2)-48; commentBoxSizeY = 17; - addCommentBox = new ui::Textbox(ui::Point((XRES/2)+4, Size.Y-19), ui::Point(Size.X-(XRES/2)-48, 17), ""_ascii, "Add Comment"_i18n); + addCommentBox = new ui::Textbox(ui::Point((XRES/2)+4, Size.Y-19), ui::Point(Size.X-(XRES/2)-48, 17), "", "Add Comment"_i18n); addCommentBox->SetActionCallback({ [this] { CheckComment(); commentBoxAutoHeight(); diff --git a/src/gui/profile/ProfileActivity.cpp b/src/gui/profile/ProfileActivity.cpp index fbb32268e..35e79a825 100644 --- a/src/gui/profile/ProfileActivity.cpp +++ b/src/gui/profile/ProfileActivity.cpp @@ -17,7 +17,7 @@ ProfileActivity::ProfileActivity(ByteString username) : loading(false), saving(false), doError(false), - doErrorMessage(""_ascii) + doErrorMessage("") { editable = Client::Ref().GetAuthUser().UserID && Client::Ref().GetAuthUser().Username == username; diff --git a/src/gui/render/RenderView.cpp b/src/gui/render/RenderView.cpp index 26dfaa8ad..c5aedf1b1 100644 --- a/src/gui/render/RenderView.cpp +++ b/src/gui/render/RenderView.cpp @@ -21,12 +21,12 @@ public: RenderView::RenderView(): ui::Window(ui::Point(0, 0), ui::Point(XRES, WINDOWH)), ren(NULL), - toolTip(""_ascii), + toolTip(""), toolTipPresence(0), isToolTipFadingIn(false) { auto addPresetButton = [this](int index, Icon icon, ui::Point offset, String tooltip) { - auto *presetButton = new ui::Button(ui::Point(XRES, YRES) + offset, ui::Point(30, 13), ""_ascii, tooltip); + auto *presetButton = new ui::Button(ui::Point(XRES, YRES) + offset, ui::Point(30, 13), "", tooltip); presetButton->SetIcon(icon); presetButton->SetActionCallback({ [this, index] { c->LoadRenderPreset(index); } }); AddComponent(presetButton); @@ -44,7 +44,7 @@ RenderView::RenderView(): addPresetButton(10, IconLife , ui::Point(-232, 6), "Life display mode preset"_i18n); auto addRenderModeCheckbox = [this](unsigned int mode, Icon icon, ui::Point offset, String tooltip) { - auto *renderModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), ""_ascii, tooltip); + auto *renderModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), "", tooltip); renderModes.push_back(renderModeCheckbox); renderModeCheckbox->mode = mode; renderModeCheckbox->SetIcon(icon); @@ -65,7 +65,7 @@ RenderView::RenderView(): addRenderModeCheckbox(RENDER_SPRK, IconEffect, ui::Point(97, 4), "Glow effect on sparks"_i18n); auto addDisplayModeCheckbox = [this](unsigned int mode, Icon icon, ui::Point offset, String tooltip) { - auto *displayModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), ""_ascii, tooltip); + auto *displayModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), "", tooltip); displayModes.push_back(displayModeCheckbox); displayModeCheckbox->mode = mode; displayModeCheckbox->SetIcon(icon); @@ -95,7 +95,7 @@ RenderView::RenderView(): line3 = 270; auto addColourModeCheckbox = [this](unsigned int mode, Icon icon, ui::Point offset, String tooltip) { - auto *colourModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), ""_ascii, tooltip); + auto *colourModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), "", tooltip); colourModes.push_back(colourModeCheckbox); colourModeCheckbox->mode = mode; colourModeCheckbox->SetIcon(icon); diff --git a/src/gui/save/LocalSaveActivity.cpp b/src/gui/save/LocalSaveActivity.cpp index 137a3fbb3..ac45400cc 100644 --- a/src/gui/save/LocalSaveActivity.cpp +++ b/src/gui/save/LocalSaveActivity.cpp @@ -76,7 +76,7 @@ void LocalSaveActivity::OnTick(float dt) void LocalSaveActivity::Save() { - if (filenameField->GetText().Contains('/') || filenameField->GetText().BeginsWith("."_ascii)) + if (filenameField->GetText().Contains('/') || filenameField->GetText().BeginsWith(".")) { new ErrorMessage("Error"_i18n, "Invalid filename."_i18n); } diff --git a/src/gui/save/ServerSaveActivity.cpp b/src/gui/save/ServerSaveActivity.cpp index 07045a406..3545b6187 100644 --- a/src/gui/save/ServerSaveActivity.cpp +++ b/src/gui/save/ServerSaveActivity.cpp @@ -61,7 +61,7 @@ ServerSaveActivity::ServerSaveActivity(SaveInfo save, OnUploaded onUploaded_) : onUploaded(onUploaded_), saveUploadTask(NULL) { - titleLabel = new ui::Label(ui::Point(4, 5), ui::Point((Size.X/2)-8, 16), ""_ascii); + titleLabel = new ui::Label(ui::Point(4, 5), ui::Point((Size.X/2)-8, 16), ""); titleLabel->SetTextColour(style::Colour::InformationTitle); titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; @@ -88,7 +88,7 @@ ServerSaveActivity::ServerSaveActivity(SaveInfo save, OnUploaded onUploaded_) : descriptionField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; AddComponent(descriptionField); - publishedCheckbox = new ui::Checkbox(ui::Point(8, 45), ui::Point((Size.X/2)-80, 16), "Publish"_i18n, ""_ascii); + publishedCheckbox = new ui::Checkbox(ui::Point(8, 45), ui::Point((Size.X/2)-80, 16), "Publish"_i18n, ""); if(Client::Ref().GetAuthUser().Username != save.GetUserName()) { //Save is not owned by the user, disable by default @@ -101,7 +101,7 @@ ServerSaveActivity::ServerSaveActivity(SaveInfo save, OnUploaded onUploaded_) : } AddComponent(publishedCheckbox); - pausedCheckbox = new ui::Checkbox(ui::Point(160, 45), ui::Point(55, 16), "Paused"_i18n, ""_ascii); + pausedCheckbox = new ui::Checkbox(ui::Point(160, 45), ui::Point(55, 16), "Paused"_i18n, ""); pausedCheckbox->SetChecked(save.GetGameSave()->paused); AddComponent(pausedCheckbox); diff --git a/src/gui/search/SearchController.cpp b/src/gui/search/SearchController.cpp index 5b949de00..cfe76c3c4 100644 --- a/src/gui/search/SearchController.cpp +++ b/src/gui/search/SearchController.cpp @@ -32,7 +32,7 @@ SearchController::SearchController(std::function onDone_): searchModel->AddObserver(searchView); searchView->AttachController(this); - searchModel->UpdateSaveList(1, ""_ascii); + searchModel->UpdateSaveList(1, ""); onDone = onDone_; } diff --git a/src/gui/search/SearchModel.cpp b/src/gui/search/SearchModel.cpp index 915ed0a08..dd92214e4 100644 --- a/src/gui/search/SearchModel.cpp +++ b/src/gui/search/SearchModel.cpp @@ -54,7 +54,7 @@ void SearchModel::updateSaveListT() void SearchModel::updateTagListT() { int tagResultCount; - std::vector > * tagList = Client::Ref().GetTags(0, 24, ""_ascii, tagResultCount); + std::vector > * tagList = Client::Ref().GetTags(0, 24, "", tagResultCount); updateTagListResult = tagList; updateTagListFinished = true; @@ -66,13 +66,13 @@ bool SearchModel::UpdateSaveList(int pageNumber, String query) if (!updateSaveListWorking) { lastQuery = query; - lastError = ""_ascii; + lastError = ""; saveListLoaded = false; saveList.clear(); //resultCount = 0; currentPage = pageNumber; - if(pageNumber == 1 && !showOwn && !showFavourite && currentSort == "best" && query == ""_ascii) + if(pageNumber == 1 && !showOwn && !showFavourite && currentSort == "best" && query == "") SetShowTags(true); else SetShowTags(false); @@ -133,7 +133,7 @@ void SearchModel::Update() if(updateSaveListFinished) { updateSaveListWorking = false; - lastError = ""_ascii; + lastError = ""; saveListLoaded = true; std::vector *tempSaveList = updateSaveListResult; @@ -149,7 +149,7 @@ void SearchModel::Update() { lastError = Client::Ref().GetLastError(); if (lastError == "Unspecified Error"_i18n) - lastError = ""_ascii; + lastError = ""; } resultCount = thResultCount; @@ -286,7 +286,7 @@ SearchModel::~SearchModel() int SearchModel::GetPageCount() { - if (!showOwn && !showFavourite && currentSort == "best" && lastQuery == ""_ascii) + if (!showOwn && !showFavourite && currentSort == "best" && lastQuery == "") return std::max(1, (int)(ceil(resultCount/20.0f))+1); //add one for front page (front page saves are repeated twice) else return std::max(1, (int)(ceil(resultCount/20.0f))); diff --git a/src/gui/search/SearchView.cpp b/src/gui/search/SearchView.cpp index f2ca83458..bf5ee9a1a 100644 --- a/src/gui/search/SearchView.cpp +++ b/src/gui/search/SearchView.cpp @@ -45,19 +45,19 @@ SearchView::SearchView(): } catch (std::exception & e) { } - pageTextbox = new ui::Textbox(ui::Point(283, WINDOWH-18), ui::Point(41, 16), ""_ascii); + pageTextbox = new ui::Textbox(ui::Point(283, WINDOWH-18), ui::Point(41, 16), ""); pageTextbox->SetActionCallback({ [this] { textChanged(); } }); pageTextbox->SetInputType(ui::Textbox::Number); auto pageOf = i18nMulti("Page", "of "); //page [TEXTBOX] of y pageLabel = new ui::Label(ui::Point(0, WINDOWH-18), ui::Point(30, 16), pageOf[0]); pageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignRight; - pageCountLabel = new ui::Label(ui::Point(WINDOWW/2+6, WINDOWH-18), ui::Point(50, 16), ""_ascii); + pageCountLabel = new ui::Label(ui::Point(WINDOWW/2+6, WINDOWH-18), ui::Point(50, 16), ""); pageCountLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; AddComponent(pageLabel); AddComponent(pageCountLabel); AddComponent(pageTextbox); - searchField = new ui::Textbox(ui::Point(60, 10), ui::Point(WINDOWW-238, 17), ""_ascii, "[search]"_i18n); + searchField = new ui::Textbox(ui::Point(60, 10), ui::Point(WINDOWW-238, 17), "", "[search]"_i18n); searchField->Appearance.icon = IconSearch; searchField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; searchField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; @@ -80,7 +80,7 @@ SearchView::SearchView(): ownButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(ownButton); - favButton = new ui::Button(searchField->Position+ui::Point(searchField->Size.X+15, 0), ui::Point(17, 17), ""_ascii); + favButton = new ui::Button(searchField->Position+ui::Point(searchField->Size.X+15, 0), ui::Point(17, 17), ""); favButton->SetIcon(IconFavourite); favButton->SetTogglable(true); favButton->Appearance.Margin.Left+=2; @@ -90,7 +90,7 @@ SearchView::SearchView(): favButton->Appearance.BorderInactive = ui::Colour(170,170,170); AddComponent(favButton); - ui::Button * clearSearchButton = new ui::Button(searchField->Position+ui::Point(searchField->Size.X-1, 0), ui::Point(17, 17), ""_ascii); + ui::Button * clearSearchButton = new ui::Button(searchField->Position+ui::Point(searchField->Size.X-1, 0), ui::Point(17, 17), ""); clearSearchButton->SetIcon(IconClose); clearSearchButton->SetActionCallback({ [this] { clearSearch(); } }); clearSearchButton->Appearance.Margin.Left+=2; @@ -167,7 +167,7 @@ void SearchView::doSearch() void SearchView::clearSearch() { - searchField->SetText(""_ascii); + searchField->SetText(""); c->DoSearch(searchField->GetText(), true); } @@ -513,7 +513,7 @@ void SearchView::NotifySaveListChanged(SearchModel * sender) else { if(sender->GetLastError().length()) - errorLabel->SetText("\bo"_ascii + sender->GetLastError()); + errorLabel->SetText("\bo" + sender->GetLastError()); else errorLabel->SetText("\boNo saves found"_i18n); } @@ -568,8 +568,8 @@ void SearchView::NotifySaveListChanged(SearchModel * sender) saveButton->AddContextMenu(0); saveButton->SetActionCallback({ [this, saveButton] { c->OpenSave(saveButton->GetSave()->GetID(), saveButton->GetSave()->GetVersion()); }, - [this, saveButton] { Search(String::Build("history:"_ascii, saveButton->GetSave()->GetID())); }, - [this, saveButton] { Search(String::Build("user:"_ascii, saveButton->GetSave()->GetUserName().FromUtf8())); }, + [this, saveButton] { Search(String::Build("history:", saveButton->GetSave()->GetID())); }, + [this, saveButton] { Search(String::Build("user:", saveButton->GetSave()->GetUserName().FromUtf8())); }, [this, saveButton] { c->Selected(saveButton->GetSave()->GetID(), saveButton->GetSelected()); } }); if(Client::Ref().GetAuthUser().UserID) diff --git a/src/gui/tags/TagsView.cpp b/src/gui/tags/TagsView.cpp index d71e82c40..c881c99d7 100644 --- a/src/gui/tags/TagsView.cpp +++ b/src/gui/tags/TagsView.cpp @@ -25,7 +25,7 @@ TagsView::TagsView(): AddComponent(closeButton); SetCancelButton(closeButton); - tagInput = new ui::Textbox(ui::Point(8, Size.Y-40), ui::Point(Size.X-60, 16), ""_ascii, "[new tag]"_i18n); + tagInput = new ui::Textbox(ui::Point(8, Size.Y-40), ui::Point(Size.X-60, 16), "", "[new tag]"_i18n); tagInput->Appearance.icon = IconTag; tagInput->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; tagInput->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; @@ -132,5 +132,5 @@ void TagsView::addTag() { new ErrorMessage("Could not add tag"_i18n, ByteString(ex.what()).FromUtf8()); } - tagInput->SetText(""_ascii); + tagInput->SetText(""); } diff --git a/src/lua/LegacyLuaAPI.cpp b/src/lua/LegacyLuaAPI.cpp index 9c44ac49d..9a6a2a22d 100644 --- a/src/lua/LegacyLuaAPI.cpp +++ b/src/lua/LegacyLuaAPI.cpp @@ -560,12 +560,12 @@ int luatpt_setconsole(lua_State* l) int luatpt_log(lua_State* l) { int args = lua_gettop(l); - String text = ""_ascii; + String text = ""; for(int i = 1; i <= args; i++) { luaL_tostring(l, -1); if(text.length()) - text=ByteString(luaL_optstring(l, -1, "")).FromUtf8() + ", "_ascii + text; + text=ByteString(luaL_optstring(l, -1, "")).FromUtf8() + ", " + text; else text=ByteString(luaL_optstring(l, -1, "")).FromUtf8(); lua_pop(l, 2); @@ -573,7 +573,7 @@ int luatpt_log(lua_State* l) if((*luacon_currentCommand)) { if(luacon_lastError->length()) - *luacon_lastError += "; "_ascii; + *luacon_lastError += "; "; *luacon_lastError += text; } else diff --git a/src/lua/LuaCheckbox.cpp b/src/lua/LuaCheckbox.cpp index 6d803d441..e20fa82ef 100644 --- a/src/lua/LuaCheckbox.cpp +++ b/src/lua/LuaCheckbox.cpp @@ -29,7 +29,7 @@ LuaCheckbox::LuaCheckbox(lua_State * l) : int sizeY = luaL_optinteger(l, 4, 10); String text = ByteString(luaL_optstring(l, 5, "")).FromUtf8(); - checkbox = new ui::Checkbox(ui::Point(posX, posY), ui::Point(sizeX, sizeY), text, ""_ascii); + checkbox = new ui::Checkbox(ui::Point(posX, posY), ui::Point(sizeX, sizeY), text, ""); component = checkbox; checkbox->SetActionCallback({ [this] { triggerAction(); } }); } diff --git a/src/lua/LuaScriptInterface.cpp b/src/lua/LuaScriptInterface.cpp index 4cb1fa21e..51bb342e8 100644 --- a/src/lua/LuaScriptInterface.cpp +++ b/src/lua/LuaScriptInterface.cpp @@ -221,7 +221,7 @@ LuaScriptInterface::LuaScriptInterface(GameController * c, GameModel * m): luacon_currentCommand = ¤tCommand; luacon_lastError = &lastError; - lastCode = ""_ascii; + lastCode = ""; //Replace print function with our screen logging thingy lua_pushcfunction(l, luatpt_log); @@ -2703,7 +2703,7 @@ void luaCreateWrapper(ELEMENT_CREATE_FUNC_ARGS) lua_pushinteger(luacon_ci->l, v); if (lua_pcall(luacon_ci->l, 5, 0, 0)) { - luacon_ci->Log(CommandInterface::LogError, "In create func: "_ascii + luacon_geterror().FromUtf8()); + luacon_ci->Log(CommandInterface::LogError, "In create func: " + luacon_geterror().FromUtf8()); lua_pop(luacon_ci->l, 1); } } @@ -2721,7 +2721,7 @@ bool luaCreateAllowedWrapper(ELEMENT_CREATE_ALLOWED_FUNC_ARGS) lua_pushinteger(luacon_ci->l, t); if (lua_pcall(luacon_ci->l, 4, 1, 0)) { - luacon_ci->Log(CommandInterface::LogError, "In create allowed: "_ascii + luacon_geterror().FromUtf8()); + luacon_ci->Log(CommandInterface::LogError, "In create allowed: " + luacon_geterror().FromUtf8()); lua_pop(luacon_ci->l, 1); } else @@ -2746,7 +2746,7 @@ void luaChangeTypeWrapper(ELEMENT_CHANGETYPE_FUNC_ARGS) lua_pushinteger(luacon_ci->l, to); if (lua_pcall(luacon_ci->l, 5, 0, 0)) { - luacon_ci->Log(CommandInterface::LogError, "In change type: "_ascii + luacon_geterror().FromUtf8()); + luacon_ci->Log(CommandInterface::LogError, "In change type: " + luacon_geterror().FromUtf8()); lua_pop(luacon_ci->l, 1); } } @@ -3916,7 +3916,7 @@ int LuaScriptInterface::Command(String command) { if (command[0] == '!') { - lastError = ""_ascii; + lastError = ""; int ret = legacy->Command(command.Substr(1)); lastError = legacy->GetLastError(); return ret; @@ -3924,13 +3924,13 @@ int LuaScriptInterface::Command(String command) else { int level = lua_gettop(l), ret = -1; - String text = ""_ascii; - lastError = ""_ascii; + String text = ""; + lastError = ""; currentCommand = true; if (lastCode.length()) - lastCode += "\n"_ascii; + lastCode += "\n"; lastCode += command; - ByteString tmp = ("return "_ascii + lastCode).ToUtf8(); + ByteString tmp = ("return " + lastCode).ToUtf8(); ui::Engine::Ref().LastTick(Platform::GetTime()); luaL_loadbuffer(l, tmp.c_str(), tmp.length(), "@console"); if (lua_type(l, -1) != LUA_TFUNCTION) @@ -3944,13 +3944,13 @@ int LuaScriptInterface::Command(String command) ByteString err = luacon_geterror(); lastError = err.FromUtf8(); if (err.Contains("near ''")) //the idea stolen from lua-5.1.5/lua.c - lastError = "..."_ascii; + lastError = "..."; else - lastCode = ""_ascii; + lastCode = ""; } else { - lastCode = ""_ascii; + lastCode = ""; ret = lua_pcall(l, 0, LUA_MULTRET, 0); if (ret) lastError = luacon_geterror().FromUtf8(); @@ -3960,7 +3960,7 @@ int LuaScriptInterface::Command(String command) { luaL_tostring(l, level); if (text.length()) - text += ", "_ascii + ByteString(luaL_optstring(l, -1, "")).FromUtf8(); + text += ", " + ByteString(luaL_optstring(l, -1, "")).FromUtf8(); else text = ByteString(luaL_optstring(l, -1, "")).FromUtf8(); lua_pop(l, 1); @@ -3968,7 +3968,7 @@ int LuaScriptInterface::Command(String command) if (text.length()) { if (lastError.length()) - lastError += "; "_ascii + text; + lastError += "; " + text; else lastError = text; } @@ -4014,13 +4014,13 @@ String highlight(String command) String::value_type const *wstart = raw + pos; while((w = wstart[len]) && ((w >= 'A' && w <= 'Z') || (w >= 'a' && w <= 'z') || (w >= '0' && w <= '9') || w == '_')) len++; -#define CMP(X) (String(wstart, len) == X##_ascii) +#define CMP(X) (String(wstart, len) == X) if(CMP("and") || CMP("break") || CMP("do") || CMP("else") || CMP("elseif") || CMP("end") || CMP("for") || CMP("function") || CMP("if") || CMP("in") || CMP("local") || CMP("not") || CMP("or") || CMP("repeat") || CMP("return") || CMP("then") || CMP("until") || CMP("while")) - result << "\x0F\xB5\x89\x01"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\xB5\x89\x01" << String(wstart, len) << "\bw"; else if(CMP("false") || CMP("nil") || CMP("true")) - result << "\x0F\xCB\x4B\x16"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\xCB\x4B\x16" << String(wstart, len) << "\bw"; else - result << "\x0F\x2A\xA1\x98"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\x2A\xA1\x98" << String(wstart, len) << "\bw"; #undef CMP pos += len; } @@ -4033,7 +4033,7 @@ String highlight(String command) String::value_type const *wstart = raw + pos; while((w = wstart[len]) && ((w >= '0' && w <= '9') || (w >= 'A' && w <= 'F') || (w >= 'a' && w <= 'f'))) len++; - result << "\x0F\xD3\x36\x82"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\xD3\x36\x82" << String(wstart, len) << "\bw"; pos += len; } else @@ -4062,7 +4062,7 @@ String highlight(String command) while((w = wstart[len]) && (w >= '0' && w <= '9')) len++; } - result << "\x0F\xD3\x36\x82"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\xD3\x36\x82" << String(wstart, len) << "\bw"; pos += len; } } @@ -4094,7 +4094,7 @@ String highlight(String command) } len++; } - result << "\x0F\xDC\x32\x2F"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\xDC\x32\x2F" << String(wstart, len) << "\bw"; pos += len; } else @@ -4110,7 +4110,7 @@ String highlight(String command) } if(w == c) len++; - result << "\x0F\xDC\x32\x2F"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\xDC\x32\x2F" << String(wstart, len) << "\bw"; pos += len; } } @@ -4142,7 +4142,7 @@ String highlight(String command) } len++; } - result << "\x0F\x85\x99\x01"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\x85\x99\x01" << String(wstart, len) << "\bw"; pos += len; } else @@ -4152,18 +4152,18 @@ String highlight(String command) String::value_type const *wstart = raw + pos; while((w = wstart[len]) && (w != '\n')) len++; - result << "\x0F\x85\x99\x01"_ascii << String(wstart, len) << "\bw"_ascii; + result << "\x0F\x85\x99\x01" << String(wstart, len) << "\bw"; pos += len; } } else if(c == '{' || c == '}') { - result << "\x0F\xCB\x4B\x16"_ascii << c << "\bw"_ascii; + result << "\x0F\xCB\x4B\x16" << c << "\bw"; pos++; } else if(c == '.' && raw[pos + 1] == '.' && raw[pos + 2] == '.') { - result << "\x0F\x2A\xA1\x98...\bw"_ascii; + result << "\x0F\x2A\xA1\x98...\bw"; pos += 3; } else @@ -4179,7 +4179,7 @@ String LuaScriptInterface::FormatCommand(String command) { if(command.size() && command[0] == '!') { - return "!"_ascii + legacy->FormatCommand(command.Substr(1)); + return "!" + legacy->FormatCommand(command.Substr(1)); } else return highlight(command); diff --git a/src/lua/TPTSTypes.cpp b/src/lua/TPTSTypes.cpp index c11821d79..c381bc1e0 100644 --- a/src/lua/TPTSTypes.cpp +++ b/src/lua/TPTSTypes.cpp @@ -71,7 +71,7 @@ AnyType::operator PointType() { int x, y; if(String::Split comma = (*value.str).SplitNumber(x)) - if(comma.After().BeginsWith(","_ascii)) + if(comma.After().BeginsWith(",")) if(String::Split end = comma.After().Substr(1).SplitNumber(y)) if(!end.After().size()) return PointType(x, y); diff --git a/src/lua/TPTScriptInterface.cpp b/src/lua/TPTScriptInterface.cpp index 286ca83e4..e5313d1a1 100644 --- a/src/lua/TPTScriptInterface.cpp +++ b/src/lua/TPTScriptInterface.cpp @@ -26,7 +26,7 @@ TPTScriptInterface::TPTScriptInterface(GameController * c, GameModel * m): Comma int TPTScriptInterface::Command(String command) { - lastError = ""_ascii; + lastError = ""; std::deque words; std::deque commandWords; int retCode = -1; @@ -62,21 +62,21 @@ ValueType TPTScriptInterface::testType(String word) size_t i = 0; String::value_type const *rawWord = word.c_str(); //Function - if (word == "set"_ascii) + if (word == "set") return TypeFunction; - else if (word == "create"_ascii) + else if (word == "create") return TypeFunction; - else if (word == "delete"_ascii) + else if (word == "delete") return TypeFunction; - else if (word == "kill"_ascii) + else if (word == "kill") return TypeFunction; - else if (word == "load"_ascii) + else if (word == "load") return TypeFunction; - else if (word == "reset"_ascii) + else if (word == "reset") return TypeFunction; - else if (word == "bubble"_ascii) + else if (word == "bubble") return TypeFunction; - else if (word == "quit"_ascii) + else if (word == "quit") return TypeFunction; //Basic type @@ -181,19 +181,19 @@ AnyType TPTScriptInterface::eval(std::deque * words) switch(wordType) { case TypeFunction: - if(word == "set"_ascii) + if(word == "set") return tptS_set(words); - else if(word == "create"_ascii) + else if(word == "create") return tptS_create(words); - else if(word == "delete"_ascii || word == "kill"_ascii) + else if(word == "delete" || word == "kill") return tptS_delete(words); - else if(word == "load"_ascii) + else if(word == "load") return tptS_load(words); - else if(word == "reset"_ascii) + else if(word == "reset") return tptS_reset(words); - else if(word == "bubble"_ascii) + else if(word == "bubble") return tptS_bubble(words); - else if(word == "quit"_ascii) + else if(word == "quit") return tptS_quit(words); break; case TypeNumber: @@ -204,7 +204,7 @@ AnyType TPTScriptInterface::eval(std::deque * words) { int x, y; if(String::Split comma = word.SplitNumber(x)) - if(comma.After().BeginsWith(","_ascii)) + if(comma.After().BeginsWith(",")) if(comma.After().Substr(1).SplitNumber(y)) return PointType(x, y); return PointType(0, 0); @@ -232,20 +232,20 @@ String TPTScriptInterface::FormatCommand(String command) switch(cType) { case TypeFunction: - outputData += "\bt"_ascii; + outputData += "\bt"; break; case TypeNumber: case TypePoint: - outputData += "\bo"_ascii; + outputData += "\bo"; break; case TypeString: - outputData += "\bg"_ascii; + outputData += "\bg"; break; default: - outputData += "\bw"_ascii; + outputData += "\bw"; break; } - outputData += words.front() + " "_ascii; + outputData += words.front() + " "; words.pop_front(); } return outputData; @@ -281,7 +281,7 @@ AnyType TPTScriptInterface::tptS_set(std::deque * words) } else if(value.GetType() == TypeString) { - if (property.Value() == "temp"_ascii) + if (property.Value() == "temp") { String newString = ((StringType)value).Value(); if (newString.at(newString.length()-1) == 'C') @@ -305,7 +305,7 @@ AnyType TPTScriptInterface::tptS_set(std::deque * words) } else throw GeneralException("Invalid value for assignment"_i18n); - if (property.Value() == "type"_ascii && (newValue < 0 || newValue >= PT_NUM || !sim->elements[newValue].Enabled)) + if (property.Value() == "type" && (newValue < 0 || newValue >= PT_NUM || !sim->elements[newValue].Enabled)) throw GeneralException("Invalid element"_i18n); if (selector.GetType() == TypePoint || selector.GetType() == TypeNumber) @@ -339,7 +339,7 @@ AnyType TPTScriptInterface::tptS_set(std::deque * words) } returnValue = 1; } - else if (selector.GetType() == TypeString && ((StringType)selector).Value() == "all"_ascii) + else if (selector.GetType() == TypeString && ((StringType)selector).Value() == "all") { switch(propertyFormat) { @@ -548,7 +548,7 @@ AnyType TPTScriptInterface::tptS_reset(std::deque * words) Simulation * sim = m->GetSimulation(); - if (resetStr == "pressure"_ascii) + if (resetStr == "pressure") { for (int nx = 0; nx < XRES/CELL; nx++) for (int ny = 0; ny < YRES/CELL; ny++) @@ -556,7 +556,7 @@ AnyType TPTScriptInterface::tptS_reset(std::deque * words) sim->air->pv[ny][nx] = 0; } } - else if (resetStr == "velocity"_ascii) + else if (resetStr == "velocity") { for (int nx = 0; nx < XRES/CELL; nx++) for (int ny = 0; ny < YRES/CELL; ny++) @@ -565,11 +565,11 @@ AnyType TPTScriptInterface::tptS_reset(std::deque * words) sim->air->vy[ny][nx] = 0; } } - else if (resetStr == "sparks"_ascii) + else if (resetStr == "sparks") { c->ResetSpark(); } - else if (resetStr == "temp"_ascii) + else if (resetStr == "temp") { for (int i = 0; i < NPART; i++) { diff --git a/src/simulation/Element.cpp b/src/simulation/Element.cpp index b82b9101e..d99da110b 100644 --- a/src/simulation/Element.cpp +++ b/src/simulation/Element.cpp @@ -3,7 +3,7 @@ Element::Element(): Identifier("DEFAULT_INVALID"), - Name(""_ascii), + Name(""), Colour(PIXPACK(0xFF00FF)), MenuVisible(0), MenuSection(0), diff --git a/src/simulation/Sign.cpp b/src/simulation/Sign.cpp index 8899176cb..5b563c12f 100644 --- a/src/simulation/Sign.cpp +++ b/src/simulation/Sign.cpp @@ -55,7 +55,7 @@ String sign::getDisplayText(Simulation *sim, int &x0, int &y0, int &w, int &h, b formatted_text << split_left_curly.Before(); remaining_text = split_right_curly.After(); String between_curlies = split_right_curly.Before(); - if (between_curlies == "t"_ascii || between_curlies == "temp"_ascii) + if (between_curlies == "t" || between_curlies == "temp") { formatted_text << Format::Precision(Format::ShowPoint(part ? part->temp - 273.15f : 0.0f), 2); // * We would really only need to do this if the sign used the new @@ -65,43 +65,43 @@ String sign::getDisplayText(Simulation *sim, int &x0, int &y0, int &w, int &h, b if (v95) *v95 = true; } - else if (between_curlies == "p"_ascii || between_curlies == "pres"_ascii) + else if (between_curlies == "p" || between_curlies == "pres") { formatted_text << Format::Precision(Format::ShowPoint(pressure), 2); if (v95) *v95 = true; } - else if (between_curlies == "a"_ascii || between_curlies == "aheat"_ascii) + else if (between_curlies == "a" || between_curlies == "aheat") { formatted_text << Format::Precision(Format::ShowPoint(aheat), 2); if (v95) *v95 = true; } - else if (between_curlies == "type"_ascii) + else if (between_curlies == "type") { formatted_text << (part ? sim->BasicParticleInfo(*part) : (formatted_text.Size() ? "empty"_i18n : "Empty"_i18n)); if (v95) *v95 = true; } - else if (between_curlies == "ctype"_ascii) + else if (between_curlies == "ctype") { formatted_text << (part ? ((part->ctype && sim->IsValidElement(part->ctype)) ? sim->ElementResolve(part->ctype, -1) : String::Build(part->ctype)) : (formatted_text.Size() ? "empty"_i18n : "Empty"_i18n)); if (v95) *v95 = true; } - else if (between_curlies == "life"_ascii) + else if (between_curlies == "life") { formatted_text << (part ? part->life : 0); if (v95) *v95 = true; } - else if (between_curlies == "tmp"_ascii) + else if (between_curlies == "tmp") { formatted_text << (part ? part->tmp : 0); if (v95) *v95 = true; } - else if (between_curlies == "tmp2"_ascii) + else if (between_curlies == "tmp2") { formatted_text << (part ? part->tmp2 : 0); if (v95) @@ -127,10 +127,10 @@ String sign::getDisplayText(Simulation *sim, int &x0, int &y0, int &w, int &h, b switch (si.second) { case Normal: break; - case Save: drawable_text = "\bt"_ascii + drawable_text; break; - case Thread: drawable_text = "\bl"_ascii + drawable_text; break; - case Button: drawable_text = "\bo"_ascii + drawable_text; break; - case Search: drawable_text = "\bu"_ascii + drawable_text; break; + case Save: drawable_text = "\bt" + drawable_text; break; + case Thread: drawable_text = "\bl" + drawable_text; break; + case Button: drawable_text = "\bo" + drawable_text; break; + case Search: drawable_text = "\bu" + drawable_text; break; } } diff --git a/src/simulation/SimTool.cpp b/src/simulation/SimTool.cpp index bc038305e..18d49eac7 100644 --- a/src/simulation/SimTool.cpp +++ b/src/simulation/SimTool.cpp @@ -11,7 +11,7 @@ SimTool::SimTool(): Identifier("DEFAULT_TOOL_INVALID"), -Name(""_ascii), +Name(""), Colour(PIXPACK(0xFFFFFF)), Description("NULL Tool, does NOTHING"_i18n) { diff --git a/src/simulation/SimulationData.cpp b/src/simulation/SimulationData.cpp index df916abbd..37aaeb0ee 100644 --- a/src/simulation/SimulationData.cpp +++ b/src/simulation/SimulationData.cpp @@ -14,30 +14,30 @@ std::vector LoadGOLMenu() { return std::vector{ - {"GOL"_ascii, PIXPACK(0x0CAC00), 0, "Game Of Life: Begin 3/Stay 23"_i18n}, - {"HLIF"_ascii, PIXPACK(0xFF0000), 1, "High Life: B36/S23"_i18n}, - {"ASIM"_ascii, PIXPACK(0x0000FF), 2, "Assimilation: B345/S4567"_i18n}, - {"2x2"_ascii, PIXPACK(0xFFFF00), 3, "2x2: B36/S125"_i18n}, - {"DANI"_ascii, PIXPACK(0x00FFFF), 4, "Day and Night: B3678/S34678"_i18n}, - {"AMOE"_ascii, PIXPACK(0xFF00FF), 5, "Amoeba: B357/S1358"_i18n}, - {"MOVE"_ascii, PIXPACK(0xFFFFFF), 6, "'Move' particles. Does not move things.. it is a life type: B368/S245"_i18n}, - {"PGOL"_ascii, PIXPACK(0xE05010), 7, "Pseudo Life: B357/S238"_i18n}, - {"DMOE"_ascii, PIXPACK(0x500000), 8, "Diamoeba: B35678/S5678"_i18n}, - {"34"_ascii, PIXPACK(0x500050), 9, "34: B34/S34"_i18n}, - {"LLIF"_ascii, PIXPACK(0x505050), 10, "Long Life: B345/S5"_i18n}, - {"STAN"_ascii, PIXPACK(0x5000FF), 11, "Stains: B3678/S235678"_i18n}, - {"SEED"_ascii, PIXPACK(0xFBEC7D), 12, "Seeds: B2/S"_i18n}, - {"MAZE"_ascii, PIXPACK(0xA8E4A0), 13, "Maze: B3/S12345"_i18n}, - {"COAG"_ascii, PIXPACK(0x9ACD32), 14, "Coagulations: B378/S235678"_i18n}, - {"WALL"_ascii, PIXPACK(0x0047AB), 15, "Walled cities: B45678/S2345"_i18n}, - {"GNAR"_ascii, PIXPACK(0xE5B73B), 16, "Gnarl: B1/S1"_i18n}, - {"REPL"_ascii, PIXPACK(0x259588), 17, "Replicator: B1357/S1357"_i18n}, - {"MYST"_ascii, PIXPACK(0x0C3C00), 18, "Mystery: B3458/S05678"_i18n}, - {"LOTE"_ascii, PIXPACK(0xFF0000), 19, "Living on the Edge: B37/S3458/4"_i18n}, - {"FRG2"_ascii, PIXPACK(0x00FF00), 20, "Like Frogs rule: B3/S124/3"_i18n}, - {"STAR"_ascii, PIXPACK(0x0000FF), 21, "Like Star Wars rule: B278/S3456/6"_i18n}, - {"FROG"_ascii, PIXPACK(0x00AA00), 22, "Frogs: B34/S12/3"_i18n}, - {"BRAN"_ascii, PIXPACK(0xCCCC00), 23, "Brian 6: B246/S6/3"_i18n} + {"GOL", PIXPACK(0x0CAC00), 0, "Game Of Life: Begin 3/Stay 23"_i18n}, + {"HLIF", PIXPACK(0xFF0000), 1, "High Life: B36/S23"_i18n}, + {"ASIM", PIXPACK(0x0000FF), 2, "Assimilation: B345/S4567"_i18n}, + {"2x2", PIXPACK(0xFFFF00), 3, "2x2: B36/S125"_i18n}, + {"DANI", PIXPACK(0x00FFFF), 4, "Day and Night: B3678/S34678"_i18n}, + {"AMOE", PIXPACK(0xFF00FF), 5, "Amoeba: B357/S1358"_i18n}, + {"MOVE", PIXPACK(0xFFFFFF), 6, "'Move' particles. Does not move things.. it is a life type: B368/S245"_i18n}, + {"PGOL", PIXPACK(0xE05010), 7, "Pseudo Life: B357/S238"_i18n}, + {"DMOE", PIXPACK(0x500000), 8, "Diamoeba: B35678/S5678"_i18n}, + {"34", PIXPACK(0x500050), 9, "34: B34/S34"_i18n}, + {"LLIF", PIXPACK(0x505050), 10, "Long Life: B345/S5"_i18n}, + {"STAN", PIXPACK(0x5000FF), 11, "Stains: B3678/S235678"_i18n}, + {"SEED", PIXPACK(0xFBEC7D), 12, "Seeds: B2/S"_i18n}, + {"MAZE", PIXPACK(0xA8E4A0), 13, "Maze: B3/S12345"_i18n}, + {"COAG", PIXPACK(0x9ACD32), 14, "Coagulations: B378/S235678"_i18n}, + {"WALL", PIXPACK(0x0047AB), 15, "Walled cities: B45678/S2345"_i18n}, + {"GNAR", PIXPACK(0xE5B73B), 16, "Gnarl: B1/S1"_i18n}, + {"REPL", PIXPACK(0x259588), 17, "Replicator: B1357/S1357"_i18n}, + {"MYST", PIXPACK(0x0C3C00), 18, "Mystery: B3458/S05678"_i18n}, + {"LOTE", PIXPACK(0xFF0000), 19, "Living on the Edge: B37/S3458/4"_i18n}, + {"FRG2", PIXPACK(0x00FF00), 20, "Like Frogs rule: B3/S124/3"_i18n}, + {"STAR", PIXPACK(0x0000FF), 21, "Like Star Wars rule: B278/S3456/6"_i18n}, + {"FROG", PIXPACK(0x00AA00), 22, "Frogs: B34/S12/3"_i18n}, + {"BRAN", PIXPACK(0xCCCC00), 23, "Brian 6: B246/S6/3"_i18n} }; } @@ -109,25 +109,25 @@ std::vector LoadWalls() { return std::vector{ - {PIXPACK(0x808080), PIXPACK(0x000000), 0, Renderer::WallIcon, "ERASE"_ascii, "DEFAULT_WL_ERASE", "Erases walls."_i18n}, - {PIXPACK(0xC0C0C0), PIXPACK(0x101010), 0, Renderer::WallIcon, "CONDUCTIVE WALL"_ascii, "DEFAULT_WL_CNDTW", "Blocks everything. Conductive."_i18n}, - {PIXPACK(0x808080), PIXPACK(0x808080), 0, Renderer::WallIcon, "EWALL"_ascii, "DEFAULT_WL_EWALL", "E-Wall. Becomes transparent when electricity is connected."_i18n}, - {PIXPACK(0xFF8080), PIXPACK(0xFF2008), 1, Renderer::WallIcon, "DETECTOR"_ascii, "DEFAULT_WL_DTECT", "Detector. Generates electricity when a particle is inside."_i18n}, - {PIXPACK(0x808080), PIXPACK(0x000000), 0, Renderer::WallIcon, "STREAMLINE"_ascii, "DEFAULT_WL_STRM", "Streamline. Set start point of a streamline."_i18n}, - {PIXPACK(0x8080FF), PIXPACK(0x000000), 1, Renderer::WallIcon, "FAN"_ascii, "DEFAULT_WL_FAN", "Fan. Accelerates air. Use the line tool to set direction and strength."_i18n}, - {PIXPACK(0xC0C0C0), PIXPACK(0x101010), 2, Renderer::WallIcon, "LIQUID WALL"_ascii, "DEFAULT_WL_LIQD", "Allows liquids, blocks all other particles. Conductive."_i18n}, - {PIXPACK(0x808080), PIXPACK(0x000000), 1, Renderer::WallIcon, "ABSORB WALL"_ascii, "DEFAULT_WL_ABSRB", "Absorbs particles but lets air currents through."_i18n}, - {PIXPACK(0x808080), PIXPACK(0x000000), 3, Renderer::WallIcon, "WALL"_ascii, "DEFAULT_WL_WALL", "Basic wall, blocks everything."_i18n}, - {PIXPACK(0x3C3C3C), PIXPACK(0x000000), 1, Renderer::WallIcon, "AIRONLY WALL"_ascii, "DEFAULT_WL_AIR", "Allows air, but blocks all particles."_i18n}, - {PIXPACK(0x575757), PIXPACK(0x000000), 1, Renderer::WallIcon, "POWDER WALL"_ascii, "DEFAULT_WL_POWDR", "Allows powders, blocks all other particles."_i18n}, - {PIXPACK(0xFFFF22), PIXPACK(0x101010), 2, Renderer::WallIcon, "CONDUCTOR"_ascii, "DEFAULT_WL_CNDTR", "Conductor. Allows all particles to pass through and conducts electricity."_i18n}, - {PIXPACK(0x242424), PIXPACK(0x101010), 0, Renderer::WallIcon, "EHOLE"_ascii, "DEFAULT_WL_EHOLE", "E-Hole. absorbs particles, releases them when powered."_i18n}, - {PIXPACK(0x579777), PIXPACK(0x000000), 1, Renderer::WallIcon, "GAS WALL"_ascii, "DEFAULT_WL_GAS", "Allows gases, blocks all other particles."_i18n}, - {PIXPACK(0xFFEE00), PIXPACK(0xAA9900), 4, Renderer::WallIcon, "GRAVITY WALL"_ascii, "DEFAULT_WL_GRVTY", "Gravity wall. Newtonian Gravity has no effect inside a box drawn with this."_i18n}, - {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, Renderer::WallIcon, "ENERGY WALL"_ascii, "DEFAULT_WL_ENRGY", "Allows energy particles, blocks all other particles."_i18n}, - {PIXPACK(0xDCDCDC), PIXPACK(0x000000), 1, Renderer::WallIcon, "AIRBLOCK WALL"_ascii, "DEFAULT_WL_NOAIR", "Allows all particles, but blocks air."_i18n}, - {PIXPACK(0x808080), PIXPACK(0x000000), 0, Renderer::WallIcon, "ERASEALL"_ascii, "DEFAULT_WL_ERASEA", "Erases walls, particles, and signs."_i18n}, - {PIXPACK(0x800080), PIXPACK(0x000000), 0, Renderer::WallIcon, "STASIS WALL"_ascii, "DEFAULT_WL_STASIS", "Freezes particles inside the wall in place until powered."_i18n}, + {PIXPACK(0x808080), PIXPACK(0x000000), 0, Renderer::WallIcon, "ERASE", "DEFAULT_WL_ERASE", "Erases walls."_i18n}, + {PIXPACK(0xC0C0C0), PIXPACK(0x101010), 0, Renderer::WallIcon, "CONDUCTIVE WALL", "DEFAULT_WL_CNDTW", "Blocks everything. Conductive."_i18n}, + {PIXPACK(0x808080), PIXPACK(0x808080), 0, Renderer::WallIcon, "EWALL", "DEFAULT_WL_EWALL", "E-Wall. Becomes transparent when electricity is connected."_i18n}, + {PIXPACK(0xFF8080), PIXPACK(0xFF2008), 1, Renderer::WallIcon, "DETECTOR", "DEFAULT_WL_DTECT", "Detector. Generates electricity when a particle is inside."_i18n}, + {PIXPACK(0x808080), PIXPACK(0x000000), 0, Renderer::WallIcon, "STREAMLINE", "DEFAULT_WL_STRM", "Streamline. Set start point of a streamline."_i18n}, + {PIXPACK(0x8080FF), PIXPACK(0x000000), 1, Renderer::WallIcon, "FAN", "DEFAULT_WL_FAN", "Fan. Accelerates air. Use the line tool to set direction and strength."_i18n}, + {PIXPACK(0xC0C0C0), PIXPACK(0x101010), 2, Renderer::WallIcon, "LIQUID WALL", "DEFAULT_WL_LIQD", "Allows liquids, blocks all other particles. Conductive."_i18n}, + {PIXPACK(0x808080), PIXPACK(0x000000), 1, Renderer::WallIcon, "ABSORB WALL", "DEFAULT_WL_ABSRB", "Absorbs particles but lets air currents through."_i18n}, + {PIXPACK(0x808080), PIXPACK(0x000000), 3, Renderer::WallIcon, "WALL", "DEFAULT_WL_WALL", "Basic wall, blocks everything."_i18n}, + {PIXPACK(0x3C3C3C), PIXPACK(0x000000), 1, Renderer::WallIcon, "AIRONLY WALL", "DEFAULT_WL_AIR", "Allows air, but blocks all particles."_i18n}, + {PIXPACK(0x575757), PIXPACK(0x000000), 1, Renderer::WallIcon, "POWDER WALL", "DEFAULT_WL_POWDR", "Allows powders, blocks all other particles."_i18n}, + {PIXPACK(0xFFFF22), PIXPACK(0x101010), 2, Renderer::WallIcon, "CONDUCTOR", "DEFAULT_WL_CNDTR", "Conductor. Allows all particles to pass through and conducts electricity."_i18n}, + {PIXPACK(0x242424), PIXPACK(0x101010), 0, Renderer::WallIcon, "EHOLE", "DEFAULT_WL_EHOLE", "E-Hole. absorbs particles, releases them when powered."_i18n}, + {PIXPACK(0x579777), PIXPACK(0x000000), 1, Renderer::WallIcon, "GAS WALL", "DEFAULT_WL_GAS", "Allows gases, blocks all other particles."_i18n}, + {PIXPACK(0xFFEE00), PIXPACK(0xAA9900), 4, Renderer::WallIcon, "GRAVITY WALL", "DEFAULT_WL_GRVTY", "Gravity wall. Newtonian Gravity has no effect inside a box drawn with this."_i18n}, + {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, Renderer::WallIcon, "ENERGY WALL", "DEFAULT_WL_ENRGY", "Allows energy particles, blocks all other particles."_i18n}, + {PIXPACK(0xDCDCDC), PIXPACK(0x000000), 1, Renderer::WallIcon, "AIRBLOCK WALL", "DEFAULT_WL_NOAIR", "Allows all particles, but blocks air."_i18n}, + {PIXPACK(0x808080), PIXPACK(0x000000), 0, Renderer::WallIcon, "ERASEALL", "DEFAULT_WL_ERASEA", "Erases walls, particles, and signs."_i18n}, + {PIXPACK(0x800080), PIXPACK(0x000000), 0, Renderer::WallIcon, "STASIS WALL", "DEFAULT_WL_STASIS", "Freezes particles inside the wall in place until powered."_i18n}, }; } diff --git a/src/simulation/elements/ACEL.cpp b/src/simulation/elements/ACEL.cpp index 7da023221..051e8a3e6 100644 --- a/src/simulation/elements/ACEL.cpp +++ b/src/simulation/elements/ACEL.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_ACEL() { Identifier = "DEFAULT_PT_ACEL"; - Name = "ACEL"_ascii; + Name = "ACEL"; Colour = PIXPACK(0x0099CC); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/ACID.cpp b/src/simulation/elements/ACID.cpp index 5be789a21..e1c79924f 100644 --- a/src/simulation/elements/ACID.cpp +++ b/src/simulation/elements/ACID.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_ACID() { Identifier = "DEFAULT_PT_ACID"; - Name = "ACID"_ascii; + Name = "ACID"; Colour = PIXPACK(0xED55FF); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/AMTR.cpp b/src/simulation/elements/AMTR.cpp index ac2064aed..78adfd244 100644 --- a/src/simulation/elements/AMTR.cpp +++ b/src/simulation/elements/AMTR.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_AMTR() { Identifier = "DEFAULT_PT_AMTR"; - Name = "AMTR"_ascii; + Name = "AMTR"; Colour = PIXPACK(0x808080); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/ANAR.cpp b/src/simulation/elements/ANAR.cpp index 436faa731..66414c7d2 100644 --- a/src/simulation/elements/ANAR.cpp +++ b/src/simulation/elements/ANAR.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_ANAR() { Identifier = "DEFAULT_PT_ANAR"; - Name = "ANAR"_ascii; + Name = "ANAR"; Colour = PIXPACK(0xFFFFEE); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/ARAY.cpp b/src/simulation/elements/ARAY.cpp index 3958e87da..67e03f9d9 100644 --- a/src/simulation/elements/ARAY.cpp +++ b/src/simulation/elements/ARAY.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_ARAY() { Identifier = "DEFAULT_PT_ARAY"; - Name = "ARAY"_ascii; + Name = "ARAY"; Colour = PIXPACK(0xFFBB00); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/BANG.cpp b/src/simulation/elements/BANG.cpp index 2f0e51b59..aa76b7106 100644 --- a/src/simulation/elements/BANG.cpp +++ b/src/simulation/elements/BANG.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BANG() { Identifier = "DEFAULT_PT_BANG"; - Name = "TNT"_ascii; + Name = "TNT"; Colour = PIXPACK(0xC05050); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/BCLN.cpp b/src/simulation/elements/BCLN.cpp index 426a6d0ce..d2fe58f7e 100644 --- a/src/simulation/elements/BCLN.cpp +++ b/src/simulation/elements/BCLN.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BCLN() { Identifier = "DEFAULT_PT_BCLN"; - Name = "BCLN"_ascii; + Name = "BCLN"; Colour = PIXPACK(0xFFD040); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/BCOL.cpp b/src/simulation/elements/BCOL.cpp index ce3d2fd2e..8f30cce77 100644 --- a/src/simulation/elements/BCOL.cpp +++ b/src/simulation/elements/BCOL.cpp @@ -6,7 +6,7 @@ int Element_COAL_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BCOL() { Identifier = "DEFAULT_PT_BCOL"; - Name = "BCOL"_ascii; + Name = "BCOL"; Colour = PIXPACK(0x333333); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/BGLA.cpp b/src/simulation/elements/BGLA.cpp index d49cf68a1..29ffa952a 100644 --- a/src/simulation/elements/BGLA.cpp +++ b/src/simulation/elements/BGLA.cpp @@ -3,7 +3,7 @@ void Element::Element_BGLA() { Identifier = "DEFAULT_PT_BGLA"; - Name = "BGLA"_ascii; + Name = "BGLA"; Colour = PIXPACK(0x606060); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/BHOL.cpp b/src/simulation/elements/BHOL.cpp index 02e84a2f2..552499d30 100644 --- a/src/simulation/elements/BHOL.cpp +++ b/src/simulation/elements/BHOL.cpp @@ -3,7 +3,7 @@ void Element::Element_BHOL() { Identifier = "DEFAULT_PT_BHOL"; - Name = "VACU"_ascii; + Name = "VACU"; Colour = PIXPACK(0x303030); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/BIZR.cpp b/src/simulation/elements/BIZR.cpp index 1159d8608..2676117b5 100644 --- a/src/simulation/elements/BIZR.cpp +++ b/src/simulation/elements/BIZR.cpp @@ -6,7 +6,7 @@ int Element_BIZR_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BIZR() { Identifier = "DEFAULT_PT_BIZR"; - Name = "BIZR"_ascii; + Name = "BIZR"; Colour = PIXPACK(0x00FF77); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/BIZRG.cpp b/src/simulation/elements/BIZRG.cpp index 15c30f1b3..2213f9de5 100644 --- a/src/simulation/elements/BIZRG.cpp +++ b/src/simulation/elements/BIZRG.cpp @@ -6,7 +6,7 @@ int Element_BIZR_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BIZRG() { Identifier = "DEFAULT_PT_BIZRG"; - Name = "BIZG"_ascii; + Name = "BIZG"; Colour = PIXPACK(0x00FFBB); MenuVisible = 1; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/BIZRS.cpp b/src/simulation/elements/BIZRS.cpp index 7ceb3d03b..f35e3e0b5 100644 --- a/src/simulation/elements/BIZRS.cpp +++ b/src/simulation/elements/BIZRS.cpp @@ -6,7 +6,7 @@ int Element_BIZR_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BIZRS() { Identifier = "DEFAULT_PT_BIZRS"; - Name = "BIZS"_ascii; + Name = "BIZS"; Colour = PIXPACK(0x00E455); MenuVisible = 1; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/BMTL.cpp b/src/simulation/elements/BMTL.cpp index f8e01f790..fb1dfa284 100644 --- a/src/simulation/elements/BMTL.cpp +++ b/src/simulation/elements/BMTL.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BMTL() { Identifier = "DEFAULT_PT_BMTL"; - Name = "BMTL"_ascii; + Name = "BMTL"; Colour = PIXPACK(0x505070); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/BOMB.cpp b/src/simulation/elements/BOMB.cpp index d3c8a9034..0361e182f 100644 --- a/src/simulation/elements/BOMB.cpp +++ b/src/simulation/elements/BOMB.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BOMB() { Identifier = "DEFAULT_PT_BOMB"; - Name = "BOMB"_ascii; + Name = "BOMB"; Colour = PIXPACK(0xFFF288); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/BOYL.cpp b/src/simulation/elements/BOYL.cpp index 8bdc8d603..7ed070084 100644 --- a/src/simulation/elements/BOYL.cpp +++ b/src/simulation/elements/BOYL.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BOYL() { Identifier = "DEFAULT_PT_BOYL"; - Name = "BOYL"_ascii; + Name = "BOYL"; Colour = PIXPACK(0x0A3200); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/BRAY.cpp b/src/simulation/elements/BRAY.cpp index d9120c2b3..fd8d73100 100644 --- a/src/simulation/elements/BRAY.cpp +++ b/src/simulation/elements/BRAY.cpp @@ -5,7 +5,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BRAY() { Identifier = "DEFAULT_PT_BRAY"; - Name = "BRAY"_ascii; + Name = "BRAY"; Colour = PIXPACK(0xFFFFFF); MenuVisible = 0; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/BRCK.cpp b/src/simulation/elements/BRCK.cpp index 3f5658fde..cbb529e49 100644 --- a/src/simulation/elements/BRCK.cpp +++ b/src/simulation/elements/BRCK.cpp @@ -5,7 +5,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BRCK() { Identifier = "DEFAULT_PT_BRCK"; - Name = "BRCK"_ascii; + Name = "BRCK"; Colour = PIXPACK(0x808080); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/BREC.cpp b/src/simulation/elements/BREC.cpp index 57e081e8c..ce43a1ec5 100644 --- a/src/simulation/elements/BREC.cpp +++ b/src/simulation/elements/BREC.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BREC() { Identifier = "DEFAULT_PT_BREC"; - Name = "BREL"_ascii; + Name = "BREL"; Colour = PIXPACK(0x707060); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/BRMT.cpp b/src/simulation/elements/BRMT.cpp index 491816b7a..38b05511f 100644 --- a/src/simulation/elements/BRMT.cpp +++ b/src/simulation/elements/BRMT.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BRMT() { Identifier = "DEFAULT_PT_BRMT"; - Name = "BRMT"_ascii; + Name = "BRMT"; Colour = PIXPACK(0x705060); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/BTRY.cpp b/src/simulation/elements/BTRY.cpp index f2304bf17..b25b90cb2 100644 --- a/src/simulation/elements/BTRY.cpp +++ b/src/simulation/elements/BTRY.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_BTRY() { Identifier = "DEFAULT_PT_BTRY"; - Name = "BTRY"_ascii; + Name = "BTRY"; Colour = PIXPACK(0x858505); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/BVBR.cpp b/src/simulation/elements/BVBR.cpp index e65d555c1..1b593341b 100644 --- a/src/simulation/elements/BVBR.cpp +++ b/src/simulation/elements/BVBR.cpp @@ -6,7 +6,7 @@ int Element_VIBR_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_BVBR() { Identifier = "DEFAULT_PT_BVBR"; - Name = "BVBR"_ascii; + Name = "BVBR"; Colour = PIXPACK(0x005000); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp index 081860f9a..728efa9fc 100644 --- a/src/simulation/elements/C5.cpp +++ b/src/simulation/elements/C5.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_C5() { Identifier = "DEFAULT_PT_C5"; - Name = "C-5"_ascii; + Name = "C-5"; Colour = PIXPACK(0x2050E0); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/CAUS.cpp b/src/simulation/elements/CAUS.cpp index 0c952d867..916de4e41 100644 --- a/src/simulation/elements/CAUS.cpp +++ b/src/simulation/elements/CAUS.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_CAUS() { Identifier = "DEFAULT_PT_CAUS"; - Name = "CAUS"_ascii; + Name = "CAUS"; Colour = PIXPACK(0x80FFA0); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/CBNW.cpp b/src/simulation/elements/CBNW.cpp index b8747a1f4..cab8b9dea 100644 --- a/src/simulation/elements/CBNW.cpp +++ b/src/simulation/elements/CBNW.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_CBNW() { Identifier = "DEFAULT_PT_CBNW"; - Name = "BUBW"_ascii; + Name = "BUBW"; Colour = PIXPACK(0x2030D0); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/CFLM.cpp b/src/simulation/elements/CFLM.cpp index e961d6ab0..b9c16429d 100644 --- a/src/simulation/elements/CFLM.cpp +++ b/src/simulation/elements/CFLM.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_CFLM() { Identifier = "DEFAULT_PT_HFLM"; - Name = "CFLM"_ascii; + Name = "CFLM"; Colour = PIXPACK(0x8080FF); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/CLNE.cpp b/src/simulation/elements/CLNE.cpp index 1283fbc0f..54231a4c3 100644 --- a/src/simulation/elements/CLNE.cpp +++ b/src/simulation/elements/CLNE.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_CLNE() { Identifier = "DEFAULT_PT_CLNE"; - Name = "CLNE"_ascii; + Name = "CLNE"; Colour = PIXPACK(0xFFD010); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/CLST.cpp b/src/simulation/elements/CLST.cpp index 1857dd551..3cae80b81 100644 --- a/src/simulation/elements/CLST.cpp +++ b/src/simulation/elements/CLST.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_CLST() { Identifier = "DEFAULT_PT_CLST"; - Name = "CLST"_ascii; + Name = "CLST"; Colour = PIXPACK(0xE4A4A4); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/CNCT.cpp b/src/simulation/elements/CNCT.cpp index 35924701c..da977ae0c 100644 --- a/src/simulation/elements/CNCT.cpp +++ b/src/simulation/elements/CNCT.cpp @@ -3,7 +3,7 @@ void Element::Element_CNCT() { Identifier = "DEFAULT_PT_CNCT"; - Name = "CNCT"_ascii; + Name = "CNCT"; Colour = PIXPACK(0xC0C0C0); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp index c207f7ada..e1cd683b3 100644 --- a/src/simulation/elements/CO2.cpp +++ b/src/simulation/elements/CO2.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_CO2() { Identifier = "DEFAULT_PT_CO2"; - Name = "CO2"_ascii; + Name = "CO2"; Colour = PIXPACK(0x666666); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/COAL.cpp b/src/simulation/elements/COAL.cpp index 42a12fb57..4afcb2b36 100644 --- a/src/simulation/elements/COAL.cpp +++ b/src/simulation/elements/COAL.cpp @@ -6,7 +6,7 @@ int Element_COAL_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_COAL() { Identifier = "DEFAULT_PT_COAL"; - Name = "COAL"_ascii; + Name = "COAL"; Colour = PIXPACK(0x222222); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp index a696a8bdb..bcff820e7 100644 --- a/src/simulation/elements/CONV.cpp +++ b/src/simulation/elements/CONV.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_CONV() { Identifier = "DEFAULT_PT_CONV"; - Name = "CONV"_ascii; + Name = "CONV"; Colour = PIXPACK(0x0AAB0A); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index 72c1f359c..eea7e5d2d 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -7,7 +7,7 @@ static unsigned int wavelengthToDecoColour(int wavelength); void Element::Element_CRAY() { Identifier = "DEFAULT_PT_CRAY"; - Name = "CRAY"_ascii; + Name = "CRAY"; Colour = PIXPACK(0xBBFF00); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/CRMC.cpp b/src/simulation/elements/CRMC.cpp index 4599cac9f..2029c2d51 100644 --- a/src/simulation/elements/CRMC.cpp +++ b/src/simulation/elements/CRMC.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_CRMC() { Identifier = "DEFAULT_PT_CRMC"; - Name = "CRMC"_ascii; + Name = "CRMC"; Colour = PIXPACK(0xD6D1D4); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/DCEL.cpp b/src/simulation/elements/DCEL.cpp index cf66b2f1e..12c46e47e 100644 --- a/src/simulation/elements/DCEL.cpp +++ b/src/simulation/elements/DCEL.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_DCEL() { Identifier = "DEFAULT_PT_DCEL"; - Name = "DCEL"_ascii; + Name = "DCEL"; Colour = PIXPACK(0x99CC00); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/DESL.cpp b/src/simulation/elements/DESL.cpp index 6cfc0b5cb..4e2d9dbe9 100644 --- a/src/simulation/elements/DESL.cpp +++ b/src/simulation/elements/DESL.cpp @@ -3,7 +3,7 @@ void Element::Element_DESL() { Identifier = "DEFAULT_PT_DESL"; - Name = "DESL"_ascii; + Name = "DESL"; Colour = PIXPACK(0x440000); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/DEST.cpp b/src/simulation/elements/DEST.cpp index a7a60a0cc..3bf6780ae 100644 --- a/src/simulation/elements/DEST.cpp +++ b/src/simulation/elements/DEST.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_DEST() { Identifier = "DEFAULT_PT_DEST"; - Name = "DEST"_ascii; + Name = "DEST"; Colour = PIXPACK(0xFF3311); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/DEUT.cpp b/src/simulation/elements/DEUT.cpp index c61e4286e..d2364e5c2 100644 --- a/src/simulation/elements/DEUT.cpp +++ b/src/simulation/elements/DEUT.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_DEUT() { Identifier = "DEFAULT_PT_DEUT"; - Name = "DEUT"_ascii; + Name = "DEUT"; Colour = PIXPACK(0x00153F); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/DLAY.cpp b/src/simulation/elements/DLAY.cpp index c4def9f8e..2177d5446 100644 --- a/src/simulation/elements/DLAY.cpp +++ b/src/simulation/elements/DLAY.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_DLAY() { Identifier = "DEFAULT_PT_DLAY"; - Name = "DLAY"_ascii; + Name = "DLAY"; Colour = PIXPACK(0x753590); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp index f52b58841..c7484a59c 100644 --- a/src/simulation/elements/DMG.cpp +++ b/src/simulation/elements/DMG.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_DMG() { Identifier = "DEFAULT_PT_DMG"; - Name = "DMG"_ascii; + Name = "DMG"; Colour = PIXPACK(0x88FF88); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/DMND.cpp b/src/simulation/elements/DMND.cpp index 64b294bc6..eb7fd70b2 100644 --- a/src/simulation/elements/DMND.cpp +++ b/src/simulation/elements/DMND.cpp @@ -3,7 +3,7 @@ void Element::Element_DMND() { Identifier = "DEFAULT_PT_DMND"; - Name = "DMND"_ascii; + Name = "DMND"; Colour = PIXPACK(0xCCFFFF); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/DRAY.cpp b/src/simulation/elements/DRAY.cpp index 9bbfbb887..e01e9dcc0 100644 --- a/src/simulation/elements/DRAY.cpp +++ b/src/simulation/elements/DRAY.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_DRAY() { Identifier = "DEFAULT_PT_DRAY"; - Name = "DRAY"_ascii; + Name = "DRAY"; Colour = PIXPACK(0xFFAA22); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/DRIC.cpp b/src/simulation/elements/DRIC.cpp index 753a7b9cc..f4992be12 100644 --- a/src/simulation/elements/DRIC.cpp +++ b/src/simulation/elements/DRIC.cpp @@ -3,7 +3,7 @@ void Element::Element_DRIC() { Identifier = "DEFAULT_PT_DRIC"; - Name = "DRIC"_ascii; + Name = "DRIC"; Colour = PIXPACK(0xE0E0E0); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp index cbf8a7db8..2df1e6864 100644 --- a/src/simulation/elements/DSTW.cpp +++ b/src/simulation/elements/DSTW.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_DSTW() { Identifier = "DEFAULT_PT_DSTW"; - Name = "DSTW"_ascii; + Name = "DSTW"; Colour = PIXPACK(0x1020C0); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/DTEC.cpp b/src/simulation/elements/DTEC.cpp index 5c8bec602..6428ff966 100644 --- a/src/simulation/elements/DTEC.cpp +++ b/src/simulation/elements/DTEC.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_DTEC() { Identifier = "DEFAULT_PT_DTEC"; - Name = "DTEC"_ascii; + Name = "DTEC"; Colour = PIXPACK(0xFD9D18); MenuVisible = 1; MenuSection = SC_SENSOR; diff --git a/src/simulation/elements/DUST.cpp b/src/simulation/elements/DUST.cpp index eb417b48c..73d0e0db1 100644 --- a/src/simulation/elements/DUST.cpp +++ b/src/simulation/elements/DUST.cpp @@ -3,7 +3,7 @@ void Element::Element_DUST() { Identifier = "DEFAULT_PT_DUST"; - Name = "DUST"_ascii; + Name = "DUST"; Colour = PIXPACK(0xFFE0A0); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/DYST.cpp b/src/simulation/elements/DYST.cpp index 409b931c3..d44e2cdbe 100644 --- a/src/simulation/elements/DYST.cpp +++ b/src/simulation/elements/DYST.cpp @@ -3,7 +3,7 @@ void Element::Element_DYST() { Identifier = "DEFAULT_PT_DYST"; - Name = "DYST"_ascii; + Name = "DYST"; Colour = PIXPACK(0xBBB0A0); MenuVisible = 0; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/E116.cpp b/src/simulation/elements/E116.cpp index d7b88e583..553e0323f 100644 --- a/src/simulation/elements/E116.cpp +++ b/src/simulation/elements/E116.cpp @@ -3,7 +3,7 @@ void Element::Element_E116() { Identifier = "DEFAULT_PT_116"; - Name = "EQVE"_ascii; + Name = "EQVE"; Colour = PIXPACK(0xFFE0A0); MenuVisible = 0; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/E146.cpp b/src/simulation/elements/E146.cpp index 9a1842374..7308503ee 100644 --- a/src/simulation/elements/E146.cpp +++ b/src/simulation/elements/E146.cpp @@ -3,7 +3,7 @@ void Element::Element_E146() { Identifier = "DEFAULT_PT_146"; - Name = "BRAN"_ascii; + Name = "BRAN"; Colour = PIXPACK(0xCCCC00); MenuVisible = 0; MenuSection = SC_LIFE; diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index 2693a6762..0236f3257 100644 --- a/src/simulation/elements/ELEC.cpp +++ b/src/simulation/elements/ELEC.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_ELEC() { Identifier = "DEFAULT_PT_ELEC"; - Name = "ELEC"_ascii; + Name = "ELEC"; Colour = PIXPACK(0xDFEFFF); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/EMBR.cpp b/src/simulation/elements/EMBR.cpp index bd3f99d47..2e99efde7 100644 --- a/src/simulation/elements/EMBR.cpp +++ b/src/simulation/elements/EMBR.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_EMBR() { Identifier = "DEFAULT_PT_EMBR"; - Name = "EMBR"_ascii; + Name = "EMBR"; Colour = PIXPACK(0xFFF288); MenuVisible = 0; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/EMP.cpp b/src/simulation/elements/EMP.cpp index 3edac3ca1..43a2ad83b 100644 --- a/src/simulation/elements/EMP.cpp +++ b/src/simulation/elements/EMP.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_EMP() { Identifier = "DEFAULT_PT_EMP"; - Name = "EMP"_ascii; + Name = "EMP"; Colour = PIXPACK(0x66AAFF); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/ETRD.cpp b/src/simulation/elements/ETRD.cpp index 224214e7e..24d062e2a 100644 --- a/src/simulation/elements/ETRD.cpp +++ b/src/simulation/elements/ETRD.cpp @@ -7,7 +7,7 @@ static void changeType(ELEMENT_CHANGETYPE_FUNC_ARGS); void Element::Element_ETRD() { Identifier = "DEFAULT_PT_ETRD"; - Name = "ETRD"_ascii; + Name = "ETRD"; Colour = PIXPACK(0x404040); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/EXOT.cpp b/src/simulation/elements/EXOT.cpp index 2b387fb2a..7df2e6a09 100644 --- a/src/simulation/elements/EXOT.cpp +++ b/src/simulation/elements/EXOT.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_EXOT() { Identifier = "DEFAULT_PT_EXOT"; - Name = "EXOT"_ascii; + Name = "EXOT"; Colour = PIXPACK(0x247BFE); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/FIGH.cpp b/src/simulation/elements/FIGH.cpp index a68b512a2..0414e5afd 100644 --- a/src/simulation/elements/FIGH.cpp +++ b/src/simulation/elements/FIGH.cpp @@ -14,7 +14,7 @@ int Element_STKM_run_stickman(playerst *playerp, UPDATE_FUNC_ARGS); void Element::Element_FIGH() { Identifier = "DEFAULT_PT_FIGH"; - Name = "FIGH"_ascii; + Name = "FIGH"; Colour = PIXPACK(0xFFE0A0); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/FILT.cpp b/src/simulation/elements/FILT.cpp index df16cbce2..3a2e82e90 100644 --- a/src/simulation/elements/FILT.cpp +++ b/src/simulation/elements/FILT.cpp @@ -8,7 +8,7 @@ int Element_FILT_getWavelengths(Particle* cpart); void Element::Element_FILT() { Identifier = "DEFAULT_PT_FILT"; - Name = "FILT"_ascii; + Name = "FILT"; Colour = PIXPACK(0x000056); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp index b738d160d..09b1b6a12 100644 --- a/src/simulation/elements/FIRE.cpp +++ b/src/simulation/elements/FIRE.cpp @@ -9,7 +9,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_FIRE() { Identifier = "DEFAULT_PT_FIRE"; - Name = "FIRE"_ascii; + Name = "FIRE"; Colour = PIXPACK(0xFF1000); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/FIRW.cpp b/src/simulation/elements/FIRW.cpp index 858523355..76c2e535f 100644 --- a/src/simulation/elements/FIRW.cpp +++ b/src/simulation/elements/FIRW.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_FIRW() { Identifier = "DEFAULT_PT_FIRW"; - Name = "FIRW"_ascii; + Name = "FIRW"; Colour = PIXPACK(0xFFA040); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/FOG.cpp b/src/simulation/elements/FOG.cpp index 950143ce6..1a23e1fd1 100644 --- a/src/simulation/elements/FOG.cpp +++ b/src/simulation/elements/FOG.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FOG() { Identifier = "DEFAULT_PT_FOG"; - Name = "FOG"_ascii; + Name = "FOG"; Colour = PIXPACK(0xAAAAAA); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp index c0a47aa39..b2aec816f 100644 --- a/src/simulation/elements/FRAY.cpp +++ b/src/simulation/elements/FRAY.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FRAY() { Identifier = "DEFAULT_PT_FRAY"; - Name = "FRAY"_ascii; + Name = "FRAY"; Colour = PIXPACK(0x00BBFF); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/FRME.cpp b/src/simulation/elements/FRME.cpp index a895eaca7..7a52511c2 100644 --- a/src/simulation/elements/FRME.cpp +++ b/src/simulation/elements/FRME.cpp @@ -5,7 +5,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_FRME() { Identifier = "DEFAULT_PT_FRME"; - Name = "FRME"_ascii; + Name = "FRME"; Colour = PIXPACK(0x999988); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/FRZW.cpp b/src/simulation/elements/FRZW.cpp index 5fe3e9f9c..90d0c563e 100644 --- a/src/simulation/elements/FRZW.cpp +++ b/src/simulation/elements/FRZW.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FRZW() { Identifier = "DEFAULT_PT_FRZW"; - Name = "FRZW"_ascii; + Name = "FRZW"; Colour = PIXPACK(0x1020C0); MenuVisible = 1; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/FRZZ.cpp b/src/simulation/elements/FRZZ.cpp index a63939727..c54252348 100644 --- a/src/simulation/elements/FRZZ.cpp +++ b/src/simulation/elements/FRZZ.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FRZZ() { Identifier = "DEFAULT_PT_FRZZ"; - Name = "FRZZ"_ascii; + Name = "FRZZ"; Colour = PIXPACK(0xC0E0FF); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/FSEP.cpp b/src/simulation/elements/FSEP.cpp index 0b73d1654..9cb94a17e 100644 --- a/src/simulation/elements/FSEP.cpp +++ b/src/simulation/elements/FSEP.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FSEP() { Identifier = "DEFAULT_PT_FSEP"; - Name = "FSEP"_ascii; + Name = "FSEP"; Colour = PIXPACK(0x63AD5F); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/FUSE.cpp b/src/simulation/elements/FUSE.cpp index 8a8e1559f..8825b90a8 100644 --- a/src/simulation/elements/FUSE.cpp +++ b/src/simulation/elements/FUSE.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FUSE() { Identifier = "DEFAULT_PT_FUSE"; - Name = "FUSE"_ascii; + Name = "FUSE"; Colour = PIXPACK(0x0A5706); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/FWRK.cpp b/src/simulation/elements/FWRK.cpp index 1353ab1da..f05e21799 100644 --- a/src/simulation/elements/FWRK.cpp +++ b/src/simulation/elements/FWRK.cpp @@ -6,7 +6,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_FWRK() { Identifier = "DEFAULT_PT_FWRK"; - Name = "FWRK"_ascii; + Name = "FWRK"; Colour = PIXPACK(0x666666); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/GAS.cpp b/src/simulation/elements/GAS.cpp index dbdec8701..0104e9bde 100644 --- a/src/simulation/elements/GAS.cpp +++ b/src/simulation/elements/GAS.cpp @@ -3,7 +3,7 @@ void Element::Element_GAS() { Identifier = "DEFAULT_PT_GAS"; - Name = "GAS"_ascii; + Name = "GAS"; Colour = PIXPACK(0xE0FF20); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/GBMB.cpp b/src/simulation/elements/GBMB.cpp index dd4506108..189a31e84 100644 --- a/src/simulation/elements/GBMB.cpp +++ b/src/simulation/elements/GBMB.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_GBMB() { Identifier = "DEFAULT_PT_GBMB"; - Name = "GBMB"_ascii; + Name = "GBMB"; Colour = PIXPACK(0x1144BB); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/GEL.cpp b/src/simulation/elements/GEL.cpp index ac135a036..2a7f1e0de 100644 --- a/src/simulation/elements/GEL.cpp +++ b/src/simulation/elements/GEL.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_GEL() { Identifier = "DEFAULT_PT_GEL"; - Name = "GEL"_ascii; + Name = "GEL"; Colour = PIXPACK(0xFF9900); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/GLAS.cpp b/src/simulation/elements/GLAS.cpp index 2afa1bea9..abec360af 100644 --- a/src/simulation/elements/GLAS.cpp +++ b/src/simulation/elements/GLAS.cpp @@ -6,7 +6,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_GLAS() { Identifier = "DEFAULT_PT_GLAS"; - Name = "GLAS"_ascii; + Name = "GLAS"; Colour = PIXPACK(0x404040); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/GLOW.cpp b/src/simulation/elements/GLOW.cpp index ced6b091a..8274fd96f 100644 --- a/src/simulation/elements/GLOW.cpp +++ b/src/simulation/elements/GLOW.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_GLOW() { Identifier = "DEFAULT_PT_GLOW"; - Name = "GLOW"_ascii; + Name = "GLOW"; Colour = PIXPACK(0x445464); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/GOLD.cpp b/src/simulation/elements/GOLD.cpp index febfc5270..bee3544f6 100644 --- a/src/simulation/elements/GOLD.cpp +++ b/src/simulation/elements/GOLD.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_GOLD() { Identifier = "DEFAULT_PT_GOLD"; - Name = "GOLD"_ascii; + Name = "GOLD"; Colour = PIXPACK(0xDCAD2C); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/GOO.cpp b/src/simulation/elements/GOO.cpp index 5c5a518e7..c98f476af 100644 --- a/src/simulation/elements/GOO.cpp +++ b/src/simulation/elements/GOO.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_GOO() { Identifier = "DEFAULT_PT_GOO"; - Name = "GOO"_ascii; + Name = "GOO"; Colour = PIXPACK(0x804000); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/GPMP.cpp b/src/simulation/elements/GPMP.cpp index 67e35d7aa..914523fa5 100644 --- a/src/simulation/elements/GPMP.cpp +++ b/src/simulation/elements/GPMP.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_GPMP() { Identifier = "DEFAULT_PT_GPMP"; - Name = "GPMP"_ascii; + Name = "GPMP"; Colour = PIXPACK(0x0A3B3B); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/GRAV.cpp b/src/simulation/elements/GRAV.cpp index 8a074bfdb..3fa16963e 100644 --- a/src/simulation/elements/GRAV.cpp +++ b/src/simulation/elements/GRAV.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_GRAV() { Identifier = "DEFAULT_PT_GRAV"; - Name = "GRAV"_ascii; + Name = "GRAV"; Colour = PIXPACK(0x202020); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/GRVT.cpp b/src/simulation/elements/GRVT.cpp index 9f694dcf6..ddf160209 100644 --- a/src/simulation/elements/GRVT.cpp +++ b/src/simulation/elements/GRVT.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_GRVT() { Identifier = "DEFAULT_PT_GRVT"; - Name = "GRVT"_ascii; + Name = "GRVT"; Colour = PIXPACK(0x00EE76); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/GUNP.cpp b/src/simulation/elements/GUNP.cpp index c679bbdfe..b35c51681 100644 --- a/src/simulation/elements/GUNP.cpp +++ b/src/simulation/elements/GUNP.cpp @@ -3,7 +3,7 @@ void Element::Element_GUNP() { Identifier = "DEFAULT_PT_GUNP"; - Name = "GUN"_ascii; + Name = "GUN"; Colour = PIXPACK(0xC0C0D0); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp index 60f4fe8fd..ca841295a 100644 --- a/src/simulation/elements/H2.cpp +++ b/src/simulation/elements/H2.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_H2() { Identifier = "DEFAULT_PT_H2"; - Name = "HYGN"_ascii; + Name = "HYGN"; Colour = PIXPACK(0x5070FF); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/HEAC.cpp b/src/simulation/elements/HEAC.cpp index b1c774b0d..7ecbd7d0c 100644 --- a/src/simulation/elements/HEAC.cpp +++ b/src/simulation/elements/HEAC.cpp @@ -6,7 +6,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_HEAC() { Identifier = "DEFAULT_PT_HEAC"; - Name = "HEAC"_ascii; + Name = "HEAC"; Colour = PIXPACK(0xCB6351); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/HSWC.cpp b/src/simulation/elements/HSWC.cpp index 3966286ac..9fd965cce 100644 --- a/src/simulation/elements/HSWC.cpp +++ b/src/simulation/elements/HSWC.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_HSWC() { Identifier = "DEFAULT_PT_HSWC"; - Name = "HSWC"_ascii; + Name = "HSWC"; Colour = PIXPACK(0x3B0A0A); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/ICEI.cpp b/src/simulation/elements/ICEI.cpp index 8a2cfa926..7e38c4a0d 100644 --- a/src/simulation/elements/ICEI.cpp +++ b/src/simulation/elements/ICEI.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_ICEI() { Identifier = "DEFAULT_PT_ICEI"; - Name = "ICE"_ascii; + Name = "ICE"; Colour = PIXPACK(0xA0C0FF); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/IGNT.cpp b/src/simulation/elements/IGNT.cpp index 1300f7df4..bdf7c440d 100644 --- a/src/simulation/elements/IGNT.cpp +++ b/src/simulation/elements/IGNT.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_IGNT() { Identifier = "DEFAULT_PT_IGNT"; - Name = "IGNC"_ascii; + Name = "IGNC"; Colour = PIXPACK(0xC0B050); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/INSL.cpp b/src/simulation/elements/INSL.cpp index 19ba29658..041b02930 100644 --- a/src/simulation/elements/INSL.cpp +++ b/src/simulation/elements/INSL.cpp @@ -3,7 +3,7 @@ void Element::Element_INSL() { Identifier = "DEFAULT_PT_INSL"; - Name = "INSL"_ascii; + Name = "INSL"; Colour = PIXPACK(0x9EA3B6); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/INST.cpp b/src/simulation/elements/INST.cpp index 97794ee3b..e365b2e57 100644 --- a/src/simulation/elements/INST.cpp +++ b/src/simulation/elements/INST.cpp @@ -3,7 +3,7 @@ void Element::Element_INST() { Identifier = "DEFAULT_PT_INST"; - Name = "INST"_ascii; + Name = "INST"; Colour = PIXPACK(0x404039); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/INVIS.cpp b/src/simulation/elements/INVIS.cpp index 85968854c..ecf6f570b 100644 --- a/src/simulation/elements/INVIS.cpp +++ b/src/simulation/elements/INVIS.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_INVIS() { Identifier = "DEFAULT_PT_INVIS"; - Name = "INVS"_ascii; + Name = "INVS"; Colour = PIXPACK(0x00CCCC); MenuVisible = 1; MenuSection = SC_SENSOR; diff --git a/src/simulation/elements/INWR.cpp b/src/simulation/elements/INWR.cpp index 740e7cb6f..9860abd6d 100644 --- a/src/simulation/elements/INWR.cpp +++ b/src/simulation/elements/INWR.cpp @@ -3,7 +3,7 @@ void Element::Element_INWR() { Identifier = "DEFAULT_PT_INWR"; - Name = "INWR"_ascii; + Name = "INWR"; Colour = PIXPACK(0x544141); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/IRON.cpp b/src/simulation/elements/IRON.cpp index 283d494ee..0ee8ef2b7 100644 --- a/src/simulation/elements/IRON.cpp +++ b/src/simulation/elements/IRON.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_IRON() { Identifier = "DEFAULT_PT_IRON"; - Name = "IRON"_ascii; + Name = "IRON"; Colour = PIXPACK(0x707070); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/ISOZ.cpp b/src/simulation/elements/ISOZ.cpp index 7d967255d..a5813cef8 100644 --- a/src/simulation/elements/ISOZ.cpp +++ b/src/simulation/elements/ISOZ.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_ISOZ() { Identifier = "DEFAULT_PT_ISOZ"; - Name = "ISOZ"_ascii; + Name = "ISOZ"; Colour = PIXPACK(0xAA30D0); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/ISZS.cpp b/src/simulation/elements/ISZS.cpp index 4007bf55b..f9b594167 100644 --- a/src/simulation/elements/ISZS.cpp +++ b/src/simulation/elements/ISZS.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_ISZS() { Identifier = "DEFAULT_PT_ISZS"; - Name = "ISZS"_ascii; + Name = "ISZS"; Colour = PIXPACK(0x662089); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/LAVA.cpp b/src/simulation/elements/LAVA.cpp index 03020356a..3baa869d8 100644 --- a/src/simulation/elements/LAVA.cpp +++ b/src/simulation/elements/LAVA.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_LAVA() { Identifier = "DEFAULT_PT_LAVA"; - Name = "LAVA"_ascii; + Name = "LAVA"; Colour = PIXPACK(0xE05010); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/LCRY.cpp b/src/simulation/elements/LCRY.cpp index eaed93bb7..e44f3337c 100644 --- a/src/simulation/elements/LCRY.cpp +++ b/src/simulation/elements/LCRY.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_LCRY() { Identifier = "DEFAULT_PT_LCRY"; - Name = "LCRY"_ascii; + Name = "LCRY"; Colour = PIXPACK(0x505050); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/LDTC.cpp b/src/simulation/elements/LDTC.cpp index 1b6b3b68f..18191d1a4 100644 --- a/src/simulation/elements/LDTC.cpp +++ b/src/simulation/elements/LDTC.cpp @@ -6,7 +6,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_LDTC() { Identifier = "DEFAULT_PT_LDTC"; - Name = "LDTC"_ascii; + Name = "LDTC"; Colour = PIXPACK(0x66ff66); MenuVisible = 1; MenuSection = SC_SENSOR; diff --git a/src/simulation/elements/LIFE.cpp b/src/simulation/elements/LIFE.cpp index a76f45c62..8cae01db0 100644 --- a/src/simulation/elements/LIFE.cpp +++ b/src/simulation/elements/LIFE.cpp @@ -9,7 +9,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_LIFE() { Identifier = "DEFAULT_PT_LIFE"; - Name = "LIFE"_ascii; + Name = "LIFE"; Colour = PIXPACK(0x0CAC00); MenuVisible = 0; MenuSection = SC_LIFE; diff --git a/src/simulation/elements/LIGH.cpp b/src/simulation/elements/LIGH.cpp index 57f0f95a0..d669c9976 100644 --- a/src/simulation/elements/LIGH.cpp +++ b/src/simulation/elements/LIGH.cpp @@ -8,7 +8,7 @@ static void create_line_par(Simulation * sim, int x1, int y1, int x2, int y2, in void Element::Element_LIGH() { Identifier = "DEFAULT_PT_LIGH"; - Name = "LIGH"_ascii; + Name = "LIGH"; Colour = PIXPACK(0xFFFFC0); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/LNTG.cpp b/src/simulation/elements/LNTG.cpp index 6a7b5f71e..3cec6f206 100644 --- a/src/simulation/elements/LNTG.cpp +++ b/src/simulation/elements/LNTG.cpp @@ -3,7 +3,7 @@ void Element::Element_LNTG() { Identifier = "DEFAULT_PT_LNTG"; - Name = "LN2"_ascii; + Name = "LN2"; Colour = PIXPACK(0x80A0DF); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/LO2.cpp b/src/simulation/elements/LO2.cpp index f265f4cdd..a6c92a13d 100644 --- a/src/simulation/elements/LO2.cpp +++ b/src/simulation/elements/LO2.cpp @@ -3,7 +3,7 @@ void Element::Element_LO2() { Identifier = "DEFAULT_PT_LO2"; - Name = "LOXY"_ascii; + Name = "LOXY"; Colour = PIXPACK(0x80A0EF); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/LOLZ.cpp b/src/simulation/elements/LOLZ.cpp index d9bfc9ac8..bb11ddd9d 100644 --- a/src/simulation/elements/LOLZ.cpp +++ b/src/simulation/elements/LOLZ.cpp @@ -3,7 +3,7 @@ void Element::Element_LOLZ() { Identifier = "DEFAULT_PT_LOLZ"; - Name = "LOLZ"_ascii; + Name = "LOLZ"; Colour = PIXPACK(0x569212); MenuVisible = 1; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/LOVE.cpp b/src/simulation/elements/LOVE.cpp index c836b9677..6f23990c5 100644 --- a/src/simulation/elements/LOVE.cpp +++ b/src/simulation/elements/LOVE.cpp @@ -3,7 +3,7 @@ void Element::Element_LOVE() { Identifier = "DEFAULT_PT_LOVE"; - Name = "LOVE"_ascii; + Name = "LOVE"; Colour = PIXPACK(0xFF30FF); MenuVisible = 1; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/LRBD.cpp b/src/simulation/elements/LRBD.cpp index 83f050ae5..508d9ad21 100644 --- a/src/simulation/elements/LRBD.cpp +++ b/src/simulation/elements/LRBD.cpp @@ -3,7 +3,7 @@ void Element::Element_LRBD() { Identifier = "DEFAULT_PT_LRBD"; - Name = "LRBD"_ascii; + Name = "LRBD"; Colour = PIXPACK(0xAAAAAA); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/LSNS.cpp b/src/simulation/elements/LSNS.cpp index 15f5c69c3..b9e885383 100644 --- a/src/simulation/elements/LSNS.cpp +++ b/src/simulation/elements/LSNS.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_LSNS() { Identifier = "DEFAULT_PT_LSNS"; - Name = "LSNS"_ascii; + Name = "LSNS"; Colour = PIXPACK(0x336699); MenuVisible = 1; MenuSection = SC_SENSOR; diff --git a/src/simulation/elements/MERC.cpp b/src/simulation/elements/MERC.cpp index f7b150e78..28fd2d48d 100644 --- a/src/simulation/elements/MERC.cpp +++ b/src/simulation/elements/MERC.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_MERC() { Identifier = "DEFAULT_PT_MERC"; - Name = "MERC"_ascii; + Name = "MERC"; Colour = PIXPACK(0x736B6D); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp index a533e0d23..d70ec1869 100644 --- a/src/simulation/elements/METL.cpp +++ b/src/simulation/elements/METL.cpp @@ -3,7 +3,7 @@ void Element::Element_METL() { Identifier = "DEFAULT_PT_METL"; - Name = "METL"_ascii; + Name = "METL"; Colour = PIXPACK(0x404060); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/MORT.cpp b/src/simulation/elements/MORT.cpp index 248630844..d0ae4fadf 100644 --- a/src/simulation/elements/MORT.cpp +++ b/src/simulation/elements/MORT.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_MORT() { Identifier = "DEFAULT_PT_MORT"; - Name = "MORT"_ascii; + Name = "MORT"; Colour = PIXPACK(0xE0E0E0); MenuVisible = 1; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/MWAX.cpp b/src/simulation/elements/MWAX.cpp index cc607601c..7487113b1 100644 --- a/src/simulation/elements/MWAX.cpp +++ b/src/simulation/elements/MWAX.cpp @@ -3,7 +3,7 @@ void Element::Element_MWAX() { Identifier = "DEFAULT_PT_MWAX"; - Name = "MWAX"_ascii; + Name = "MWAX"; Colour = PIXPACK(0xE0E0AA); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/NBHL.cpp b/src/simulation/elements/NBHL.cpp index ae1654b9c..7cd9eb602 100644 --- a/src/simulation/elements/NBHL.cpp +++ b/src/simulation/elements/NBHL.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_NBHL() { Identifier = "DEFAULT_PT_NBHL"; - Name = "BHOL"_ascii; + Name = "BHOL"; Colour = PIXPACK(0x202020); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/NBLE.cpp b/src/simulation/elements/NBLE.cpp index cb078967e..965cf49b6 100644 --- a/src/simulation/elements/NBLE.cpp +++ b/src/simulation/elements/NBLE.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_NBLE() { Identifier = "DEFAULT_PT_NBLE"; - Name = "NBLE"_ascii; + Name = "NBLE"; Colour = PIXPACK(0xEB4917); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/NEUT.cpp b/src/simulation/elements/NEUT.cpp index d670ee568..110bc3bce 100644 --- a/src/simulation/elements/NEUT.cpp +++ b/src/simulation/elements/NEUT.cpp @@ -9,7 +9,7 @@ static int DeutExplosion(Simulation * sim, int n, int x, int y, float temp, int void Element::Element_NEUT() { Identifier = "DEFAULT_PT_NEUT"; - Name = "NEUT"_ascii; + Name = "NEUT"; Colour = PIXPACK(0x20E0FF); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/NICE.cpp b/src/simulation/elements/NICE.cpp index 1d6450a3a..afc0f71cd 100644 --- a/src/simulation/elements/NICE.cpp +++ b/src/simulation/elements/NICE.cpp @@ -3,7 +3,7 @@ void Element::Element_NICE() { Identifier = "DEFAULT_PT_NICE"; - Name = "NICE"_ascii; + Name = "NICE"; Colour = PIXPACK(0xC0E0FF); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/NITR.cpp b/src/simulation/elements/NITR.cpp index 5d4c4734b..532d52dec 100644 --- a/src/simulation/elements/NITR.cpp +++ b/src/simulation/elements/NITR.cpp @@ -3,7 +3,7 @@ void Element::Element_NITR() { Identifier = "DEFAULT_PT_NITR"; - Name = "NITR"_ascii; + Name = "NITR"; Colour = PIXPACK(0x20E010); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/NONE.cpp b/src/simulation/elements/NONE.cpp index c38e64176..a2210901a 100644 --- a/src/simulation/elements/NONE.cpp +++ b/src/simulation/elements/NONE.cpp @@ -5,7 +5,7 @@ static VideoBuffer *iconGen(int wallID, int width, int height); void Element::Element_NONE() { Identifier = "DEFAULT_PT_NONE"; - Name = ""_ascii; + Name = ""; Colour = PIXPACK(0x000000); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/NSCN.cpp b/src/simulation/elements/NSCN.cpp index f4d88bf6e..41c93bedc 100644 --- a/src/simulation/elements/NSCN.cpp +++ b/src/simulation/elements/NSCN.cpp @@ -3,7 +3,7 @@ void Element::Element_NSCN() { Identifier = "DEFAULT_PT_NSCN"; - Name = "NSCN"_ascii; + Name = "NSCN"; Colour = PIXPACK(0x505080); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/NTCT.cpp b/src/simulation/elements/NTCT.cpp index 112298315..d45df9cde 100644 --- a/src/simulation/elements/NTCT.cpp +++ b/src/simulation/elements/NTCT.cpp @@ -5,7 +5,7 @@ int Element_NTCT_update(UPDATE_FUNC_ARGS); void Element::Element_NTCT() { Identifier = "DEFAULT_PT_NTCT"; - Name = "NTCT"_ascii; + Name = "NTCT"; Colour = PIXPACK(0x505040); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/NWHL.cpp b/src/simulation/elements/NWHL.cpp index 642cb7ab9..62f6df38c 100644 --- a/src/simulation/elements/NWHL.cpp +++ b/src/simulation/elements/NWHL.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_NWHL() { Identifier = "DEFAULT_PT_NWHL"; - Name = "WHOL"_ascii; + Name = "WHOL"; Colour = PIXPACK(0xFFFFFF); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp index 574f7d87a..6a0d41ceb 100644 --- a/src/simulation/elements/O2.cpp +++ b/src/simulation/elements/O2.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_O2() { Identifier = "DEFAULT_PT_O2"; - Name = "OXYG"_ascii; + Name = "OXYG"; Colour = PIXPACK(0x80A0FF); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/OIL.cpp b/src/simulation/elements/OIL.cpp index 1830650a7..8b609a451 100644 --- a/src/simulation/elements/OIL.cpp +++ b/src/simulation/elements/OIL.cpp @@ -3,7 +3,7 @@ void Element::Element_OIL() { Identifier = "DEFAULT_PT_OIL"; - Name = "OIL"_ascii; + Name = "OIL"; Colour = PIXPACK(0x404010); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/PBCN.cpp b/src/simulation/elements/PBCN.cpp index 1b7dc6487..1909debf4 100644 --- a/src/simulation/elements/PBCN.cpp +++ b/src/simulation/elements/PBCN.cpp @@ -7,7 +7,7 @@ bool Element_PCLN_ctypeDraw(CTYPEDRAW_FUNC_ARGS); void Element::Element_PBCN() { Identifier = "DEFAULT_PT_PBCN"; - Name = "PBCN"_ascii; + Name = "PBCN"; Colour = PIXPACK(0x3B1D0A); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/PCLN.cpp b/src/simulation/elements/PCLN.cpp index 0a3086751..188f975bb 100644 --- a/src/simulation/elements/PCLN.cpp +++ b/src/simulation/elements/PCLN.cpp @@ -7,7 +7,7 @@ bool Element_PCLN_ctypeDraw(CTYPEDRAW_FUNC_ARGS); void Element::Element_PCLN() { Identifier = "DEFAULT_PT_PCLN"; - Name = "PCLN"_ascii; + Name = "PCLN"; Colour = PIXPACK(0x3B3B0A); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/PHOT.cpp b/src/simulation/elements/PHOT.cpp index 145f5a23b..e369c0717 100644 --- a/src/simulation/elements/PHOT.cpp +++ b/src/simulation/elements/PHOT.cpp @@ -8,7 +8,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_PHOT() { Identifier = "DEFAULT_PT_PHOT"; - Name = "PHOT"_ascii; + Name = "PHOT"; Colour = PIXPACK(0xFFFFFF); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/PIPE.cpp b/src/simulation/elements/PIPE.cpp index 9da6b4e27..f7d7ec2ea 100644 --- a/src/simulation/elements/PIPE.cpp +++ b/src/simulation/elements/PIPE.cpp @@ -13,7 +13,7 @@ void Element_SOAP_detach(Simulation * sim, int i); void Element::Element_PIPE() { Identifier = "DEFAULT_PT_PIPE"; - Name = "PIPE"_ascii; + Name = "PIPE"; Colour = PIXPACK(0x444444); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/PLEX.cpp b/src/simulation/elements/PLEX.cpp index 17e1f0346..12221c1f3 100644 --- a/src/simulation/elements/PLEX.cpp +++ b/src/simulation/elements/PLEX.cpp @@ -3,7 +3,7 @@ void Element::Element_PLEX() { Identifier = "DEFAULT_PT_PLEX"; - Name = "C-4"_ascii; + Name = "C-4"; Colour = PIXPACK(0xD080E0); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp index 747efa7b4..d61cd9377 100644 --- a/src/simulation/elements/PLNT.cpp +++ b/src/simulation/elements/PLNT.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_PLNT() { Identifier = "DEFAULT_PT_PLNT"; - Name = "PLNT"_ascii; + Name = "PLNT"; Colour = PIXPACK(0x0CAC00); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/PLSM.cpp b/src/simulation/elements/PLSM.cpp index c44d1f925..00a257bb1 100644 --- a/src/simulation/elements/PLSM.cpp +++ b/src/simulation/elements/PLSM.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_PLSM() { Identifier = "DEFAULT_PT_PLSM"; - Name = "PLSM"_ascii; + Name = "PLSM"; Colour = PIXPACK(0xBB99FF); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/PLUT.cpp b/src/simulation/elements/PLUT.cpp index b1fb9e27d..c40691bdb 100644 --- a/src/simulation/elements/PLUT.cpp +++ b/src/simulation/elements/PLUT.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_PLUT() { Identifier = "DEFAULT_PT_PLUT"; - Name = "PLUT"_ascii; + Name = "PLUT"; Colour = PIXPACK(0x407020); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/POLO.cpp b/src/simulation/elements/POLO.cpp index e7f08a81c..aaf0df973 100644 --- a/src/simulation/elements/POLO.cpp +++ b/src/simulation/elements/POLO.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_POLO() { Identifier = "DEFAULT_PT_POLO"; - Name = "POLO"_ascii; + Name = "POLO"; Colour = PIXPACK(0x506030); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/PPIP.cpp b/src/simulation/elements/PPIP.cpp index 0e9f40e94..0d2f5c8e0 100644 --- a/src/simulation/elements/PPIP.cpp +++ b/src/simulation/elements/PPIP.cpp @@ -6,7 +6,7 @@ int Element_PIPE_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_PPIP() { Identifier = "DEFAULT_PT_PPIP"; - Name = "PPIP"_ascii; + Name = "PPIP"; Colour = PIXPACK(0x444466); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/PQRT.cpp b/src/simulation/elements/PQRT.cpp index 009c9b8c5..098964bee 100644 --- a/src/simulation/elements/PQRT.cpp +++ b/src/simulation/elements/PQRT.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_PQRT() { Identifier = "DEFAULT_PT_PQRT"; - Name = "PQRT"_ascii; + Name = "PQRT"; Colour = PIXPACK(0x88BBBB); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/PROT.cpp b/src/simulation/elements/PROT.cpp index 82a24da4e..799eabadc 100644 --- a/src/simulation/elements/PROT.cpp +++ b/src/simulation/elements/PROT.cpp @@ -8,7 +8,7 @@ static int DeutImplosion(Simulation * sim, int n, int x, int y, float temp, int void Element::Element_PROT() { Identifier = "DEFAULT_PT_PROT"; - Name = "PROT"_ascii; + Name = "PROT"; Colour = PIXPACK(0x990000); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/PRTI.cpp b/src/simulation/elements/PRTI.cpp index 8e0984af1..f71e93aad 100644 --- a/src/simulation/elements/PRTI.cpp +++ b/src/simulation/elements/PRTI.cpp @@ -8,7 +8,7 @@ void Element_SOAP_detach(Simulation * sim, int i); void Element::Element_PRTI() { Identifier = "DEFAULT_PT_PRTI"; - Name = "PRTI"_ascii; + Name = "PRTI"; Colour = PIXPACK(0xEB5917); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/PRTO.cpp b/src/simulation/elements/PRTO.cpp index d14226ef9..028865c30 100644 --- a/src/simulation/elements/PRTO.cpp +++ b/src/simulation/elements/PRTO.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_PRTO() { Identifier = "DEFAULT_PT_PRTO"; - Name = "PRTO"_ascii; + Name = "PRTO"; Colour = PIXPACK(0x0020EB); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/PSCN.cpp b/src/simulation/elements/PSCN.cpp index 1923b5360..4f3dbdb77 100644 --- a/src/simulation/elements/PSCN.cpp +++ b/src/simulation/elements/PSCN.cpp @@ -3,7 +3,7 @@ void Element::Element_PSCN() { Identifier = "DEFAULT_PT_PSCN"; - Name = "PSCN"_ascii; + Name = "PSCN"; Colour = PIXPACK(0x805050); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/PSNS.cpp b/src/simulation/elements/PSNS.cpp index c8728d670..cdb47c258 100644 --- a/src/simulation/elements/PSNS.cpp +++ b/src/simulation/elements/PSNS.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_PSNS() { Identifier = "DEFAULT_PT_PSNS"; - Name = "PSNS"_ascii; + Name = "PSNS"; Colour = PIXPACK(0xDB2020); MenuVisible = 1; MenuSection = SC_SENSOR; diff --git a/src/simulation/elements/PSTE.cpp b/src/simulation/elements/PSTE.cpp index 4f559f8a7..c65ad9056 100644 --- a/src/simulation/elements/PSTE.cpp +++ b/src/simulation/elements/PSTE.cpp @@ -3,7 +3,7 @@ void Element::Element_PSTE() { Identifier = "DEFAULT_PT_PSTE"; - Name = "PSTE"_ascii; + Name = "PSTE"; Colour = PIXPACK(0xAA99AA); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp index 479261e80..7bf77b7a6 100644 --- a/src/simulation/elements/PSTN.cpp +++ b/src/simulation/elements/PSTN.cpp @@ -11,7 +11,7 @@ static int MoveStack(Simulation * sim, int stackX, int stackY, int directionX, i void Element::Element_PSTN() { Identifier = "DEFAULT_PT_PSTN"; - Name = "PSTN"_ascii; + Name = "PSTN"; Colour = PIXPACK(0xAA9999); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/PSTS.cpp b/src/simulation/elements/PSTS.cpp index c3aec1d4b..3bffb0913 100644 --- a/src/simulation/elements/PSTS.cpp +++ b/src/simulation/elements/PSTS.cpp @@ -3,7 +3,7 @@ void Element::Element_PSTS() { Identifier = "DEFAULT_PT_PSTS"; - Name = "PSTS"_ascii; + Name = "PSTS"; Colour = PIXPACK(0x776677); MenuVisible = 0; MenuSection = SC_CRACKER; diff --git a/src/simulation/elements/PTCT.cpp b/src/simulation/elements/PTCT.cpp index bf7d632fb..2d3730216 100644 --- a/src/simulation/elements/PTCT.cpp +++ b/src/simulation/elements/PTCT.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_PTCT() { Identifier = "DEFAULT_PT_PTCT"; - Name = "PTCT"_ascii; + Name = "PTCT"; Colour = PIXPACK(0x405050); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/PUMP.cpp b/src/simulation/elements/PUMP.cpp index 138dfcc93..8ce84bf91 100644 --- a/src/simulation/elements/PUMP.cpp +++ b/src/simulation/elements/PUMP.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_PUMP() { Identifier = "DEFAULT_PT_PUMP"; - Name = "PUMP"_ascii; + Name = "PUMP"; Colour = PIXPACK(0x0A0A3B); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/PVOD.cpp b/src/simulation/elements/PVOD.cpp index 6f49c8f34..70b0ce912 100644 --- a/src/simulation/elements/PVOD.cpp +++ b/src/simulation/elements/PVOD.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_PVOD() { Identifier = "DEFAULT_PT_PVOD"; - Name = "PVOD"_ascii; + Name = "PVOD"; Colour = PIXPACK(0x792020); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/QRTZ.cpp b/src/simulation/elements/QRTZ.cpp index ebb134cee..7ce4924d5 100644 --- a/src/simulation/elements/QRTZ.cpp +++ b/src/simulation/elements/QRTZ.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_QRTZ() { Identifier = "DEFAULT_PT_QRTZ"; - Name = "QRTZ"_ascii; + Name = "QRTZ"; Colour = PIXPACK(0xAADDDD); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/RBDM.cpp b/src/simulation/elements/RBDM.cpp index 5b793d103..87d44b7bf 100644 --- a/src/simulation/elements/RBDM.cpp +++ b/src/simulation/elements/RBDM.cpp @@ -3,7 +3,7 @@ void Element::Element_RBDM() { Identifier = "DEFAULT_PT_RBDM"; - Name = "RBDM"_ascii; + Name = "RBDM"; Colour = PIXPACK(0xCCCCCC); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/RFGL.cpp b/src/simulation/elements/RFGL.cpp index e6adc9411..4cc5a6a56 100644 --- a/src/simulation/elements/RFGL.cpp +++ b/src/simulation/elements/RFGL.cpp @@ -5,7 +5,7 @@ int Element_RFRG_update(UPDATE_FUNC_ARGS); void Element::Element_RFGL() { Identifier = "DEFAULT_PT_RFGL"; - Name = "RFGL"_ascii; + Name = "RFGL"; Colour = PIXPACK(0x84C2CF); MenuVisible = 0; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/RFRG.cpp b/src/simulation/elements/RFRG.cpp index 2e27cf292..d6499ae24 100644 --- a/src/simulation/elements/RFRG.cpp +++ b/src/simulation/elements/RFRG.cpp @@ -5,7 +5,7 @@ int Element_RFRG_update(UPDATE_FUNC_ARGS); void Element::Element_RFRG() { Identifier = "DEFAULT_PT_RFRG"; - Name = "RFRG"_ascii; + Name = "RFRG"; Colour = PIXPACK(0x72D2D4); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/RIME.cpp b/src/simulation/elements/RIME.cpp index f90d33196..0284aca17 100644 --- a/src/simulation/elements/RIME.cpp +++ b/src/simulation/elements/RIME.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_RIME() { Identifier = "DEFAULT_PT_RIME"; - Name = "RIME"_ascii; + Name = "RIME"; Colour = PIXPACK(0xCCCCCC); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/RPEL.cpp b/src/simulation/elements/RPEL.cpp index 2842c6339..ea1a06663 100644 --- a/src/simulation/elements/RPEL.cpp +++ b/src/simulation/elements/RPEL.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_RPEL() { Identifier = "DEFAULT_PT_RPEL"; - Name = "RPEL"_ascii; + Name = "RPEL"; Colour = PIXPACK(0x99CC00); MenuVisible = 1; MenuSection = SC_FORCE; diff --git a/src/simulation/elements/SALT.cpp b/src/simulation/elements/SALT.cpp index f9f276321..397ad597d 100644 --- a/src/simulation/elements/SALT.cpp +++ b/src/simulation/elements/SALT.cpp @@ -3,7 +3,7 @@ void Element::Element_SALT() { Identifier = "DEFAULT_PT_SALT"; - Name = "SALT"_ascii; + Name = "SALT"; Colour = PIXPACK(0xFFFFFF); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/SAND.cpp b/src/simulation/elements/SAND.cpp index b8b67a1d1..4053724b9 100644 --- a/src/simulation/elements/SAND.cpp +++ b/src/simulation/elements/SAND.cpp @@ -3,7 +3,7 @@ void Element::Element_SAND() { Identifier = "DEFAULT_PT_SAND"; - Name = "SAND"_ascii; + Name = "SAND"; Colour = PIXPACK(0xFFD090); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/SAWD.cpp b/src/simulation/elements/SAWD.cpp index 38329b717..29edaad8a 100644 --- a/src/simulation/elements/SAWD.cpp +++ b/src/simulation/elements/SAWD.cpp @@ -3,7 +3,7 @@ void Element::Element_SAWD() { Identifier = "DEFAULT_PT_SAWD"; - Name = "SAWD"_ascii; + Name = "SAWD"; Colour = PIXPACK(0xF0F0A0); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/SHLD1.cpp b/src/simulation/elements/SHLD1.cpp index 676e70eea..20c45095d 100644 --- a/src/simulation/elements/SHLD1.cpp +++ b/src/simulation/elements/SHLD1.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_SHLD1() { Identifier = "DEFAULT_PT_SHLD1"; - Name = "SHLD"_ascii; + Name = "SHLD"; Colour = PIXPACK(0xAAAAAA); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/SHLD2.cpp b/src/simulation/elements/SHLD2.cpp index e06ba58ca..4c6b1da53 100644 --- a/src/simulation/elements/SHLD2.cpp +++ b/src/simulation/elements/SHLD2.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_SHLD2() { Identifier = "DEFAULT_PT_SHLD2"; - Name = "SHD2"_ascii; + Name = "SHD2"; Colour = PIXPACK(0x777777); MenuVisible = 0; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/SHLD3.cpp b/src/simulation/elements/SHLD3.cpp index 15d4632ff..7bd4f2e74 100644 --- a/src/simulation/elements/SHLD3.cpp +++ b/src/simulation/elements/SHLD3.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_SHLD3() { Identifier = "DEFAULT_PT_SHLD3"; - Name = "SHD3"_ascii; + Name = "SHD3"; Colour = PIXPACK(0x444444); MenuVisible = 0; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/SHLD4.cpp b/src/simulation/elements/SHLD4.cpp index cbcbce3a6..ce7730b72 100644 --- a/src/simulation/elements/SHLD4.cpp +++ b/src/simulation/elements/SHLD4.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_SHLD4() { Identifier = "DEFAULT_PT_SHLD4"; - Name = "SHD4"_ascii; + Name = "SHD4"; Colour = PIXPACK(0x212121); MenuVisible = 0; MenuSection = SC_CRACKER2; diff --git a/src/simulation/elements/SING.cpp b/src/simulation/elements/SING.cpp index 3416bd8ae..e6b9f2ca8 100644 --- a/src/simulation/elements/SING.cpp +++ b/src/simulation/elements/SING.cpp @@ -6,7 +6,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_SING() { Identifier = "DEFAULT_PT_SING"; - Name = "SING"_ascii; + Name = "SING"; Colour = PIXPACK(0x242424); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/SLTW.cpp b/src/simulation/elements/SLTW.cpp index 56967a8df..ee5f5bc27 100644 --- a/src/simulation/elements/SLTW.cpp +++ b/src/simulation/elements/SLTW.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_SLTW() { Identifier = "DEFAULT_PT_SLTW"; - Name = "SLTW"_ascii; + Name = "SLTW"; Colour = PIXPACK(0x4050F0); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/SMKE.cpp b/src/simulation/elements/SMKE.cpp index 6dfa0bda0..8566bedef 100644 --- a/src/simulation/elements/SMKE.cpp +++ b/src/simulation/elements/SMKE.cpp @@ -5,7 +5,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_SMKE() { Identifier = "DEFAULT_PT_SMKE"; - Name = "SMKE"_ascii; + Name = "SMKE"; Colour = PIXPACK(0x222222); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp index 7afd324e6..ae11179ea 100644 --- a/src/simulation/elements/SNOW.cpp +++ b/src/simulation/elements/SNOW.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_SNOW() { Identifier = "DEFAULT_PT_SNOW"; - Name = "SNOW"_ascii; + Name = "SNOW"; Colour = PIXPACK(0xC0E0FF); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp index 397941bb7..f9e91bfbe 100644 --- a/src/simulation/elements/SOAP.cpp +++ b/src/simulation/elements/SOAP.cpp @@ -7,7 +7,7 @@ static void changeType(ELEMENT_CHANGETYPE_FUNC_ARGS); void Element::Element_SOAP() { Identifier = "DEFAULT_PT_SOAP"; - Name = "SOAP"_ascii; + Name = "SOAP"; Colour = PIXPACK(0xF5F5DC); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/SPAWN.cpp b/src/simulation/elements/SPAWN.cpp index 721cd8ed7..620f3ae5c 100644 --- a/src/simulation/elements/SPAWN.cpp +++ b/src/simulation/elements/SPAWN.cpp @@ -6,7 +6,7 @@ static void changeType(ELEMENT_CHANGETYPE_FUNC_ARGS); void Element::Element_SPAWN() { Identifier = "DEFAULT_PT_SPAWN"; - Name = "SPWN"_ascii; + Name = "SPWN"; Colour = PIXPACK(0xAAAAAA); MenuVisible = 0; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/SPAWN2.cpp b/src/simulation/elements/SPAWN2.cpp index c0a8775f8..4b6d0bb0c 100644 --- a/src/simulation/elements/SPAWN2.cpp +++ b/src/simulation/elements/SPAWN2.cpp @@ -6,7 +6,7 @@ static void changeType(ELEMENT_CHANGETYPE_FUNC_ARGS); void Element::Element_SPAWN2() { Identifier = "DEFAULT_PT_SPAWN2"; - Name = "SPWN2"_ascii; + Name = "SPWN2"; Colour = PIXPACK(0xAAAAAA); MenuVisible = 0; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/SPNG.cpp b/src/simulation/elements/SPNG.cpp index b7aa8256f..887f84a3f 100644 --- a/src/simulation/elements/SPNG.cpp +++ b/src/simulation/elements/SPNG.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_SPNG() { Identifier = "DEFAULT_PT_SPNG"; - Name = "SPNG"_ascii; + Name = "SPNG"; Colour = PIXPACK(0xFFBE30); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp index 5ee6db8c6..00a3cb95b 100644 --- a/src/simulation/elements/SPRK.cpp +++ b/src/simulation/elements/SPRK.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_SPRK() { Identifier = "DEFAULT_PT_SPRK"; - Name = "SPRK"_ascii; + Name = "SPRK"; Colour = PIXPACK(0xFFFF80); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp index 35adecf46..30bb7052a 100644 --- a/src/simulation/elements/STKM.cpp +++ b/src/simulation/elements/STKM.cpp @@ -13,7 +13,7 @@ void Element_STKM_interact(Simulation *sim, playerst *playerp, int i, int x, int void Element::Element_STKM() { Identifier = "DEFAULT_PT_STKM"; - Name = "STKM"_ascii; + Name = "STKM"; Colour = PIXPACK(0xFFE0A0); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp index 861078d4d..fd86ed88a 100644 --- a/src/simulation/elements/STKM2.cpp +++ b/src/simulation/elements/STKM2.cpp @@ -11,7 +11,7 @@ int Element_STKM_run_stickman(playerst *playerp, UPDATE_FUNC_ARGS); void Element::Element_STKM2() { Identifier = "DEFAULT_PT_STKM2"; - Name = "STK2"_ascii; + Name = "STK2"; Colour = PIXPACK(0x6464FF); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/STNE.cpp b/src/simulation/elements/STNE.cpp index ef03a72f5..3a4c085a0 100644 --- a/src/simulation/elements/STNE.cpp +++ b/src/simulation/elements/STNE.cpp @@ -3,7 +3,7 @@ void Element::Element_STNE() { Identifier = "DEFAULT_PT_STNE"; - Name = "STNE"_ascii; + Name = "STNE"; Colour = PIXPACK(0xA0A0A0); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp index a7c3a6bdc..1f45c20e8 100644 --- a/src/simulation/elements/STOR.cpp +++ b/src/simulation/elements/STOR.cpp @@ -8,7 +8,7 @@ static bool ctypeDraw(CTYPEDRAW_FUNC_ARGS); void Element::Element_STOR() { Identifier = "DEFAULT_PT_STOR"; - Name = "STOR"_ascii; + Name = "STOR"; Colour = PIXPACK(0x50DFDF); MenuVisible = 1; MenuSection = SC_POWERED; diff --git a/src/simulation/elements/SWCH.cpp b/src/simulation/elements/SWCH.cpp index f6c037433..456157b1f 100644 --- a/src/simulation/elements/SWCH.cpp +++ b/src/simulation/elements/SWCH.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_SWCH() { Identifier = "DEFAULT_PT_SWCH"; - Name = "SWCH"_ascii; + Name = "SWCH"; Colour = PIXPACK(0x103B11); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/TESC.cpp b/src/simulation/elements/TESC.cpp index 108e4adf4..e8c88c41f 100644 --- a/src/simulation/elements/TESC.cpp +++ b/src/simulation/elements/TESC.cpp @@ -5,7 +5,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_TESC() { Identifier = "DEFAULT_PT_TESC"; - Name = "TESC"_ascii; + Name = "TESC"; Colour = PIXPACK(0x707040); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/THDR.cpp b/src/simulation/elements/THDR.cpp index 3b74ba7f5..1c8b2cdc0 100644 --- a/src/simulation/elements/THDR.cpp +++ b/src/simulation/elements/THDR.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_THDR() { Identifier = "DEFAULT_PT_THDR"; - Name = "THDR"_ascii; + Name = "THDR"; Colour = PIXPACK(0xFFFFA0); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/THRM.cpp b/src/simulation/elements/THRM.cpp index e5130a810..5bf661a02 100644 --- a/src/simulation/elements/THRM.cpp +++ b/src/simulation/elements/THRM.cpp @@ -3,7 +3,7 @@ void Element::Element_THRM() { Identifier = "DEFAULT_PT_THRM"; - Name = "THRM"_ascii; + Name = "THRM"; Colour = PIXPACK(0xA08090); MenuVisible = 1; MenuSection = SC_EXPLOSIVE; diff --git a/src/simulation/elements/TRON.cpp b/src/simulation/elements/TRON.cpp index a03ed8361..cbeb02452 100644 --- a/src/simulation/elements/TRON.cpp +++ b/src/simulation/elements/TRON.cpp @@ -11,7 +11,7 @@ static int new_tronhead(Simulation * sim, int x, int y, int i, int direction); void Element::Element_TRON() { Identifier = "DEFAULT_PT_TRON"; - Name = "TRON"_ascii; + Name = "TRON"; Colour = PIXPACK(0xA9FF00); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp index 55bc05b96..bc308f3b3 100644 --- a/src/simulation/elements/TSNS.cpp +++ b/src/simulation/elements/TSNS.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_TSNS() { Identifier = "DEFAULT_PT_TSNS"; - Name = "TSNS"_ascii; + Name = "TSNS"; Colour = PIXPACK(0xFD00D5); MenuVisible = 1; MenuSection = SC_SENSOR; diff --git a/src/simulation/elements/TTAN.cpp b/src/simulation/elements/TTAN.cpp index d093cefd4..4ece96087 100644 --- a/src/simulation/elements/TTAN.cpp +++ b/src/simulation/elements/TTAN.cpp @@ -6,7 +6,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_TTAN() { Identifier = "DEFAULT_PT_TTAN"; - Name = "TTAN"_ascii; + Name = "TTAN"; Colour = PIXPACK(0x909090); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/TUNG.cpp b/src/simulation/elements/TUNG.cpp index 676584844..13d233967 100644 --- a/src/simulation/elements/TUNG.cpp +++ b/src/simulation/elements/TUNG.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_TUNG() { Identifier = "DEFAULT_PT_TUNG"; - Name = "TUNG"_ascii; + Name = "TUNG"; Colour = PIXPACK(0x505050); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/URAN.cpp b/src/simulation/elements/URAN.cpp index 72f65f26d..9e053cb59 100644 --- a/src/simulation/elements/URAN.cpp +++ b/src/simulation/elements/URAN.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_URAN() { Identifier = "DEFAULT_PT_URAN"; - Name = "URAN"_ascii; + Name = "URAN"; Colour = PIXPACK(0x707020); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp index 5ec9e4cd8..37ec61ac0 100644 --- a/src/simulation/elements/VIBR.cpp +++ b/src/simulation/elements/VIBR.cpp @@ -6,7 +6,7 @@ int Element_VIBR_graphics(GRAPHICS_FUNC_ARGS); void Element::Element_VIBR() { Identifier = "DEFAULT_PT_VIBR"; - Name = "VIBR"_ascii; + Name = "VIBR"; Colour = PIXPACK(0x005000); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/VINE.cpp b/src/simulation/elements/VINE.cpp index 4105d5c5e..a7eaf6304 100644 --- a/src/simulation/elements/VINE.cpp +++ b/src/simulation/elements/VINE.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_VINE() { Identifier = "DEFAULT_PT_VINE"; - Name = "VINE"_ascii; + Name = "VINE"; Colour = PIXPACK(0x079A00); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/VIRS.cpp b/src/simulation/elements/VIRS.cpp index 9c3a14b32..105bacfe6 100644 --- a/src/simulation/elements/VIRS.cpp +++ b/src/simulation/elements/VIRS.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_VIRS() { Identifier = "DEFAULT_PT_VIRS"; - Name = "VIRS"_ascii; + Name = "VIRS"; Colour = PIXPACK(0xFE11F6); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/VOID.cpp b/src/simulation/elements/VOID.cpp index 9cc5d8191..9f00e4ffd 100644 --- a/src/simulation/elements/VOID.cpp +++ b/src/simulation/elements/VOID.cpp @@ -3,7 +3,7 @@ void Element::Element_VOID() { Identifier = "DEFAULT_PT_VOID"; - Name = "VOID"_ascii; + Name = "VOID"; Colour = PIXPACK(0x790B0B); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/VRSG.cpp b/src/simulation/elements/VRSG.cpp index e6f9f7ae0..c085fc908 100644 --- a/src/simulation/elements/VRSG.cpp +++ b/src/simulation/elements/VRSG.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_VRSG() { Identifier = "DEFAULT_PT_VRSG"; - Name = "VRSG"_ascii; + Name = "VRSG"; Colour = PIXPACK(0xFE68FE); MenuVisible = 0; MenuSection = SC_GAS; diff --git a/src/simulation/elements/VRSS.cpp b/src/simulation/elements/VRSS.cpp index 9e81b6c9a..698316be1 100644 --- a/src/simulation/elements/VRSS.cpp +++ b/src/simulation/elements/VRSS.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_VRSS() { Identifier = "DEFAULT_PT_VRSS"; - Name = "VRSS"_ascii; + Name = "VRSS"; Colour = PIXPACK(0xD408CD); MenuVisible = 0; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/WARP.cpp b/src/simulation/elements/WARP.cpp index 84fc23693..cb7ce1179 100644 --- a/src/simulation/elements/WARP.cpp +++ b/src/simulation/elements/WARP.cpp @@ -7,7 +7,7 @@ static void create(ELEMENT_CREATE_FUNC_ARGS); void Element::Element_WARP() { Identifier = "DEFAULT_PT_WARP"; - Name = "WARP"_ascii; + Name = "WARP"; Colour = PIXPACK(0x101010); MenuVisible = 1; MenuSection = SC_NUCLEAR; diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp index 31bbd1c44..3f355eba7 100644 --- a/src/simulation/elements/WATR.cpp +++ b/src/simulation/elements/WATR.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_WATR() { Identifier = "DEFAULT_PT_WATR"; - Name = "WATR"_ascii; + Name = "WATR"; Colour = PIXPACK(0x2030D0); MenuVisible = 1; MenuSection = SC_LIQUID; diff --git a/src/simulation/elements/WAX.cpp b/src/simulation/elements/WAX.cpp index 4bc1d9f82..dae822e42 100644 --- a/src/simulation/elements/WAX.cpp +++ b/src/simulation/elements/WAX.cpp @@ -3,7 +3,7 @@ void Element::Element_WAX() { Identifier = "DEFAULT_PT_WAX"; - Name = "WAX"_ascii; + Name = "WAX"; Colour = PIXPACK(0xF0F0BB); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/WHOL.cpp b/src/simulation/elements/WHOL.cpp index 380ebea11..ec29e1e24 100644 --- a/src/simulation/elements/WHOL.cpp +++ b/src/simulation/elements/WHOL.cpp @@ -3,7 +3,7 @@ void Element::Element_WHOL() { Identifier = "DEFAULT_PT_WHOL"; - Name = "VENT"_ascii; + Name = "VENT"; Colour = PIXPACK(0xEFEFEF); MenuVisible = 1; MenuSection = SC_SPECIAL; diff --git a/src/simulation/elements/WIFI.cpp b/src/simulation/elements/WIFI.cpp index b3411e9c0..b3d56660a 100644 --- a/src/simulation/elements/WIFI.cpp +++ b/src/simulation/elements/WIFI.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_WIFI() { Identifier = "DEFAULT_PT_WIFI"; - Name = "WIFI"_ascii; + Name = "WIFI"; Colour = PIXPACK(0x40A060); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/WIRE.cpp b/src/simulation/elements/WIRE.cpp index 65afb2cf2..f09b6e088 100644 --- a/src/simulation/elements/WIRE.cpp +++ b/src/simulation/elements/WIRE.cpp @@ -6,7 +6,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_WIRE() { Identifier = "DEFAULT_PT_WIRE"; - Name = "WWLD"_ascii; + Name = "WWLD"; Colour = PIXPACK(0xFFCC00); MenuVisible = 1; MenuSection = SC_ELEC; diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp index 242a2702a..5bccaca41 100644 --- a/src/simulation/elements/WOOD.cpp +++ b/src/simulation/elements/WOOD.cpp @@ -7,7 +7,7 @@ static int graphics(GRAPHICS_FUNC_ARGS); void Element::Element_WOOD() { Identifier = "DEFAULT_PT_WOOD"; - Name = "WOOD"_ascii; + Name = "WOOD"; Colour = PIXPACK(0xC0A040); MenuVisible = 1; MenuSection = SC_SOLIDS; diff --git a/src/simulation/elements/WTRV.cpp b/src/simulation/elements/WTRV.cpp index c0f89dddb..e80d95550 100644 --- a/src/simulation/elements/WTRV.cpp +++ b/src/simulation/elements/WTRV.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_WTRV() { Identifier = "DEFAULT_PT_WTRV"; - Name = "WTRV"_ascii; + Name = "WTRV"; Colour = PIXPACK(0xA0A0FF); MenuVisible = 1; MenuSection = SC_GAS; diff --git a/src/simulation/elements/YEST.cpp b/src/simulation/elements/YEST.cpp index 618bd3955..9b352d894 100644 --- a/src/simulation/elements/YEST.cpp +++ b/src/simulation/elements/YEST.cpp @@ -5,7 +5,7 @@ static int update(UPDATE_FUNC_ARGS); void Element::Element_YEST() { Identifier = "DEFAULT_PT_YEST"; - Name = "YEST"_ascii; + Name = "YEST"; Colour = PIXPACK(0xEEE0C0); MenuVisible = 1; MenuSection = SC_POWDERS; diff --git a/src/simulation/simtools/AIR.cpp b/src/simulation/simtools/AIR.cpp index caeeb419b..80d07b460 100644 --- a/src/simulation/simtools/AIR.cpp +++ b/src/simulation/simtools/AIR.cpp @@ -6,7 +6,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_AIR() { Identifier = "DEFAULT_TOOL_AIR"; - Name = "AIR"_ascii; + Name = "AIR"; Colour = PIXPACK(0xFFFFFF); Description = "Air, creates airflow and pressure."_i18n; Perform = &perform; diff --git a/src/simulation/simtools/COOL.cpp b/src/simulation/simtools/COOL.cpp index 427cfcdbd..c135ad708 100644 --- a/src/simulation/simtools/COOL.cpp +++ b/src/simulation/simtools/COOL.cpp @@ -5,7 +5,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_COOL() { Identifier = "DEFAULT_TOOL_COOL"; - Name = "COOL"_ascii; + Name = "COOL"; Colour = PIXPACK(0x00DDFF); Description = "Cools the targeted element."_i18n; Perform = &perform; diff --git a/src/simulation/simtools/CYCL.cpp b/src/simulation/simtools/CYCL.cpp index fa6c62f30..45e187a0c 100644 --- a/src/simulation/simtools/CYCL.cpp +++ b/src/simulation/simtools/CYCL.cpp @@ -8,7 +8,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_CYCL() { Identifier = "DEFAULT_TOOL_CYCL"; - Name = "CYCL"_ascii; + Name = "CYCL"; Colour = PIXPACK(0x132f5b); Description = "Cyclone, produces swirling air currents"_i18n; Perform = &perform; diff --git a/src/simulation/simtools/HEAT.cpp b/src/simulation/simtools/HEAT.cpp index d3167c969..efac45ac9 100644 --- a/src/simulation/simtools/HEAT.cpp +++ b/src/simulation/simtools/HEAT.cpp @@ -5,7 +5,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_HEAT() { Identifier = "DEFAULT_TOOL_HEAT"; - Name = "HEAT"_ascii; + Name = "HEAT"; Colour = PIXPACK(0xFFDD00); Description = "Heats the targeted element."_i18n; Perform = &perform; diff --git a/src/simulation/simtools/MIX.cpp b/src/simulation/simtools/MIX.cpp index 5f60991d6..abf96a372 100644 --- a/src/simulation/simtools/MIX.cpp +++ b/src/simulation/simtools/MIX.cpp @@ -8,7 +8,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_MIX() { Identifier = "DEFAULT_TOOL_MIX"; - Name = "MIX"_ascii; + Name = "MIX"; Colour = PIXPACK(0xFFD090); Description = "Mixes particles."_i18n; Perform = &perform; diff --git a/src/simulation/simtools/NGRV.cpp b/src/simulation/simtools/NGRV.cpp index 42f73fdda..7b8e0ff45 100644 --- a/src/simulation/simtools/NGRV.cpp +++ b/src/simulation/simtools/NGRV.cpp @@ -5,7 +5,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_NGRV() { Identifier = "DEFAULT_TOOL_NGRV"; - Name = "NGRV"_ascii; + Name = "NGRV"; Colour = PIXPACK(0xAACCFF); Description = "Creates a short-lasting negative gravity well."_i18n; Perform = &perform; diff --git a/src/simulation/simtools/PGRV.cpp b/src/simulation/simtools/PGRV.cpp index 362718e59..fbcf12947 100644 --- a/src/simulation/simtools/PGRV.cpp +++ b/src/simulation/simtools/PGRV.cpp @@ -5,7 +5,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_PGRV() { Identifier = "DEFAULT_TOOL_PGRV"; - Name = "PGRV"_ascii; + Name = "PGRV"; Colour = PIXPACK(0xCCCCFF); Description = "Creates a short-lasting gravity well."_i18n; Perform = &perform; diff --git a/src/simulation/simtools/VAC.cpp b/src/simulation/simtools/VAC.cpp index c4b3933da..317088648 100644 --- a/src/simulation/simtools/VAC.cpp +++ b/src/simulation/simtools/VAC.cpp @@ -6,7 +6,7 @@ static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, void SimTool::Tool_VAC() { Identifier = "DEFAULT_TOOL_VAC"; - Name = "VAC"_ascii; + Name = "VAC"; Colour = PIXPACK(0x303030); Description = "Vacuum, reduces air pressure."_i18n; Perform = &perform; diff --git a/src/tasks/Task.cpp b/src/tasks/Task.cpp index b32ba5447..014b43726 100644 --- a/src/tasks/Task.cpp +++ b/src/tasks/Task.cpp @@ -104,7 +104,7 @@ void Task::before() bool Task::doWork() { - notifyStatus("Fake progress"_ascii); + notifyStatus("Fake progress"); for(int i = 0; i < 100; i++) { notifyProgress(i); diff --git a/src/tasks/TaskWindow.cpp b/src/tasks/TaskWindow.cpp index 9a7641ea8..fd91f6bd1 100644 --- a/src/tasks/TaskWindow.cpp +++ b/src/tasks/TaskWindow.cpp @@ -18,7 +18,7 @@ TaskWindow::TaskWindow(String title_, Task * task_, bool closeOnDone): progress(0), done(false), closeOnDone(closeOnDone), - progressStatus("0%"_ascii) + progressStatus("0%") { ui::Label * tempLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 15), title); @@ -27,7 +27,7 @@ TaskWindow::TaskWindow(String title_, Task * task_, bool closeOnDone): tempLabel->SetTextColour(style::Colour::WarningTitle); AddComponent(tempLabel); - statusLabel = new ui::Label(ui::Point(4, 23), ui::Point(Size.X-8, 15), ""_ascii); + statusLabel = new ui::Label(ui::Point(4, 23), ui::Point(Size.X-8, 15), ""); statusLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; statusLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(statusLabel);