mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-08 18:09:45 +01:00
Code Issues Releases Wiki Activity

Fix compatibility with levels that rely on gamestate-based script boxes

Browse source 
Some levels rely specifically on the fact that certain script boxes are
loaded using gamestates, instead of directly loading the script and
bypassing the gamestate system. Then weird things could happen. This
restores compatibility with those levels.

mapclass::twoframedelayfix() doesn't need to be updated because the
point of that function is to bypass the gamestate system entirely
anyways.
This commit is contained in:
Misa 2020-08-17 12:08:32 -07:00 committed by Ethan Lee
parent fb6635abec
commit 77b47a3c7e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop_version/src/Entity.cpp
View file

@ -4828,7 +4828,8 @@ void entityclass::entitycollisioncheck()
int block_idx = -1;
if (checktrigger(&block_idx) > -1 && block_idx > -1)
{
if (blocks[block_idx].script != "")
// Load the block's script if its gamestate is out of range
if (blocks[block_idx].script != "" && (activetrigger < 300 || activetrigger > 336))
{
game.startscript = true;
game.newscript = blocks[block_idx].script;