diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-21 16:13:43 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-21 16:13:43 +0000 |
commit | 3dc9d111b39f24ace7f8afcb3958dcb218dff8de (patch) | |
tree | b5680d831b042bba14d2ccc16f31b07ad0d69f39 | |
parent | a3068ca8639d2fe3dd69fcfa3ee7276fc86a8735 (diff) | |
download | rockbox-3dc9d111b39f24ace7f8afcb3958dcb218dff8de.tar.gz rockbox-3dc9d111b39f24ace7f8afcb3958dcb218dff8de.zip |
Brickmania: Use predefined macro definition when possible
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24809 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/brickmania.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 961a7c73fa..e8adb76738 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -1796,7 +1796,7 @@ static int brickmania_game_loop(void) | |||
1796 | screen_edge.p1.x = 0; | 1796 | screen_edge.p1.x = 0; |
1797 | screen_edge.p1.y = 0; | 1797 | screen_edge.p1.y = 0; |
1798 | 1798 | ||
1799 | screen_edge.p2.x = FIXED3(LCD_WIDTH); | 1799 | screen_edge.p2.x = GAMESCREEN_WIDTH; |
1800 | screen_edge.p2.y = 0; | 1800 | screen_edge.p2.y = 0; |
1801 | /* the test for pos_y prevents the ball from bouncing back | 1801 | /* the test for pos_y prevents the ball from bouncing back |
1802 | * from _over_ the top to infinity on some rare cases */ | 1802 | * from _over_ the top to infinity on some rare cases */ |
@@ -1856,7 +1856,7 @@ static int brickmania_game_loop(void) | |||
1856 | screen_edge.p1.y = 0; | 1856 | screen_edge.p1.y = 0; |
1857 | 1857 | ||
1858 | screen_edge.p2.x = 0; | 1858 | screen_edge.p2.x = 0; |
1859 | screen_edge.p2.y = FIXED3(LCD_HEIGHT); | 1859 | screen_edge.p2.y = GAMESCREEN_HEIGHT; |
1860 | if ( !ball[k].glue && | 1860 | if ( !ball[k].glue && |
1861 | check_lines(&misc_line, &screen_edge, &pt_hit)) | 1861 | check_lines(&misc_line, &screen_edge, &pt_hit)) |
1862 | { | 1862 | { |
@@ -1869,11 +1869,11 @@ static int brickmania_game_loop(void) | |||
1869 | } | 1869 | } |
1870 | 1870 | ||
1871 | /* Check if the ball hit the right side */ | 1871 | /* Check if the ball hit the right side */ |
1872 | screen_edge.p1.x = FIXED3(LCD_WIDTH); | 1872 | screen_edge.p1.x = GAMESCREEN_WIDTH; |
1873 | screen_edge.p1.y = 0; | 1873 | screen_edge.p1.y = 0; |
1874 | 1874 | ||
1875 | screen_edge.p2.x = FIXED3(LCD_WIDTH); | 1875 | screen_edge.p2.x = GAMESCREEN_WIDTH; |
1876 | screen_edge.p2.y = FIXED3(LCD_HEIGHT); | 1876 | screen_edge.p2.y = GAMESCREEN_HEIGHT; |
1877 | if ( !ball[k].glue && | 1877 | if ( !ball[k].glue && |
1878 | check_lines(&misc_line, &screen_edge, &pt_hit)) | 1878 | check_lines(&misc_line, &screen_edge, &pt_hit)) |
1879 | { | 1879 | { |
@@ -1882,7 +1882,7 @@ static int brickmania_game_loop(void) | |||
1882 | 1882 | ||
1883 | /* Re-position ball in gameboard */ | 1883 | /* Re-position ball in gameboard */ |
1884 | ball[k].tempy = pt_hit.y; | 1884 | ball[k].tempy = pt_hit.y; |
1885 | ball[k].tempx = FIXED3(LCD_WIDTH - 1); | 1885 | ball[k].tempx = GAMESCREEN_WIDTH - FIXED3(1); |
1886 | } | 1886 | } |
1887 | 1887 | ||
1888 | /* Did the ball hit the paddle? Depending on where the ball | 1888 | /* Did the ball hit the paddle? Depending on where the ball |