Skip to content

Commit 47d7a82

Browse files
committed
Update easel key press handler scripts to check virtual key code instead of character value
1 parent f571b90 commit 47d7a82

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/studio/browser.cht

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ CLICK_SCRIPT("Browser cancel clicked")
9292
EnqueueCid(cidBrowserCancel, GidParGob(GidParThis()), GidThis(), 0, 0, 0);
9393
ENDCHUNK
9494
CHILD_SCRIPT("Browser cancel key press", kchidScript2)
95-
If(_parm[2] == kvkeyEscape);
95+
If(_parm[3] == kvkeyEscape);
9696
EnqueueCid(cidBrowserCancel, GidParGob(GidParThis()), GidThis(), 0, 0, 0);
9797
Return(fTrue);
9898
End;

src/studio/easels.cht

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ CLICK_SCRIPT("Cancel clicked")
197197
EnqueueCid(cidEaselCancel, kidSpltGlass, 0, 0, 0, 0);
198198
ENDCHUNK
199199
CHILD_SCRIPT("Spletters easel, cancel, key press", kchidScript2)
200-
If(_parm[2] == kvkeyEscape);
200+
If(_parm[3] == kvkeyEscape);
201201
EnqueueCid(cidEaselCancel, kidSpltGlass, 0, 0, 0, 0);
202202
Return(fTrue);
203203
End;
@@ -366,7 +366,7 @@ CLICK_SCRIPT("Cancel clicked")
366366
EnqueueCid(cidEaselCancel, kidCostGlass, 0, 0, 0, 0);
367367
ENDCHUNK
368368
CHILD_SCRIPT("Costume easel, cancel, key press", kchidScript2)
369-
If(_parm[2] == kvkeyEscape);
369+
If(_parm[3] == kvkeyEscape);
370370
EnqueueCid(cidEaselCancel, kidCostGlass, 0, 0, 0, 0);
371371
Return(fTrue);
372372
End;
@@ -784,7 +784,7 @@ CLICK_SCRIPT("Scene sorter, cancel, clicked")
784784
ENDCHUNK
785785

786786
CHILD_SCRIPT("Scene sorter, cancel, key press", kchidScript2)
787-
If(_parm[2] == kvkeyEscape);
787+
If(_parm[3] == kvkeyEscape);
788788
EnqueueCid(cidSceneSortCancel, kidSSorterBackground, 0, 0, 0, 0);
789789
OldState = GetModifierState();
790790
OldState &= (fcustHand | fcustNuke);
@@ -1660,7 +1660,7 @@ CHILD_SCRIPT("Listener easel cancel clicked", CHID(kstDefault, kchidClick))
16601660
EnqueueCid(cidEaselCancel, GidParGob(GidParThis()), 0, 0, 0, 0);
16611661
ENDCHUNK
16621662
CHILD_SCRIPT("Listener easel cancel, key press", kchidScript2)
1663-
If(_parm[2] == kvkeyEscape);
1663+
If(_parm[3] == kvkeyEscape);
16641664
EnqueueCid(cidEaselCancel, GidParGob(GidParThis()), 0, 0, 0, 0);
16651665
Return(fTrue);
16661666
End;
@@ -1905,7 +1905,7 @@ CLICK_SCRIPT("Recorder easel cancel")
19051905
EnqueueCid(cidEaselCancel, kidRecordGlass, 0, 0, 0, 0);
19061906
ENDCHUNK
19071907
CHILD_SCRIPT("Recorder easel cancel, key press", kchidScript2)
1908-
If(_parm[2] == kvkeyEscape);
1908+
If(_parm[3] == kvkeyEscape);
19091909
EnqueueCid(cidEaselCancel, kidRecordGlass, 0, 0, 0, 0);
19101910
Return(fTrue);
19111911
End;

0 commit comments

Comments
 (0)