diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 09:47:40 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-11 16:37:17 -0400 |
commit | 2a471e288c16b91a7186a60b3fb84dd55a494c7a (patch) | |
tree | 3e746212c5fa69b59f61d19b6e29d11aa8a5e31b /apps/plugins/sokoban.c | |
parent | 5efaa9ef8073bb216e3dcdbb4476f2fa7c672b76 (diff) | |
download | rockbox-2a471e288c16b91a7186a60b3fb84dd55a494c7a.tar.gz rockbox-2a471e288c16b91a7186a60b3fb84dd55a494c7a.zip |
New port: AIGO EROS Q / EROS K
The Q and K have a slightly different case, but the hardware under the
shell is completely identical.
These models are rebadged versions:
* Hifiwalker H2 (== Q)
* AGPTek H3 (== K)
* Surfans F20 (== K)
Other notes:
* Significant improvements in the shared Hiby-platform launcher/loader
* SD card can theoretically be hot-swapped now
* Support external USB mass storage!
* Some consolidation of Hiby-platform targets
* Some consolidation of plugin keymaps
Todo/known issues:
* Keymaps need to be gone over properly
* Convert to HAVE_SCROLLWHEEL?
Change-Id: I5a8a4f22c38a5b69392ca7c0a8ad8c4e07d9523c
Diffstat (limited to 'apps/plugins/sokoban.c')
-rw-r--r-- | apps/plugins/sokoban.c | 62 |
1 files changed, 23 insertions, 39 deletions
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index da3c303ace..e779722790 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -631,23 +631,7 @@ | |||
631 | #define BUTTON_SAVE BUTTON_PLAY | 631 | #define BUTTON_SAVE BUTTON_PLAY |
632 | #define BUTTON_SAVE_NAME "PLAY" | 632 | #define BUTTON_SAVE_NAME "PLAY" |
633 | 633 | ||
634 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD | 634 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD |
635 | #define SOKOBAN_LEFT BUTTON_PREV | ||
636 | #define SOKOBAN_RIGHT BUTTON_NEXT | ||
637 | #define SOKOBAN_UP BUTTON_HOME | ||
638 | #define SOKOBAN_DOWN BUTTON_OPTION | ||
639 | #define SOKOBAN_MENU BUTTON_POWER | ||
640 | #define SOKOBAN_UNDO_PRE BUTTON_PLAY | ||
641 | #define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL) | ||
642 | #define SOKOBAN_REDO (BUTTON_POWER | BUTTON_PLAY) | ||
643 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN | ||
644 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_NEXT) | ||
645 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP | ||
646 | #define SOKOBAN_PAUSE BUTTON_PLAY | ||
647 | #define BUTTON_SAVE BUTTON_PLAY | ||
648 | #define BUTTON_SAVE_NAME "PLAY" | ||
649 | |||
650 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD | ||
651 | #define SOKOBAN_LEFT BUTTON_PREV | 635 | #define SOKOBAN_LEFT BUTTON_PREV |
652 | #define SOKOBAN_RIGHT BUTTON_NEXT | 636 | #define SOKOBAN_RIGHT BUTTON_NEXT |
653 | #define SOKOBAN_UP BUTTON_HOME | 637 | #define SOKOBAN_UP BUTTON_HOME |
@@ -679,7 +663,7 @@ | |||
679 | #define BUTTON_SAVE BUTTON_PLAY | 663 | #define BUTTON_SAVE BUTTON_PLAY |
680 | #define BUTTON_SAVE_NAME "PLAY" | 664 | #define BUTTON_SAVE_NAME "PLAY" |
681 | 665 | ||
682 | #elif CONFIG_KEYPAD == IHIFI_770_PAD | 666 | #elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD |
683 | #define SOKOBAN_LEFT BUTTON_HOME | 667 | #define SOKOBAN_LEFT BUTTON_HOME |
684 | #define SOKOBAN_RIGHT BUTTON_VOL_DOWN | 668 | #define SOKOBAN_RIGHT BUTTON_VOL_DOWN |
685 | #define SOKOBAN_UP BUTTON_PREV | 669 | #define SOKOBAN_UP BUTTON_PREV |
@@ -695,18 +679,18 @@ | |||
695 | #define BUTTON_SAVE BUTTON_PLAY | 679 | #define BUTTON_SAVE BUTTON_PLAY |
696 | #define BUTTON_SAVE_NAME "PLAY" | 680 | #define BUTTON_SAVE_NAME "PLAY" |
697 | 681 | ||
698 | #elif CONFIG_KEYPAD == IHIFI_800_PAD | 682 | #elif CONFIG_KEYPAD == EROSQ_PAD |
699 | #define SOKOBAN_LEFT BUTTON_HOME | 683 | #define SOKOBAN_LEFT BUTTON_SCROLL_BACK |
700 | #define SOKOBAN_RIGHT BUTTON_VOL_DOWN | 684 | #define SOKOBAN_RIGHT BUTTON_SCROLL_FWD |
701 | #define SOKOBAN_UP BUTTON_PREV | 685 | #define SOKOBAN_UP BUTTON_PREV |
702 | #define SOKOBAN_DOWN BUTTON_NEXT | 686 | #define SOKOBAN_DOWN BUTTON_NEXT |
703 | #define SOKOBAN_MENU BUTTON_POWER | 687 | #define SOKOBAN_MENU BUTTON_MENU |
704 | #define SOKOBAN_UNDO_PRE BUTTON_PLAY | 688 | #define SOKOBAN_UNDO_PRE BUTTON_PLAY |
705 | #define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL) | 689 | #define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL) |
706 | #define SOKOBAN_REDO (BUTTON_POWER | BUTTON_PLAY) | 690 | #define SOKOBAN_REDO (BUTTON_POWER | BUTTON_PLAY) |
707 | #define SOKOBAN_LEVEL_DOWN (BUTTON_POWER | BUTTON_VOL_DOWN) | 691 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN |
708 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_POWER | BUTTON_HOME) | 692 | #define SOKOBAN_LEVEL_REPEAT BUTTON_BACK |
709 | #define SOKOBAN_LEVEL_UP (BUTTON_POWER | BUTTON_VOL_UP) | 693 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP |
710 | #define SOKOBAN_PAUSE BUTTON_PLAY | 694 | #define SOKOBAN_PAUSE BUTTON_PLAY |
711 | #define BUTTON_SAVE BUTTON_PLAY | 695 | #define BUTTON_SAVE BUTTON_PLAY |
712 | #define BUTTON_SAVE_NAME "PLAY" | 696 | #define BUTTON_SAVE_NAME "PLAY" |
@@ -1286,56 +1270,56 @@ static void update_screen(void) | |||
1286 | 1270 | ||
1287 | case ' ': /* floor */ | 1271 | case ' ': /* floor */ |
1288 | rb->lcd_bitmap_part(sokoban_tiles, 0, 0*SOKOBAN_TILESIZE, | 1272 | rb->lcd_bitmap_part(sokoban_tiles, 0, 0*SOKOBAN_TILESIZE, |
1289 | STRIDE( SCREEN_MAIN, | 1273 | STRIDE( SCREEN_MAIN, |
1290 | BMPWIDTH_sokoban_tiles, | 1274 | BMPWIDTH_sokoban_tiles, |
1291 | BMPHEIGHT_sokoban_tiles), | 1275 | BMPHEIGHT_sokoban_tiles), |
1292 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); | 1276 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); |
1293 | break; | 1277 | break; |
1294 | 1278 | ||
1295 | case '#': /* wall */ | 1279 | case '#': /* wall */ |
1296 | rb->lcd_bitmap_part(sokoban_tiles, 0, 1*SOKOBAN_TILESIZE, | 1280 | rb->lcd_bitmap_part(sokoban_tiles, 0, 1*SOKOBAN_TILESIZE, |
1297 | STRIDE( SCREEN_MAIN, | 1281 | STRIDE( SCREEN_MAIN, |
1298 | BMPWIDTH_sokoban_tiles, | 1282 | BMPWIDTH_sokoban_tiles, |
1299 | BMPHEIGHT_sokoban_tiles), | 1283 | BMPHEIGHT_sokoban_tiles), |
1300 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); | 1284 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); |
1301 | break; | 1285 | break; |
1302 | 1286 | ||
1303 | case '$': /* box */ | 1287 | case '$': /* box */ |
1304 | rb->lcd_bitmap_part(sokoban_tiles, 0, 2*SOKOBAN_TILESIZE, | 1288 | rb->lcd_bitmap_part(sokoban_tiles, 0, 2*SOKOBAN_TILESIZE, |
1305 | STRIDE( SCREEN_MAIN, | 1289 | STRIDE( SCREEN_MAIN, |
1306 | BMPWIDTH_sokoban_tiles, | 1290 | BMPWIDTH_sokoban_tiles, |
1307 | BMPHEIGHT_sokoban_tiles), | 1291 | BMPHEIGHT_sokoban_tiles), |
1308 | c, r, SOKOBAN_TILESIZE,SOKOBAN_TILESIZE); | 1292 | c, r, SOKOBAN_TILESIZE,SOKOBAN_TILESIZE); |
1309 | break; | 1293 | break; |
1310 | 1294 | ||
1311 | case '*': /* box on goal */ | 1295 | case '*': /* box on goal */ |
1312 | rb->lcd_bitmap_part(sokoban_tiles, 0, 3*SOKOBAN_TILESIZE, | 1296 | rb->lcd_bitmap_part(sokoban_tiles, 0, 3*SOKOBAN_TILESIZE, |
1313 | STRIDE( SCREEN_MAIN, | 1297 | STRIDE( SCREEN_MAIN, |
1314 | BMPWIDTH_sokoban_tiles, | 1298 | BMPWIDTH_sokoban_tiles, |
1315 | BMPHEIGHT_sokoban_tiles), | 1299 | BMPHEIGHT_sokoban_tiles), |
1316 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); | 1300 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); |
1317 | break; | 1301 | break; |
1318 | 1302 | ||
1319 | case '.': /* goal */ | 1303 | case '.': /* goal */ |
1320 | rb->lcd_bitmap_part(sokoban_tiles, 0, 4*SOKOBAN_TILESIZE, | 1304 | rb->lcd_bitmap_part(sokoban_tiles, 0, 4*SOKOBAN_TILESIZE, |
1321 | STRIDE( SCREEN_MAIN, | 1305 | STRIDE( SCREEN_MAIN, |
1322 | BMPWIDTH_sokoban_tiles, | 1306 | BMPWIDTH_sokoban_tiles, |
1323 | BMPHEIGHT_sokoban_tiles), | 1307 | BMPHEIGHT_sokoban_tiles), |
1324 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); | 1308 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); |
1325 | break; | 1309 | break; |
1326 | 1310 | ||
1327 | case '@': /* player */ | 1311 | case '@': /* player */ |
1328 | rb->lcd_bitmap_part(sokoban_tiles, 0, 5*SOKOBAN_TILESIZE, | 1312 | rb->lcd_bitmap_part(sokoban_tiles, 0, 5*SOKOBAN_TILESIZE, |
1329 | STRIDE( SCREEN_MAIN, | 1313 | STRIDE( SCREEN_MAIN, |
1330 | BMPWIDTH_sokoban_tiles, | 1314 | BMPWIDTH_sokoban_tiles, |
1331 | BMPHEIGHT_sokoban_tiles), | 1315 | BMPHEIGHT_sokoban_tiles), |
1332 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); | 1316 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); |
1333 | break; | 1317 | break; |
1334 | 1318 | ||
1335 | case '+': /* player on goal */ | 1319 | case '+': /* player on goal */ |
1336 | rb->lcd_bitmap_part(sokoban_tiles, 0, 6*SOKOBAN_TILESIZE, | 1320 | rb->lcd_bitmap_part(sokoban_tiles, 0, 6*SOKOBAN_TILESIZE, |
1337 | STRIDE( SCREEN_MAIN, | 1321 | STRIDE( SCREEN_MAIN, |
1338 | BMPWIDTH_sokoban_tiles, | 1322 | BMPWIDTH_sokoban_tiles, |
1339 | BMPHEIGHT_sokoban_tiles), | 1323 | BMPHEIGHT_sokoban_tiles), |
1340 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); | 1324 | c, r, SOKOBAN_TILESIZE, SOKOBAN_TILESIZE); |
1341 | break; | 1325 | break; |