Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't use std::strings when comparing key names

Browse Source 
There's no need to create an std::string for every single element just
to see if it's a key name.

At least in libstdc++, there's an optimization where std::strings that
are 16 characters or less don't allocate on the heap, and instead use
the internal 16-char buffer directly in the control structure of the
std::string. However, it's not guaranteed that all the element names
we'll get will always be 16 chars or less, and in case the std::string
does end up allocating on the heap, we have no reason for it to allocate
on the heap; so we should just convert these string comparisons to C
strings instead.
This commit is contained in:
Misa
2021-03-06 10:31:17 -08:00
committed by Ethan Lee
parent 1163a8cca4
commit 22ced8b59b
2 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
desktop_version/src/editor.cpp
View File

@@ -1680,77 +1680,77 @@ bool editorclass::load(std::string& _path)
for( pElem = hRoot.FirstChildElement( "Data" ).FirstChild().ToElement(); pElem; pElem=pElem->NextSiblingElement())
{
std::string pKey(pElem->Value());
const char* pKey = pElem->Value();
const char* pText = pElem->GetText() ;
if(pText == NULL)
{
pText = "";
}
if (pKey == "MetaData")
if (SDL_strcmp(pKey, "MetaData") == 0)
{
for( tinyxml2::XMLElement* subElem = pElem->FirstChildElement(); subElem; subElem= subElem->NextSiblingElement())
{
std::string pKey_(subElem->Value());
const char* pKey_ = subElem->Value();
const char* pText_ = subElem->GetText() ;
if(pText_ == NULL)
{
pText_ = "";
}
if(pKey_ == "Creator")
if(SDL_strcmp(pKey_, "Creator") == 0)
{
EditorData::GetInstance().creator = pText_;
}
if(pKey_ == "Title")
if(SDL_strcmp(pKey_, "Title") == 0)
{
EditorData::GetInstance().title = pText_;
}
if(pKey_ == "Desc1")
if(SDL_strcmp(pKey_, "Desc1") == 0)
{
Desc1 = pText_;
}
if(pKey_ == "Desc2")
if(SDL_strcmp(pKey_, "Desc2") == 0)
{
Desc2 = pText_;
}
if(pKey_ == "Desc3")
if(SDL_strcmp(pKey_, "Desc3") == 0)
{
Desc3 = pText_;
}
if(pKey_ == "website")
if(SDL_strcmp(pKey_, "website") == 0)
{
website = pText_;
}
if(pKey_ == "onewaycol_override")
if(SDL_strcmp(pKey_, "onewaycol_override") == 0)
{
onewaycol_override = help.Int(pText_);
}
}
}
if (pKey == "mapwidth")
if (SDL_strcmp(pKey, "mapwidth") == 0)
{
mapwidth = help.Int(pText);
}
if (pKey == "mapheight")
if (SDL_strcmp(pKey, "mapheight") == 0)
{
mapheight = help.Int(pText);
}
if (pKey == "levmusic")
if (SDL_strcmp(pKey, "levmusic") == 0)
{
levmusic = help.Int(pText);
}
if (pKey == "contents" && pText[0] != '\0')
if (SDL_strcmp(pKey, "contents") == 0 && pText[0] != '\0')
{
int x = 0;
int y = 0;
@@ -1778,7 +1778,7 @@ bool editorclass::load(std::string& _path)
}
if (pKey == "edEntities")
if (SDL_strcmp(pKey, "edEntities") == 0)
{
for( tinyxml2::XMLElement* edEntityEl = pElem->FirstChildElement(); edEntityEl; edEntityEl=edEntityEl->NextSiblingElement())
{
@@ -1843,7 +1843,7 @@ bool editorclass::load(std::string& _path)
}
}
if (pKey == "levelMetaData")
if (SDL_strcmp(pKey, "levelMetaData") == 0)
{
int i = 0;
for( tinyxml2::XMLElement* edLevelClassElement = pElem->FirstChildElement(); edLevelClassElement; edLevelClassElement=edLevelClassElement->NextSiblingElement())
@@ -1874,7 +1874,7 @@ bool editorclass::load(std::string& _path)
}
}
if (pKey == "script" && pText[0] != '\0')
if (SDL_strcmp(pKey, "script") == 0 && pText[0] != '\0')
{
Script script_;
bool headerfound = false;