From 15c2cb4042be5bbbf3e48bf1184d7fef62b1e9fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Gl=C3=A4=C3=9Fer?= Date: Mon, 2 Feb 2004 21:47:56 +0000 Subject: [PATCH] bouncy bricks are drawn correctly now, if a level has a background image. SVN-Revision: 116 --- src/world.c | 202 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 106 insertions(+), 96 deletions(-) diff --git a/src/world.c b/src/world.c index ad2724c48..0afcff486 100644 --- a/src/world.c +++ b/src/world.c @@ -1,7 +1,7 @@ // // C Implementation: world // -// Description: +// Description: // // // Author: Tobias Glaesser , (C) 2004 @@ -21,157 +21,167 @@ void bouncy_distro_init(bouncy_distro_type* pbouncy_distro, float x, float y) { - pbouncy_distro->base.alive = YES; - pbouncy_distro->base.x = x; - pbouncy_distro->base.y = y; - pbouncy_distro->base.ym = -6; + pbouncy_distro->base.alive = YES; + pbouncy_distro->base.x = x; + pbouncy_distro->base.y = y; + pbouncy_distro->base.ym = -6; } - + void bouncy_distro_action(bouncy_distro_type* pbouncy_distro) { - if (pbouncy_distro->base.alive) - { - pbouncy_distro->base.y = pbouncy_distro->base.y + pbouncy_distro->base.ym; + if (pbouncy_distro->base.alive) + { + pbouncy_distro->base.y = pbouncy_distro->base.y + pbouncy_distro->base.ym; - pbouncy_distro->base.ym++; + pbouncy_distro->base.ym++; - if (pbouncy_distro->base.ym >= 0) - pbouncy_distro->base.alive = NO; - } + if (pbouncy_distro->base.ym >= 0) + pbouncy_distro->base.alive = NO; + } } void bouncy_distro_draw(bouncy_distro_type* pbouncy_distro) { - if (pbouncy_distro->base.alive) - { - texture_draw(&img_distro[0], - pbouncy_distro->base.x - scroll_x, - pbouncy_distro->base.y, - NO_UPDATE); - } + if (pbouncy_distro->base.alive) + { + texture_draw(&img_distro[0], + pbouncy_distro->base.x - scroll_x, + pbouncy_distro->base.y, + NO_UPDATE); + } } void broken_brick_init(broken_brick_type* pbroken_brick, float x, float y, float xm, float ym) { - pbroken_brick->base.alive = YES; - pbroken_brick->base.x = x; - pbroken_brick->base.y = y; - pbroken_brick->base.xm = xm; - pbroken_brick->base.ym = ym; - timer_start(&pbroken_brick->timer,200); + pbroken_brick->base.alive = YES; + pbroken_brick->base.x = x; + pbroken_brick->base.y = y; + pbroken_brick->base.xm = xm; + pbroken_brick->base.ym = ym; + timer_start(&pbroken_brick->timer,200); } void broken_brick_action(broken_brick_type* pbroken_brick) { - if (pbroken_brick->base.alive) - { - pbroken_brick->base.x = pbroken_brick->base.x + pbroken_brick->base.xm * frame_ratio; - pbroken_brick->base.y = pbroken_brick->base.y + pbroken_brick->base.ym * frame_ratio; - - if (!timer_check(&pbroken_brick->timer)) - pbroken_brick->base.alive = NO; - } + if (pbroken_brick->base.alive) + { + pbroken_brick->base.x = pbroken_brick->base.x + pbroken_brick->base.xm * frame_ratio; + pbroken_brick->base.y = pbroken_brick->base.y + pbroken_brick->base.ym * frame_ratio; + + if (!timer_check(&pbroken_brick->timer)) + pbroken_brick->base.alive = NO; + } } void broken_brick_draw(broken_brick_type* pbroken_brick) { - if (pbroken_brick->base.alive) - { - src.x = rand() % 16; - src.y = rand() % 16; - src.w = 16; - src.h = 16; - - dest.x = pbroken_brick->base.x - scroll_x; - dest.y = pbroken_brick->base.y; - dest.w = 16; - dest.h = 16; - - texture_draw_part(&img_brick[0],src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); - } + if (pbroken_brick->base.alive) + { + src.x = rand() % 16; + src.y = rand() % 16; + src.w = 16; + src.h = 16; + + dest.x = pbroken_brick->base.x - scroll_x; + dest.y = pbroken_brick->base.y; + dest.w = 16; + dest.h = 16; + + texture_draw_part(&img_brick[0],src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); + } } void bouncy_brick_init(bouncy_brick_type* pbouncy_brick, float x, float y) { - pbouncy_brick->base.alive = YES; - pbouncy_brick->base.x = x; - pbouncy_brick->base.y = y; - pbouncy_brick->offset = 0; - pbouncy_brick->offset_m = -BOUNCY_BRICK_SPEED; - pbouncy_brick->shape = shape(x, y); + pbouncy_brick->base.alive = YES; + pbouncy_brick->base.x = x; + pbouncy_brick->base.y = y; + pbouncy_brick->offset = 0; + pbouncy_brick->offset_m = -BOUNCY_BRICK_SPEED; + pbouncy_brick->shape = shape(x, y); } void bouncy_brick_action(bouncy_brick_type* pbouncy_brick) { - if (pbouncy_brick->base.alive) - { - - pbouncy_brick->offset = (pbouncy_brick->offset + - pbouncy_brick->offset_m * frame_ratio); + if (pbouncy_brick->base.alive) + { - /* Go back down? */ + pbouncy_brick->offset = (pbouncy_brick->offset + + pbouncy_brick->offset_m * frame_ratio); - if (pbouncy_brick->offset < -BOUNCY_BRICK_MAX_OFFSET) - pbouncy_brick->offset_m = BOUNCY_BRICK_SPEED; + /* Go back down? */ + if (pbouncy_brick->offset < -BOUNCY_BRICK_MAX_OFFSET) + pbouncy_brick->offset_m = BOUNCY_BRICK_SPEED; - /* Stop bouncing? */ - if (pbouncy_brick->offset >= 0) - pbouncy_brick->base.alive = NO; - } + /* Stop bouncing? */ + + if (pbouncy_brick->offset >= 0) + pbouncy_brick->base.alive = NO; + } } void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick) { - if (pbouncy_brick->base.alive) - { - if (pbouncy_brick->base.x >= scroll_x - 32 && - pbouncy_brick->base.x <= scroll_x + screen->w) - { - dest.x = pbouncy_brick->base.x - scroll_x; - dest.y = pbouncy_brick->base.y; - dest.w = 32; - dest.h = 32; + int s; - fillrect(pbouncy_brick->base.x - scroll_x,pbouncy_brick->base.y,32,32,current_level.bkgd_red,current_level.bkgd_green, - current_level.bkgd_blue); + if (pbouncy_brick->base.alive) + { + if (pbouncy_brick->base.x >= scroll_x - 32 && + pbouncy_brick->base.x <= scroll_x + screen->w) + { + dest.x = pbouncy_brick->base.x - scroll_x; + dest.y = pbouncy_brick->base.y; + dest.w = 32; + dest.h = 32; - drawshape(pbouncy_brick->base.x - scroll_x, - pbouncy_brick->base.y + pbouncy_brick->offset, - pbouncy_brick->shape); + if(current_level.bkgd_image[0] == '\0') + { + fillrect(pbouncy_brick->base.x - scroll_x,pbouncy_brick->base.y,32,32,current_level.bkgd_red,current_level.bkgd_green, + current_level.bkgd_blue); } + else + { + s = scroll_x / 30; + texture_draw_part(&img_bkgd,dest.x + s,dest.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); + } + + drawshape(pbouncy_brick->base.x - scroll_x, + pbouncy_brick->base.y + pbouncy_brick->offset, + pbouncy_brick->shape); } + } } void floating_score_init(floating_score_type* pfloating_score, float x, float y, int s) { - pfloating_score->base.alive = YES; - pfloating_score->base.x = x; - pfloating_score->base.y = y - 16; - timer_start(&pfloating_score->timer,1000); - pfloating_score->value = s; + pfloating_score->base.alive = YES; + pfloating_score->base.x = x; + pfloating_score->base.y = y - 16; + timer_start(&pfloating_score->timer,1000); + pfloating_score->value = s; } void floating_score_action(floating_score_type* pfloating_score) { - if (pfloating_score->base.alive) - { - pfloating_score->base.y = pfloating_score->base.y - 2 * frame_ratio; + if (pfloating_score->base.alive) + { + pfloating_score->base.y = pfloating_score->base.y - 2 * frame_ratio; if(!timer_check(&pfloating_score->timer)) - pfloating_score->base.alive = NO; - } + pfloating_score->base.alive = NO; + } } void floating_score_draw(floating_score_type* pfloating_score) { - if (pfloating_score->base.alive) - { - char str[10]; - sprintf(str, "%d", pfloating_score->value); - text_draw(&gold_text, str, pfloating_score->base.x + 16 - strlen(str) * 8, pfloating_score->base.y, 1, NO_UPDATE); - } + if (pfloating_score->base.alive) + { + char str[10]; + sprintf(str, "%d", pfloating_score->value); + text_draw(&gold_text, str, pfloating_score->base.x + 16 - strlen(str) * 8, pfloating_score->base.y, 1, NO_UPDATE); + } } -- 2.11.0