diff options
-rw-r--r-- | apps/plugins/brickmania.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index bdeb3af6f0..08d76a0de9 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -578,9 +578,9 @@ int life; | |||
578 | enum { ST_READY, ST_START, ST_PAUSE } game_state = ST_READY; | 578 | enum { ST_READY, ST_START, ST_PAUSE } game_state = ST_READY; |
579 | 579 | ||
580 | enum { | 580 | enum { |
581 | normal = 0, | 581 | PLAIN = 0, |
582 | sticky = 1, | 582 | STICKY = 1, |
583 | shooter = 2 | 583 | SHOOTER = 2 |
584 | } pad_type; | 584 | } pad_type; |
585 | 585 | ||
586 | int score=0,vscore=0; | 586 | int score=0,vscore=0; |
@@ -653,7 +653,7 @@ static void brickmania_init_game(int new_game) | |||
653 | 653 | ||
654 | used_balls=1; | 654 | used_balls=1; |
655 | game_state=ST_READY; | 655 | game_state=ST_READY; |
656 | pad_type = normal; | 656 | pad_type = PLAIN; |
657 | pad_width=PAD_WIDTH; | 657 | pad_width=PAD_WIDTH; |
658 | flip_sides=false; | 658 | flip_sides=false; |
659 | num_count=10; | 659 | num_count=10; |
@@ -1082,17 +1082,17 @@ static int brickmania_game_loop(void) | |||
1082 | break; | 1082 | break; |
1083 | case 2: | 1083 | case 2: |
1084 | score+=34; | 1084 | score+=34; |
1085 | pad_type = sticky; | 1085 | pad_type = STICKY; |
1086 | break; | 1086 | break; |
1087 | case 3: | 1087 | case 3: |
1088 | score+=47; | 1088 | score+=47; |
1089 | pad_type = shooter; | 1089 | pad_type = SHOOTER; |
1090 | for(k=0;k<used_balls;k++) | 1090 | for(k=0;k<used_balls;k++) |
1091 | ball[k].glue=false; | 1091 | ball[k].glue=false; |
1092 | break; | 1092 | break; |
1093 | case 4: | 1093 | case 4: |
1094 | score+=23; | 1094 | score+=23; |
1095 | pad_type = normal; | 1095 | pad_type = PLAIN; |
1096 | for(k=0;k<used_balls;k++) | 1096 | for(k=0;k<used_balls;k++) |
1097 | ball[k].glue=false; | 1097 | ball[k].glue=false; |
1098 | flip_sides=false; | 1098 | flip_sides=false; |
@@ -1149,7 +1149,7 @@ static int brickmania_game_loop(void) | |||
1149 | 1149 | ||
1150 | brickx=LEFTMARGIN+j*BRICK_WIDTH; | 1150 | brickx=LEFTMARGIN+j*BRICK_WIDTH; |
1151 | bricky=TOPMARGIN+i*BRICK_HEIGHT; | 1151 | bricky=TOPMARGIN+i*BRICK_HEIGHT; |
1152 | if (pad_type == shooter) { | 1152 | if (pad_type == SHOOTER) { |
1153 | for (k=0;k<30;k++) { | 1153 | for (k=0;k<30;k++) { |
1154 | if (fire[k].top+7>0) { | 1154 | if (fire[k].top+7>0) { |
1155 | if (brick[i*10+j].used==1 && | 1155 | if (brick[i*10+j].used==1 && |
@@ -1514,7 +1514,7 @@ static int brickmania_game_loop(void) | |||
1514 | 1514 | ||
1515 | /* Handle the sticky situation */ | 1515 | /* Handle the sticky situation */ |
1516 | if (ball[k].pos_y + BALL >= PAD_POS_Y && | 1516 | if (ball[k].pos_y + BALL >= PAD_POS_Y && |
1517 | (pad_type == sticky && !ball[k].glue) && | 1517 | (pad_type == STICKY && !ball[k].glue) && |
1518 | (ball[k].pos_x >= pad_pos_x && | 1518 | (ball[k].pos_x >= pad_pos_x && |
1519 | ball[k].pos_x <= pad_pos_x+pad_width)) { | 1519 | ball[k].pos_x <= pad_pos_x+pad_width)) { |
1520 | ball[k].y=0; | 1520 | ball[k].y=0; |
@@ -1649,13 +1649,13 @@ static int brickmania_game_loop(void) | |||
1649 | else if (game_state==ST_PAUSE) { | 1649 | else if (game_state==ST_PAUSE) { |
1650 | game_state=ST_START; | 1650 | game_state=ST_START; |
1651 | } | 1651 | } |
1652 | else if (pad_type == sticky) { | 1652 | else if (pad_type == STICKY) { |
1653 | for(k=0;k<used_balls;k++) { | 1653 | for(k=0;k<used_balls;k++) { |
1654 | if (ball[k].glue) | 1654 | if (ball[k].glue) |
1655 | ball[k].glue=false; | 1655 | ball[k].glue=false; |
1656 | } | 1656 | } |
1657 | } | 1657 | } |
1658 | else if (pad_type == shooter) { | 1658 | else if (pad_type == SHOOTER) { |
1659 | k=brickmania_fire_space(); | 1659 | k=brickmania_fire_space(); |
1660 | fire[k].top=PAD_POS_Y-7; | 1660 | fire[k].top=PAD_POS_Y-7; |
1661 | fire[k].left=pad_pos_x+1; | 1661 | fire[k].left=pad_pos_x+1; |