diff options
Diffstat (limited to 'apps/plugins/frotz')
-rw-r--r-- | apps/plugins/frotz/frotz.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/plugins/frotz/frotz.c b/apps/plugins/frotz/frotz.c index f64431f14e..a12faf90aa 100644 --- a/apps/plugins/frotz/frotz.c +++ b/apps/plugins/frotz/frotz.c | |||
@@ -112,7 +112,7 @@ zchar menu(void) | |||
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
115 | const struct button_mapping* plugin_contexts[]={generic_actions}; | 115 | const struct button_mapping* plugin_contexts[]={pla_main_ctx}; |
116 | 116 | ||
117 | void wait_for_key() | 117 | void wait_for_key() |
118 | { | 118 | { |
@@ -126,11 +126,11 @@ void wait_for_key() | |||
126 | plugin_contexts, 1); | 126 | plugin_contexts, 1); |
127 | switch (action) | 127 | switch (action) |
128 | { | 128 | { |
129 | case PLA_QUIT: | 129 | case PLA_EXIT: |
130 | hot_key_quit(); | 130 | hot_key_quit(); |
131 | break; | 131 | break; |
132 | 132 | ||
133 | case PLA_FIRE: | 133 | case PLA_SELECT: |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | } | 136 | } |
@@ -154,24 +154,24 @@ zchar do_input(int timeout, bool show_cursor) | |||
154 | 154 | ||
155 | for (;;) | 155 | for (;;) |
156 | { | 156 | { |
157 | action = pluginlib_getaction(timeout, | 157 | action = pluginlib_getaction(timeout, plugin_contexts, |
158 | plugin_contexts, 1); | 158 | ARRAYLEN(plugin_contexts)); |
159 | switch (action) | 159 | switch (action) |
160 | { | 160 | { |
161 | case PLA_QUIT: | 161 | case PLA_EXIT: |
162 | return ZC_HKEY_QUIT; | 162 | return ZC_HKEY_QUIT; |
163 | 163 | ||
164 | case PLA_MENU: | 164 | case PLA_CANCEL: |
165 | menu_ret = menu(); | 165 | menu_ret = menu(); |
166 | if (menu_ret != ZC_BAD) | 166 | if (menu_ret != ZC_BAD) |
167 | return menu_ret; | 167 | return menu_ret; |
168 | timeout_at = *rb->current_tick + timeout; | 168 | timeout_at = *rb->current_tick + timeout; |
169 | break; | 169 | break; |
170 | 170 | ||
171 | case PLA_FIRE: | 171 | case PLA_SELECT: |
172 | return ZC_RETURN; | 172 | return ZC_RETURN; |
173 | 173 | ||
174 | case PLA_START: | 174 | case PLA_SELECT_REPEAT: |
175 | return ZC_BAD; | 175 | return ZC_BAD; |
176 | 176 | ||
177 | default: | 177 | default: |