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

Remove use of <algorithm> from editor.cpp

Browse source 
No need to use it when good ol' loops work just fine.

Iterating backwards is correct here, in case there happen to be more
than one of the item in the vectors, and also to minimize the amount of
memory that needs to be relocated.
This commit is contained in:
Misa 2021-04-20 11:29:50 -07:00 committed by Ethan Lee
parent b2c6c08621
commit 779a48dbb4
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
desktop_version/src/editor.cpp
View file

@ -3,7 +3,6 @@
#define ED_DEFINITION #define ED_DEFINITION
#include "editor.h" #include "editor.h"
#include <algorithm>
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
#include <tinyxml2.h> #include <tinyxml2.h>
@ -469,8 +468,16 @@ void editorclass::removehookfromscript(std::string t)
void editorclass::removehook(std::string t) void editorclass::removehook(std::string t)
{ {
//Check the hooklist for the hook t. If it's there, remove it from here and the script //Check the hooklist for the hook t. If it's there, remove it from here and the script
size_t i;
removehookfromscript(t); removehookfromscript(t);
hooklist.erase(std::remove(hooklist.begin(), hooklist.end(), t), hooklist.end()); /* When this loop reaches the end, it wraps to SIZE_MAX; SIZE_MAX + 1 is 0 */
for (i = hooklist.size() - 1; i + 1 > 0; --i)
{
if (hooklist[i] == t)
{
hooklist.erase(hooklist.begin() + i);
}
}
} }
void editorclass::addhook(std::string t) void editorclass::addhook(std::string t)
@ -4263,8 +4270,15 @@ void editorinput(void)
ed.keydelay=6; ed.keydelay=6;
} }
// Remove all pipes, they are the line separator in the XML /* Remove all pipes, they are the line separator in the XML
key.keybuffer.erase(std::remove(key.keybuffer.begin(), key.keybuffer.end(), '|'), key.keybuffer.end()); * When this loop reaches the end, it wraps to SIZE_MAX; SIZE_MAX + 1 is 0 */
{size_t i; for (i = key.keybuffer.length() - 1; i + 1 > 0; --i)
{
if (key.keybuffer[i] == '|')
{
key.keybuffer.erase(key.keybuffer.begin() + i);
}
}}
ed.sb[ed.pagey+ed.sby]=key.keybuffer; ed.sb[ed.pagey+ed.sby]=key.keybuffer;
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end()); ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end());