Merge 7212a46b91
into ff785aaa8a
This commit is contained in:
commit
2dd55d7c01
|
@ -1365,6 +1365,7 @@ static void menuactionpress(void)
|
||||||
else if (game.currentmenuoption == (int)game.menuoptions.size()-2)
|
else if (game.currentmenuoption == (int)game.menuoptions.size()-2)
|
||||||
{
|
{
|
||||||
// play the cutscene, from clipboard
|
// play the cutscene, from clipboard
|
||||||
|
music.playef(Sound_VIRIDIAN);
|
||||||
game.cutscenetest_menu_play_id = std::string(SDL_GetClipboardText());
|
game.cutscenetest_menu_play_id = std::string(SDL_GetClipboardText());
|
||||||
startmode(Start_CUTSCENETEST);
|
startmode(Start_CUTSCENETEST);
|
||||||
}
|
}
|
||||||
|
@ -1378,6 +1379,7 @@ static void menuactionpress(void)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// play the cutscene!
|
// play the cutscene!
|
||||||
|
music.playef(Sound_VIRIDIAN);
|
||||||
game.cutscenetest_menu_play_id = loc::testable_script_ids[(game.cutscenetest_menu_page*14)+game.currentmenuoption];
|
game.cutscenetest_menu_play_id = loc::testable_script_ids[(game.cutscenetest_menu_page*14)+game.currentmenuoption];
|
||||||
startmode(Start_CUTSCENETEST);
|
startmode(Start_CUTSCENETEST);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue