summaryrefslogtreecommitdiff
path: root/apps/plugins/pegbox.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/pegbox.c')
-rw-r--r--apps/plugins/pegbox.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 4ba8156e8b..04f5ba9273 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -282,7 +282,7 @@ PLUGIN_HEADER
282#error Unsupported keymap! 282#error Unsupported keymap!
283#endif 283#endif
284 284
285#ifdef HAVE_TOUCHPAD 285#ifdef HAVE_TOUCHSCREEN
286#ifndef PEGBOX_QUIT 286#ifndef PEGBOX_QUIT
287#define PEGBOX_QUIT BUTTON_TOPLEFT 287#define PEGBOX_QUIT BUTTON_TOPLEFT
288#endif 288#endif
@@ -370,7 +370,7 @@ PLUGIN_HEADER
370#define BOARD_Y 0 370#define BOARD_Y 0
371#endif 371#endif
372 372
373#ifdef HAVE_TOUCHPAD 373#ifdef HAVE_TOUCHSCREEN
374#include "lib/touchscreen.h" 374#include "lib/touchscreen.h"
375 375
376static struct ts_mapping main_menu_items[5] = 376static struct ts_mapping main_menu_items[5] =
@@ -385,7 +385,7 @@ static struct ts_mapping main_menu_items[5] =
385#elif LCD_WIDTH > 112 385#elif LCD_WIDTH > 112
3860, LCD_HEIGHT - 8, SYSFONT_WIDTH*28, SYSFONT_HEIGHT 3860, LCD_HEIGHT - 8, SYSFONT_WIDTH*28, SYSFONT_HEIGHT
387#else 387#else
388#error "Touchpad isn't supported on non-bitmap screens!" 388#error "Touchscreen isn't supported on non-bitmap screens!"
389#endif 389#endif
390} 390}
391 391
@@ -640,8 +640,8 @@ static void display_text(char *str, bool waitkey)
640 key = rb->button_get(true); 640 key = rb->button_get(true);
641 switch (key) 641 switch (key)
642 { 642 {
643#ifdef HAVE_TOUCHPAD 643#ifdef HAVE_TOUCHSCREEN
644 case BUTTON_TOUCHPAD: 644 case BUTTON_TOUCHSCREEN:
645#endif 645#endif
646 case PEGBOX_QUIT: 646 case PEGBOX_QUIT:
647 case PEGBOX_LEFT: 647 case PEGBOX_LEFT:
@@ -769,8 +769,8 @@ static void new_piece(struct game_context* pb, unsigned int x_loc,
769 while (!exit) { 769 while (!exit) {
770 draw_board(pb); 770 draw_board(pb);
771 button = rb->button_get(true); 771 button = rb->button_get(true);
772#ifdef HAVE_TOUCHPAD 772#ifdef HAVE_TOUCHSCREEN
773 if(button & BUTTON_TOUCHPAD) 773 if(button & BUTTON_TOUCHSCREEN)
774 { 774 {
775 pegbox_raster_btn.two_d_from.y = x_loc; 775 pegbox_raster_btn.two_d_from.y = x_loc;
776 pegbox_raster_btn.two_d_from.x = y_loc; 776 pegbox_raster_btn.two_d_from.x = y_loc;
@@ -1107,8 +1107,8 @@ static unsigned int pegbox_menu(struct game_context* pb) {
1107 /* handle menu button presses */ 1107 /* handle menu button presses */
1108 button = rb->button_get(true); 1108 button = rb->button_get(true);
1109 1109
1110#ifdef HAVE_TOUCHPAD 1110#ifdef HAVE_TOUCHSCREEN
1111 if(button & BUTTON_TOUCHPAD) 1111 if(button & BUTTON_TOUCHSCREEN)
1112 { 1112 {
1113 unsigned int result = touchscreen_map(&main_menu, rb->button_get_data() >> 16, rb->button_get_data() & 0xffff); 1113 unsigned int result = touchscreen_map(&main_menu, rb->button_get_data() >> 16, rb->button_get_data() & 0xffff);
1114 if(result != (unsigned)-1 && button & BUTTON_REL) 1114 if(result != (unsigned)-1 && button & BUTTON_REL)
@@ -1240,8 +1240,8 @@ static int pegbox(struct game_context* pb) {
1240 1240
1241 while (true) { 1241 while (true) {
1242 temp_var = rb->button_get(true); 1242 temp_var = rb->button_get(true);
1243#ifdef HAVE_TOUCHPAD 1243#ifdef HAVE_TOUCHSCREEN
1244 if(temp_var & BUTTON_TOUCHPAD) 1244 if(temp_var & BUTTON_TOUCHSCREEN)
1245 { 1245 {
1246 pegbox_raster_btn.two_d_from.y = pb->player_row; 1246 pegbox_raster_btn.two_d_from.y = pb->player_row;
1247 pegbox_raster_btn.two_d_from.x = pb->player_col; 1247 pegbox_raster_btn.two_d_from.x = pb->player_col;