From 93773b158eca1827afb98c11ff9b702494b13fd7 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Tue, 13 Apr 2004 18:50:23 +0000 Subject: [PATCH] fish fix SVN-Revision: 525 --- data/images/shared/fish-down-0.png | Bin 0 -> 4774 bytes src/badguy.cpp | 13 ++++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 data/images/shared/fish-down-0.png diff --git a/data/images/shared/fish-down-0.png b/data/images/shared/fish-down-0.png new file mode 100644 index 0000000000000000000000000000000000000000..7a2c60565223602bc87d925408d5801fb85e18cd GIT binary patch literal 4774 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 AJ^%m! literal 0 HcmV?d00001 diff --git a/src/badguy.cpp b/src/badguy.cpp index 9a0e68136..65b092285 100644 --- a/src/badguy.cpp +++ b/src/badguy.cpp @@ -42,6 +42,7 @@ Surface* img_stalactite[1]; Surface* img_stalactite_broken[1]; Surface* img_flame[2]; Surface* img_fish[2]; +Surface* img_fish_down[1]; Surface* img_bouncingsnowball_left[6]; Surface* img_bouncingsnowball_right[6]; Surface* img_bouncingsnowball_squished[1]; @@ -534,7 +535,7 @@ BadGuy::action_fish(float frame_ratio) else if(mode == FISH_WAIT && !timer.check()) { // jump again - set_texture(img_fish, img_fish, 2, 1.5); + set_texture(img_fish, img_fish, 2, 2); animation_offset = global_frame_counter; // restart animation mode = NORMAL; physic.set_velocity(0, JUMPV); @@ -544,6 +545,9 @@ BadGuy::action_fish(float frame_ratio) physic.apply(frame_ratio, base.x, base.y); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); + + if(physic.get_velocity_y() < 0) + set_texture(img_fish_down, img_fish_down); } void @@ -859,6 +863,10 @@ BadGuy::squish(Player* player) player_status.score_multiplier++; return; } else if(kind == BAD_FISH) { + // fish can only be killed when falling down + if(physic.get_velocity_y() >= 0) + return; + make_player_jump(player); World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier); @@ -1076,6 +1084,8 @@ void load_badguy_gfx() datadir + "/images/shared/fish-left-0.png", USE_ALPHA); img_fish[1] = new Surface( datadir + "/images/shared/fish-left-1.png", USE_ALPHA); + img_fish_down[0] = new Surface( + datadir + "/images/shared/fish-down-0.png", USE_ALPHA); /* bouncing snowball */ for(int i=0; i<6; ++i) { @@ -1177,6 +1187,7 @@ void free_badguy_gfx() delete img_fish[0]; delete img_fish[1]; + delete img_fish_down[0]; for(int i=0; i<6; ++i) { delete img_bouncingsnowball_left[i]; -- 2.11.0