mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1460 from trigger-death/title-editor-fixes 

Title Sequence Editor fixes
This commit is contained in:
Ted John 2015-06-24 18:54:02 +01:00
parent 1d02ebb091 6918706680
commit b4c6de4b63
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/windows/title_editor.c
View File

@ -381,18 +381,18 @@ static void window_title_editor_mouseup()
case WIDX_TITLE_EDITOR_EDIT:
defaultPreset *= 2; playing *= 2; commandEditorOpen *= 2;
if (!defaultPreset && !playing && !commandEditorOpen) {
if (w->selected_list_item != -1)
if (w->selected_list_item != -1 && w->selected_list_item < gConfigTitleSequences.presets[gCurrentTitleSequence].num_commands)
window_title_command_editor_open(w->selected_list_item, false);
}
break;
case WIDX_TITLE_EDITOR_DELETE:
defaultPreset *= 2; playing *= 2; commandEditorOpen *= 2;
if (!defaultPreset && !playing && !commandEditorOpen) {
if (w->selected_list_item != -1) {
if (w->selected_list_item != -1 && w->selected_list_item < gConfigTitleSequences.presets[gCurrentTitleSequence].num_commands) {
title_sequence_delete_command(gCurrentTitleSequence, w->selected_list_item);
if (w->selected_list_item > 0)
w->selected_list_item--;
else if (w->selected_list_item > gConfigTitleSequences.presets[gCurrentTitleSequence].num_commands)
else if (w->selected_list_item >= gConfigTitleSequences.presets[gCurrentTitleSequence].num_commands)
w->selected_list_item = gConfigTitleSequences.presets[gCurrentTitleSequence].num_commands - 1;
}
}
@ -404,7 +404,7 @@ static void window_title_editor_mouseup()
}
break;*/
case WIDX_TITLE_EDITOR_SKIP_TO:
if (playing && w->selected_list_item != -1) {
if (playing && w->selected_list_item != -1 && w->selected_list_item < gConfigTitleSequences.presets[gCurrentTitleSequence].num_commands) {
if (gTitleScriptCommand > w->selected_list_item) {
title_skip_from_beginning();
}