From d2e9828a2881e2cd6cb4c14f405af8da93a31db2 Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Wed, 30 Dec 2009 19:00:33 +0000 Subject: [PATCH] Add bitmaps for correct and wrong flags when showing the full board. (Feel free to change the graphics) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24127 a1c6a512-1295-4272-9138-f99709370657 --- .../native/minesweeper_tiles.10x10x24.bmp | Bin 4214 -> 4854 bytes .../native/minesweeper_tiles.12x12x2.bmp | Bin 2950 -> 3238 bytes .../native/minesweeper_tiles.12x12x24.bmp | Bin 5672 -> 6534 bytes .../native/minesweeper_tiles.16x16x24.bmp | Bin 10040 -> 11574 bytes .../native/minesweeper_tiles.8x8x1.bmp | Bin 2550 -> 2934 bytes apps/plugins/minesweeper.c | 13 ++++++++----- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/plugins/bitmaps/native/minesweeper_tiles.10x10x24.bmp b/apps/plugins/bitmaps/native/minesweeper_tiles.10x10x24.bmp index 6fef797fbf698f706f59cae3368596a21b5e856f..5a60c650e45c2eb674ba09491261c89aa68bd19c 100644 GIT binary patch delta 398 zcmeyS@J&_4$@iNO0~nYANev+80^(^v%*Y@CBpDbE2u)N`p3Kf7UC*$V0fL@hzXX)n zwR9c>!}S9@Zy!7G>UwczEgTu9b@!815WD@bKJ86iJAxwG2nLZUD=J_+ZUJ z4%R>fH3VuLSpNyIycfg&|NoH{9Nw~?f#Jr1op+Aye{%UOiXCei9$YxJbJ+q0hMR|W z-q^n#Xy{Xj8^L~<{F=p&8R)gif0$+2fHa6H&m!vsVM1L1rcnJct)U7{2~Y&tA5g7e f13OsYX0K+EX90_yLx_E3kp(+JkX2)&rL6z}WW{xS delta 49 ucmeyS`b|N_$+t{^0SwH5qy`Xk0dW%$Gcrg3Nd^W7fr%>0n~yW;3jhGey9ZGK diff --git a/apps/plugins/bitmaps/native/minesweeper_tiles.12x12x2.bmp b/apps/plugins/bitmaps/native/minesweeper_tiles.12x12x2.bmp index 191e79e5f7d45cb40ad70fd02a5415ebd42f8599..efba93df673191fef3f893342c18ddf692b396ee 100644 GIT binary patch delta 146 zcmZn@UnXhdy5CO>D@l>X1a z@c;k+kpCbW2!V`{kPxt@|C6=ZVkiG#RR*d-k^m|Mssd?P0TiEX#^yMA9}CCi11xNt IU0EF20sC$!i~s-t delta 66 zcmZ1`*(Pq{D#AG*C<1~h~3=nkf z;La<%w;WxwboJD}tNV9c*|X)u#+8)?IY3!MeLa3YK2u{OAiFp-ZO4+i^SYYBYBpcm zvl*lv32<_707bSfo-@0x;o6~HHxBOxawp$s6|D!-OQuY?d30Z(mj{r|#KgqH!U9qb z1AM%^KyiB;tLuk$pV+n@$OeMag1iUUFTs^5DJlTPXLPq;JFw&0-Yr-5?*wuU^mGey zGJ&Q+O#<4#1ZaQ#je|R{0{yXRWm#?(10UEppsf%WPHtqA-~?F#Mw1t@g|hD7&cJYB zvJa~w8;}MuixJFO2=F01}(0F@F$cVqgFO D1mXuo diff --git a/apps/plugins/bitmaps/native/minesweeper_tiles.16x16x24.bmp b/apps/plugins/bitmaps/native/minesweeper_tiles.16x16x24.bmp index 9e7c4ee8cf7b9d20661d78de73f1b89072fbec22..23661595dfb67b58d36dff2edc2dc9bd1d7c27d3 100644 GIT binary patch delta 584 zcmdntw=GJ=$=6Jm0SwH5qy`WR0PzPPW@L~6l0cw4Q6*+_1E&T*!&(MpG zg3Z8icKe3S^QO;it-o<_*X3QCE^c3UW&d`l0*JA25^U=EJzKYc)YsiOwCl>AtylJL z11p|9kxN_>tYGJ|g>$-^ZXVu!b>H^uhj*jN?p?QHesBBD!+WkD+yyciqy?n69^zyM zhJ_QmQ1yaTJ-B`eh(Ihj0IT1#cKQ6Cwws4`U)i(e%HFMTXX8@8W7+&U9gQ~+?z*yT z)1~d}t|ELY3^y3e0GmG9mRmvsY9_>aaFT&xaxRlJMnF&JUN_m5GfIeo;Q$a_JGkri znPc~_oCg{?aibh3L=;F)zQL)5#N+1DVF#%P$=D&W3z67Mkl5Fe*j(HQy|&!QrWSB( Pu|W-8z`b;%>qj*JUE969 delta 52 xcmdlMwZl)v$=5=i0SwH5qy`WR0PzJNW@L~6k_-$?>JwFBHaD9$+wJ~0SwH5qy`Xk0C5EnGcrg3Nd^W7pu8{`Pc&4Wn9nwOI+OHdBNicM zpxos39MY4Em_;Y&b81ao$2rkK9i%{te> diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 2f31225338..1805c2251a 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -302,6 +302,8 @@ extern const fb_data minesweeper_tiles[]; #define Flag 10 #define Unknown 11 #define ExplodedMine 12 +#define WrongFlag 13 +#define CorrectFlag 14 #define draw_tile( num, x, y ) \ rb->lcd_bitmap_part( minesweeper_tiles, 0, num * TileSize, \ @@ -562,17 +564,18 @@ void mine_show( void ) if( minefield[i][j].mine ) { if( minefield[i][j].known ) - { draw_tile( ExplodedMine, j, i ); - } + else if( minefield[i][j].flag ) + draw_tile( CorrectFlag, j, i ); else - { draw_tile( Mine, j, i ); - } } else { - draw_tile( minefield[i][j].neighbors, j, i ); + if( minefield[i][j].flag ) + draw_tile( WrongFlag, j, i ); + else + draw_tile( minefield[i][j].neighbors, j, i ); } } }