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

Don't restart music in trinket cutscenes

Browse source 
When you pick up a trinket in the wild, the music will fade back in
afterwards. However, the special trinket cutscenes (where Victoria or
Vitellary will directly give you a trinket) are inconsistent with this,
and restart the music instead of fading it back in.

Looking at the scripts themselves, it immediately becomes obvious the
reason for this inconsistency - 2.2 and previous didn't implement the
musicfadein command, so it couldn't be used, and Terry or Simon simply
had to make do with simply restarting the music. However, 2.3 implements
musicfadein, so we can simply swap it out and remove the
trinketscriptmusic command.
This commit is contained in:
Misa 2021-04-12 10:31:16 -07:00 committed by Ethan Lee
parent 711b36c9c8
commit d965a11988
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop_version/src/Scripts.cpp
View file

@ -5469,8 +5469,7 @@ void scriptclass::load(const std::string& name)
//found a trinket!
"foundtrinket(18)",
"endtext",
//"musicfadein",
"trinketscriptmusic",
"musicfadein",
"delay(30)",
"createentity(136,80,22,18,0)",
@ -5577,8 +5576,7 @@ void scriptclass::load(const std::string& name)
//found a trinket!
"foundtrinket(18)",
"endtext",
//"musicfadein",
"trinketscriptmusic",
"musicfadein",
"delay(30)",
"createentity(136,80,22,18,0)",
@ -5766,8 +5764,7 @@ void scriptclass::load(const std::string& name)
//found a trinket!
"foundtrinket(18)",
"endtext",
//"musicfadein",
"trinketscriptmusic",
"musicfadein",
"delay(30)",