summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Cellerier <dionoea@videolan.org>2007-06-17 10:02:39 +0000
committerAntoine Cellerier <dionoea@videolan.org>2007-06-17 10:02:39 +0000
commit0b4b8f0a3749991ef2f65c6eab4eea94890799bb (patch)
tree79cd2135ddc0369db63629158d83a0a5798ce21b
parent70fc62c1a106a8402a5e2a8bed6232f012e38e3b (diff)
downloadrockbox-0b4b8f0a3749991ef2f65c6eab4eea94890799bb.tar.gz
rockbox-0b4b8f0a3749991ef2f65c6eab4eea94890799bb.zip
Fix 2 puzzle levels. Don't lose if no moves are left in puzzle mode, restart the current level. Score handling in puzzle mode is still kind of broken.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13649 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/jewels.c64
1 files changed, 49 insertions, 15 deletions
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index f91ea384c4..55093b4273 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -347,20 +347,20 @@ struct puzzle_level puzzle_levels[NUM_PUZZLE_LEVELS] = {
{4, 2, PUZZLE_TILE_LEFT} } },
{ 6, 2, { {3, 2, PUZZLE_TILE_DOWN},
{4, 4, PUZZLE_TILE_UP} } },
- { 7, 4, { {3, 2, PUZZLE_TILE_LEFT|PUZZLE_TILE_DOWN},
- {4, 3, PUZZLE_TILE_LEFT|PUZZLE_TILE_UP},
- {3, 4, PUZZLE_TILE_RIGHT|PUZZLE_TILE_DOWN},
- {4, 4, PUZZLE_TILE_RIGHT|PUZZLE_TILE_UP} } },
+ { 7, 4, { {3, 2, PUZZLE_TILE_RIGHT|PUZZLE_TILE_DOWN},
+ {4, 3, PUZZLE_TILE_LEFT|PUZZLE_TILE_DOWN},
+ {3, 4, PUZZLE_TILE_RIGHT|PUZZLE_TILE_UP},
+ {4, 4, PUZZLE_TILE_LEFT|PUZZLE_TILE_UP} } },
{ 6, 3, { {3, 2, PUZZLE_TILE_DOWN},
{4, 4, PUZZLE_TILE_UP|PUZZLE_TILE_DOWN},
{3, 6, PUZZLE_TILE_UP} } },
{ 7, 3, { {2, 2, PUZZLE_TILE_RIGHT},
{4, 1, PUZZLE_TILE_LEFT|PUZZLE_TILE_RIGHT},
{5, 4, PUZZLE_TILE_LEFT} } },
- { 7, 4, { {3, 0, PUZZLE_TILE_LEFT|PUZZLE_TILE_DOWN},
- {5, 0, PUZZLE_TILE_LEFT|PUZZLE_TILE_UP},
- {2, 7, PUZZLE_TILE_RIGHT|PUZZLE_TILE_DOWN},
- {4, 7, PUZZLE_TILE_RIGHT|PUZZLE_TILE_UP} } },
+ { 7, 4, { {3, 0, PUZZLE_TILE_RIGHT|PUZZLE_TILE_DOWN},
+ {5, 0, PUZZLE_TILE_LEFT|PUZZLE_TILE_DOWN},
+ {2, 7, PUZZLE_TILE_RIGHT|PUZZLE_TILE_UP},
+ {4, 7, PUZZLE_TILE_LEFT|PUZZLE_TILE_UP} } },
};
/*****************************************************************************
@@ -1152,8 +1152,8 @@ static unsigned int jewels_initlevel(struct game_context* bj) {
jewels_runboard(bj);
tile = puzzle_levels[bj->level-1].tiles;
for(i=0; i<puzzle_levels[bj->level-1].num_tiles; i++, tile++) {
- bj->playboard[tile->y][tile->x].type = MAX_NUM_JEWELS
- +tile->tile_type;
+ bj->playboard[tile->y+1][tile->x].type = MAX_NUM_JEWELS
+ +tile->tile_type;
}
}
break;
@@ -1199,6 +1199,12 @@ static unsigned int jewels_nextlevel(struct game_context* bj) {
case GAME_TYPE_PUZZLE:
bj->level++;
+ if(bj->level>NUM_PUZZLE_LEVELS) {
+ rb->splash(HZ*2, "You win!");
+ bj->level = 1;
+ } else {
+ rb->splash(HZ*2, "Level %d", bj->level);
+ }
break;
}
@@ -1560,12 +1566,26 @@ static int jewels_main(struct game_context* bj) {
* setup the board *
********************/
bj->score += jewels_initlevel(bj);
- if (!jewels_movesavail(bj)) return BJ_LOSE;
+ if (!jewels_movesavail(bj)) {
+ switch(bj->type) {
+ case GAME_TYPE_NORMAL:
+ return BJ_LOSE;
+
+ case GAME_TYPE_PUZZLE:
+ do {
+ rb->splash(2*HZ, "No more moves!");
+ bj->score += jewels_initlevel(bj);
+ } while(!jewels_movesavail(bj));
+ break;
+ }
+ }
/**********************
* play *
**********************/
while(true) {
+ int no_movesavail = false;
+
if(!inmenu) {
/* refresh the board */
jewels_drawboard(bj);
@@ -1623,7 +1643,7 @@ static int jewels_main(struct game_context* bj) {
if(selected) {
bj->score += jewels_swapjewels(bj, x, y, SWAP_LEFT);
selected = false;
- if (!jewels_movesavail(bj)) return BJ_LOSE;
+ if (!jewels_movesavail(bj)) no_movesavail = true;
} else {
x = (x+BJ_WIDTH-1)%BJ_WIDTH;
}
@@ -1636,7 +1656,7 @@ static int jewels_main(struct game_context* bj) {
if(selected) {
bj->score += jewels_swapjewels(bj, x, y, SWAP_RIGHT);
selected = false;
- if (!jewels_movesavail(bj)) return BJ_LOSE;
+ if (!jewels_movesavail(bj)) no_movesavail = true;
} else {
x = (x+1)%BJ_WIDTH;
}
@@ -1651,7 +1671,7 @@ static int jewels_main(struct game_context* bj) {
if(selected) {
bj->score += jewels_swapjewels(bj, x, y, SWAP_DOWN);
selected = false;
- if (!jewels_movesavail(bj)) return BJ_LOSE;
+ if (!jewels_movesavail(bj)) no_movesavail = true;
} else {
y = (y+1)%(BJ_HEIGHT-1);
}
@@ -1666,7 +1686,7 @@ static int jewels_main(struct game_context* bj) {
if(selected) {
bj->score += jewels_swapjewels(bj, x, y, SWAP_UP);
selected = false;
- if (!jewels_movesavail(bj)) return BJ_LOSE;
+ if (!jewels_movesavail(bj)) no_movesavail = true;
} else {
y = (y+(BJ_HEIGHT-1)-1)%(BJ_HEIGHT-1);
}
@@ -1733,6 +1753,20 @@ static int jewels_main(struct game_context* bj) {
break;
}
+ if (no_movesavail) {
+ switch(bj->type) {
+ case GAME_TYPE_NORMAL:
+ return BJ_LOSE;
+
+ case GAME_TYPE_PUZZLE:
+ do {
+ rb->splash(2*HZ, "No more moves!");
+ bj->score += jewels_initlevel(bj);
+ } while(!jewels_movesavail(bj));
+ break;
+ }
+ }
+
switch(bj->type) {
case GAME_TYPE_NORMAL:
if(bj->score >= LEVEL_PTS) bj->score = jewels_nextlevel(bj);