mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-30 16:38:29 +02:00
Code Issues Releases Wiki Activity

Remove indentation level from checking for empty pText

Browse Source 
Instead of checking the length() of an std::string, just check if
pText[0] is equal to '\0'.

This will have to be done anyway, because I'm going to get rid of the
std::string allocation here, and I noticed this inefficiency in the
indentation, so I'm going to remove it.

The actual unindent will be done in the next commit.
This commit is contained in:
Misa 2021-02-12 13:45:32 -08:00 committed by Ethan Lee
parent 968bb5f960
commit 8d5829dd26
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desktop_version/src/Game.cpp
View File

@ -443,17 +443,14 @@ void Game::updatecustomlevelstats(std::string clevel, int cscore)
} }
#define LOAD_ARRAY_RENAME(ARRAY_NAME, DEST) \ #define LOAD_ARRAY_RENAME(ARRAY_NAME, DEST) \
if (pKey == #ARRAY_NAME) \ if (pKey == #ARRAY_NAME && pText[0] != '\0') \
{ \ { \
std::string TextString = pText; \ std::string TextString = pText; \
if (TextString.length()) \
{ \
std::vector<std::string> values = split(TextString, ','); \ std::vector<std::string> values = split(TextString, ','); \
for (int i = 0; i < VVV_min(SDL_arraysize(DEST), values.size()); i++) \ for (int i = 0; i < VVV_min(SDL_arraysize(DEST), values.size()); i++) \
{ \ { \
DEST[i] = help.Int(values[i].c_str()); \ DEST[i] = help.Int(values[i].c_str()); \
} \ } \
} \
} }
#define LOAD_ARRAY(ARRAY_NAME) LOAD_ARRAY_RENAME(ARRAY_NAME, ARRAY_NAME) #define LOAD_ARRAY(ARRAY_NAME) LOAD_ARRAY_RENAME(ARRAY_NAME, ARRAY_NAME)
@ -542,17 +539,14 @@ void Game::loadcustomlevelstats()
LOAD_ARRAY_RENAME(customlevelscore, customlevelscores) LOAD_ARRAY_RENAME(customlevelscore, customlevelscores)
if (pKey == "customlevelstats") if (pKey == "customlevelstats" && pText[0] != '\0')
{ {
std::string TextString = (pText); std::string TextString = (pText);
if(TextString.length())
{
std::vector<std::string> values = split(TextString,'|'); std::vector<std::string> values = split(TextString,'|');
for(size_t i = 0; i < values.size(); i++) for(size_t i = 0; i < values.size(); i++)
{ {
customlevelnames.push_back(values[i]); customlevelnames.push_back(values[i]);
} }
}
} }
} }

11
desktop_version/src/editor.cpp
View File

@ -1752,11 +1752,9 @@ bool editorclass::load(std::string& _path)
} }
if (pKey == "contents") if (pKey == "contents" && pText[0] != '\0')
{ {
std::string TextString = (pText); std::string TextString = (pText);
if(TextString.length())
{
std::vector<std::string> values = split(TextString,','); std::vector<std::string> values = split(TextString,',');
SDL_memset(contents, 0, sizeof(contents)); SDL_memset(contents, 0, sizeof(contents));
int x =0; int x =0;
@ -1772,7 +1770,6 @@ bool editorclass::load(std::string& _path)
} }
} }
}
} }
@ -1873,11 +1870,9 @@ bool editorclass::load(std::string& _path)
} }
} }
if (pKey == "script") if (pKey == "script" && pText[0] != '\0')
{ {
std::string TextString = (pText); std::string TextString = (pText);
if(TextString.length())
{
std::vector<std::string> values = split(TextString,'|'); std::vector<std::string> values = split(TextString,'|');
script.clearcustom(); script.clearcustom();
Script script_; Script script_;
@ -1910,8 +1905,6 @@ bool editorclass::load(std::string& _path)
//Add the script if we have a preceding header //Add the script if we have a preceding header
script.customscripts.push_back(script_); script.customscripts.push_back(script_);
} }
}
} }
} }