mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Clean up resetting editor contents and scripts

Browse source 
Contents and scripts should be reset in editorclass::reset(); there's no
reason to reset them again right before you load them from an XML file
in editorclass::load().

Additionally, the resets now consistently use SDL_zeroa() (for contents)
and scriptclass::clearcustom() (for scripts).
This commit is contained in:
Misa 2021-02-12 16:35:22 -08:00 committed by Ethan Lee
parent fe77ada160
commit a113662050
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop_version/src/Script.cpp
View file

@ -35,7 +35,8 @@ scriptclass::scriptclass()
texty = 0; texty = 0;
} }
void scriptclass::clearcustom(){ void scriptclass::clearcustom()
{
customscripts.clear(); customscripts.clear();
} }

12
desktop_version/src/editor.cpp
View file

@ -364,13 +364,7 @@ void editorclass::reset()
} }
} }
for (int j = 0; j < 30 * maxheight; j++) SDL_zeroa(contents);
{
for (int i = 0; i < 40 * maxwidth; i++)
{
contents[i+(j*40*maxwidth)]=0;
}
}
hooklist.clear(); hooklist.clear();
@ -387,7 +381,7 @@ void editorclass::reset()
hookmenupage=0; hookmenupage=0;
hookmenu=0; hookmenu=0;
script.customscripts.clear(); script.clearcustom();
returneditoralpha = 0; returneditoralpha = 0;
oldreturneditoralpha = 0; oldreturneditoralpha = 0;
@ -1756,7 +1750,6 @@ bool editorclass::load(std::string& _path)
{ {
std::string TextString = (pText); std::string TextString = (pText);
std::vector<std::string> values = split(TextString,','); std::vector<std::string> values = split(TextString,',');
SDL_memset(contents, 0, sizeof(contents));
int x =0; int x =0;
int y =0; int y =0;
for(size_t i = 0; i < values.size(); i++) for(size_t i = 0; i < values.size(); i++)
@ -1874,7 +1867,6 @@ bool editorclass::load(std::string& _path)
{ {
std::string TextString = (pText); std::string TextString = (pText);
std::vector<std::string> values = split(TextString,'|'); std::vector<std::string> values = split(TextString,'|');
script.clearcustom();
Script script_; Script script_;
bool headerfound = false; bool headerfound = false;
for(size_t i = 0; i < values.size(); i++) for(size_t i = 0; i < values.size(); i++)