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

Fix up trinket and coin ID bounds checks

Browse source 
Trinket IDs weren't being bounds-checked upon creation, and coin IDs
weren't being bounds-checked upon pickup. But now they both are.
This commit is contained in:
Misa 2020-09-09 22:40:15 -07:00 committed by Ethan Lee
parent 140861a79d
commit c325085ddb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop_version/src/Entity.cpp
View file

@ -1434,7 +1434,7 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
//Check if it's already been collected //Check if it's already been collected
entity.para = vx; entity.para = vx;
if (collect[(int) vx]) return; if (!INBOUNDS_ARR(vx, collect) || collect[(int) vx]) return;
break; break;
case 10: //Savepoint case 10: //Savepoint
entity.rule = 3; entity.rule = 3;
@ -2581,7 +2581,10 @@ bool entityclass::updateentities( int i )
if (entities[i].state == 1) if (entities[i].state == 1)
{ {
music.playef(4); music.playef(4);
collect[(int) entities[i].para] = true; if (INBOUNDS_ARR(entities[i].para, customcollect))
{
collect[(int) entities[i].para] = true;
}
return removeentity(i); return removeentity(i);
} }