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 formatting and add an INBOUNDS_VEC

Browse source 
If `setactivitytext` was the last line in a script,
the command would index the vector out of bounds.

I also modified the formatting to keep consistent
with the rest of the codebase.
This commit is contained in:
AllyTally 2021-04-22 22:33:03 -03:00 committed by Misa Elizabeth Kai
parent b15e25f106
commit 656941202a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/Entity.cpp
View file

@ -1056,7 +1056,9 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
if (custom) if (custom)
{ {
block.prompt = "Press %s to interact"; block.prompt = "Press %s to interact";
} else { }
else
{
block.prompt = "Press %s to activate terminal"; block.prompt = "Press %s to activate terminal";
} }
block.script = "custom_"+customscript; block.script = "custom_"+customscript;

5
desktop_version/src/Script.cpp
View file

@ -1909,9 +1909,12 @@ void scriptclass::run(void)
} }
else if (words[0] == "setactivitytext") else if (words[0] == "setactivitytext")
{ {
position++; ++position;
if (INBOUNDS_VEC(position, commands))
{
obj.customactivitytext = commands[position]; obj.customactivitytext = commands[position];
} }
}
else if (words[0] == "createrescuedcrew") else if (words[0] == "createrescuedcrew")
{ {
//special for final level cutscene //special for final level cutscene