Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't manually write out INBOUNDS_VEC() checks

Browse Source 
This is because if they are manually written out, they are more likely
to contain mistakes.

In fact, after further review, there are several functions with
incorrect manually-written bounds checks:
 * entityclass::entitycollide()
 * entityclass::removeentity()
 * entityclass::removeblock()
 * entityclass::copylinecross()
 * entityclass::revertlinecross()

All of those functions forgot to do 'greater than or equal to' instead
of 'greater than' when comparing against the size of the vector. So they
were erroneous. But they are now fixed.
This commit is contained in:
Misa
2020-09-09 21:58:59 -07:00
committed by Ethan Lee
parent 32b6de729d
commit 7b20d90446
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop_version/src/Script.cpp
View File

@@ -82,7 +82,7 @@ void scriptclass::run()
short execution_counter = 0;
while(running && scriptdelay<=0 && !game.pausescript)
{
if (position < (int) commands.size())
if (INBOUNDS_VEC(position, commands))
{
//Let's split or command in an array of words
tokenize(commands[position]);
@@ -414,7 +414,7 @@ void scriptclass::run()
for (int i = 0; i < ss_toi(words[4]); i++)
{
position++;
if (position < (int) commands.size())
if (INBOUNDS_VEC(position, commands))
{
txt.push_back(commands[position]);
}
@@ -3997,7 +3997,7 @@ void scriptclass::loadcustom(const std::string& t)
int nti = ti>=0 && ti<=50 ? ti : 1;
for(int ti2=0; ti2<nti; ti2++){
i++;
if(i < lines.size()){
if(INBOUNDS_VEC(i, lines)){
add(lines[i]);
}
}
@@ -4022,7 +4022,7 @@ void scriptclass::loadcustom(const std::string& t)
int nti = ti>=0 && ti<=50 ? ti : 1;
for(int ti2=0; ti2<nti; ti2++){
i++;
if(i < lines.size()){
if(INBOUNDS_VEC(i, lines)){
add(lines[i]);
}
}