From db698e9e08314ed253b608e0d0d4fc714329f126 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Gl=C3=A4=C3=9Fer?= Date: Mon, 2 Feb 2004 20:36:56 +0000 Subject: [PATCH] all effects work under OpenGL now. SVN-Revision: 115 --- src/intro.c | 2 +- src/player.c | 2 -- src/special.c | 11 +++-------- src/world.c | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/intro.c b/src/intro.c index 7df97b23f..0efb9b576 100644 --- a/src/intro.c +++ b/src/intro.c @@ -231,7 +231,7 @@ int intro(void) dest.w = src.w; dest.h = src.h; - SDL_BlitSurface(gown_upset.sdl_surface, &src, screen, &dest); + texture_draw_part(&gown_upset,src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); height[j] = height[j] - height_speed[j]; diff --git a/src/player.c b/src/player.c index e2f45f56b..bacbe30bd 100644 --- a/src/player.c +++ b/src/player.c @@ -711,7 +711,6 @@ void player_handle_vertical_input(player_type *pplayer) void player_draw(player_type* pplayer) { - if (!timer_started(&pplayer->safe_timer) || (frame % 2) == 0) { if (pplayer->size == SMALL) @@ -918,7 +917,6 @@ void player_handle_vertical_input(player_type *pplayer) } } } - } void player_collision(player_type* pplayer, void* p_c_object, int c_object) diff --git a/src/special.c b/src/special.c index e3993798c..ea6f6fc21 100644 --- a/src/special.c +++ b/src/special.c @@ -182,17 +182,12 @@ void upgrade_draw(upgrade_type* pupgrade) dest.w = 32; dest.h = pupgrade->base.height; - src.x = 0; - src.y = 0; - src.w = 32; - src.h = pupgrade->base.height; - if (pupgrade->kind == UPGRADE_MINTS) - SDL_BlitSurface(img_mints.sdl_surface, &src, screen, &dest); + texture_draw_part(&img_mints,0,0,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); else if (pupgrade->kind == UPGRADE_COFFEE) - SDL_BlitSurface(img_coffee.sdl_surface, &src, screen, &dest); + texture_draw_part(&img_coffee,0,0,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); else if (pupgrade->kind == UPGRADE_HERRING) - SDL_BlitSurface(img_golden_herring.sdl_surface, &src, screen, &dest); + texture_draw_part(&img_golden_herring,0,0,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); } else { diff --git a/src/world.c b/src/world.c index e664e147b..ad2724c48 100644 --- a/src/world.c +++ b/src/world.c @@ -87,7 +87,7 @@ void broken_brick_draw(broken_brick_type* pbroken_brick) dest.w = 16; dest.h = 16; - SDL_BlitSurface(img_brick[0].sdl_surface, &src, screen, &dest); + texture_draw_part(&img_brick[0],src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE); } } -- 2.11.0