X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy.cpp;h=5b762bb213de1eafa8b6d3746b31274d3463aa29;hb=7290f49a1304d0687d48260ceb4d1b2bbe34c8ee;hp=2c803c95d28fb90acdfc1772571d2c49a750385c;hpb=2398b134147461d9b4e096f1c15dbf889c0f2d41;p=supertux.git diff --git a/src/badguy.cpp b/src/badguy.cpp index 2c803c95d..5b762bb21 100644 --- a/src/badguy.cpp +++ b/src/badguy.cpp @@ -1,67 +1,90 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2000 Bill Kendrick +// Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2004 Matthias Braun // -// C Implementation: badguy +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. // -// Description: -// -// -// Author: Tobias Glaesser & Bill Kendrick, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include - -#include "globals.h" +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. + +#include +#include + +#include "app/globals.h" #include "defines.h" +#include "special/sprite_manager.h" +#include "utils/lispwriter.h" #include "badguy.h" -#include "scene.h" -#include "screen.h" -#include "world.h" #include "tile.h" - -texture_type img_bsod_squished_left[1]; -texture_type img_bsod_squished_right[1]; -texture_type img_bsod_falling_left[1]; -texture_type img_bsod_falling_right[1]; -texture_type img_laptop_flat_left[1]; -texture_type img_laptop_flat_right[1]; -texture_type img_laptop_falling_left[1]; -texture_type img_laptop_falling_right[1]; -texture_type img_bsod_left[4]; -texture_type img_bsod_right[4]; -texture_type img_laptop_left[4]; -texture_type img_laptop_right[4]; -texture_type img_money_left[2]; -texture_type img_money_right[2]; -texture_type img_mrbomb_left[4]; -texture_type img_mrbomb_right[4]; -texture_type img_mrbomb_ticking_left[1]; -texture_type img_mrbomb_ticking_right[1]; -texture_type img_mrbomb_explosion[1]; -texture_type img_stalactite[1]; -texture_type img_stalactite_broken[1]; -texture_type img_flame[2]; -texture_type img_fish[2]; -texture_type img_bouncingsnowball_left[6]; -texture_type img_bouncingsnowball_right[6]; -texture_type img_bouncingsnowball_squished[1]; -texture_type img_flyingsnowball[2]; -texture_type img_flyingsnowball_squished[1]; -texture_type img_spiky_left[3]; -texture_type img_spiky_right[3]; -texture_type img_snowball_left[4]; -texture_type img_snowball_right[4]; -texture_type img_snowball_squished_left[1]; -texture_type img_snowball_squished_right[1]; +#include "resources.h" +#include "camera.h" +#include "level.h" +#include "sector.h" +#include "tilemap.h" + +Sprite* img_mriceblock_flat_left; +Sprite* img_mriceblock_flat_right; +Sprite* img_mriceblock_falling_left; +Sprite* img_mriceblock_falling_right; +Sprite* img_mriceblock_left; +Sprite* img_mriceblock_right; +Sprite* img_jumpy_left_up; +Sprite* img_jumpy_left_down; +Sprite* img_jumpy_left_middle; +Sprite* img_jumpy_left_iced; +Sprite* img_mrbomb_left; +Sprite* img_mrbomb_right; +Sprite* img_mrbomb_iced_left; +Sprite* img_mrbomb_iced_right; +Sprite* img_mrbomb_ticking_left; +Sprite* img_mrbomb_ticking_right; +Sprite* img_mrbomb_explosion; +Sprite* img_stalactite; +Sprite* img_stalactite_broken; +Sprite* img_flame; +Sprite* img_fish; +Sprite* img_fish_down; +Sprite* img_fish_iced; +Sprite* img_fish_iced_down; +Sprite* img_bouncingsnowball_left; +Sprite* img_bouncingsnowball_right; +Sprite* img_bouncingsnowball_squished; +Sprite* img_flyingsnowball; +Sprite* img_flyingsnowball_squished; +Sprite* img_spiky_left; +Sprite* img_spiky_right; +Sprite* img_spiky_iced_left; +Sprite* img_spiky_iced_right; +Sprite* img_snowball_left; +Sprite* img_snowball_right; +Sprite* img_snowball_squished_left; +Sprite* img_snowball_squished_right; +Sprite* img_wingling_left; +Sprite* img_walkingtree_left; +Sprite* img_walkingtree_left_small; + +#define BADGUY_WALK_SPEED .8f +#define WINGLING_FLY_SPEED 1.6f BadGuyKind badguykind_from_string(const std::string& str) { - if (str == "money") - return BAD_MONEY; - else if (str == "laptop" || str == "mriceblock") - return BAD_LAPTOP; - else if (str == "bsod") - return BAD_BSOD; + if (str == "money" || str == "jumpy") // was money in old maps + return BAD_JUMPY; + else if (str == "laptop" || str == "mriceblock") // was laptop in old maps + return BAD_MRICEBLOCK; else if (str == "mrbomb") return BAD_MRBOMB; else if (str == "stalactite") @@ -76,12 +99,15 @@ BadGuyKind badguykind_from_string(const std::string& str) return BAD_FLYINGSNOWBALL; else if (str == "spiky") return BAD_SPIKY; - else if (str == "snowball") + else if (str == "snowball" || str == "bsod") // was bsod in old maps return BAD_SNOWBALL; + else if (str == "wingling") + return BAD_WINGLING; + else if (str == "walkingtree") + return BAD_WALKINGTREE; else { - printf("Couldn't convert badguy: '%s'\n", str.c_str()); - return BAD_BSOD; + return BAD_INVALID; } } @@ -89,14 +115,11 @@ std::string badguykind_to_string(BadGuyKind kind) { switch(kind) { - case BAD_MONEY: - return "money"; - break; - case BAD_LAPTOP: - return "laptop"; + case BAD_JUMPY: + return "jumpy"; break; - case BAD_BSOD: - return "bsod"; + case BAD_MRICEBLOCK: + return "mriceblock"; break; case BAD_MRBOMB: return "mrbomb"; @@ -122,130 +145,189 @@ std::string badguykind_to_string(BadGuyKind kind) case BAD_SNOWBALL: return "snowball"; break; + case BAD_WINGLING: + return "wingling"; + break; + case BAD_WALKINGTREE: + return "walkingtree"; default: - return "bsod"; + return "snowball"; } } +BadGuy::BadGuy(BadGuyKind kind_, LispReader& lispreader) + : removable(false), squishcount(0) +{ + lispreader.read_float("x", start_position.x); + lispreader.read_float("y", start_position.y); + + kind = kind_; + + stay_on_platform = false; + lispreader.read_bool("stay-on-platform", stay_on_platform); + + init(); +} + +BadGuy::BadGuy(BadGuyKind kind_, float x, float y) + : removable(false), squishcount(0) +{ + start_position.x = x; + start_position.y = y; + stay_on_platform = false; + + kind = kind_; + + init(); +} + +BadGuy::~BadGuy() +{ +} + void -BadGuy::init(float x, float y, BadGuyKind kind_) +BadGuy::init() { - base.x = x; - base.y = y; + base.x = 0; + base.y = 0; base.width = 0; base.height = 0; - base.xm = 0; - base.ym = 0; - + mode = NORMAL; dying = DYING_NOT; - kind = kind_; old_base = base; dir = LEFT; seen = false; - animation_speed = 1; - animation_length = 1; animation_offset = 0; - texture_left = texture_right = 0; + target.x = target.y = -1; + sprite_left = sprite_right = 0; physic.reset(); - timer_init(&timer, true); - - if(kind == BAD_BSOD) { - physic.set_velocity(-1.3, 0); - set_texture(img_bsod_left, img_bsod_right, 4); - } else if(kind == BAD_MRBOMB) { - physic.set_velocity(-1.3, 0); - set_texture(img_mrbomb_left, img_mrbomb_right, 4); - } else if (kind == BAD_LAPTOP) { - physic.set_velocity(-1.3, 0); - set_texture(img_laptop_left, img_laptop_right, 4, 5); - } else if(kind == BAD_MONEY) { - set_texture(img_money_left, img_money_right, 1); + frozen_timer.init(true); + timer.init(true); + + // if we're in a solid tile at start correct that now + if(Sector::current()) { + if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) + { + std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind) + << " pos: (" << base.x << ", " << base.y << ")" << std::endl; + while(collision_object_map(base)) + --base.y; + } + + if(Sector::current()->camera) { + Vector scroll = Sector::current()->camera->get_translation(); + + if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE && + start_position.x < scroll.x + screen->w + X_OFFSCREEN_DISTANCE && + start_position.y > scroll.y - Y_OFFSCREEN_DISTANCE && + start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) { + activate(LEFT); + } + } } else { + if(start_position.x > 0 && start_position.x <= screen->w + && start_position.y > 0 && start_position.y <= screen->h) + activate(LEFT); + } +} + +void +BadGuy::write(LispWriter& writer) +{ + writer.start_list(badguykind_to_string(kind)); + + writer.write_float("x", base.x); + writer.write_float("y", base.y); + writer.write_bool("stay-on-platform", stay_on_platform); + + writer.end_list(badguykind_to_string(kind)); +} + +void +BadGuy::activate(Direction activation_dir) +{ + mode = NORMAL; + animation_offset = 0; + target.x = target.y = -1; + physic.reset(); + frozen_timer.init(true); + timer.init(true); + + dir = activation_dir; + float dirsign = activation_dir == LEFT ? -1 : 1; + + if(kind == BAD_MRBOMB) { + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + set_sprite(img_mrbomb_left, img_mrbomb_right); + } else if (kind == BAD_MRICEBLOCK) { + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + set_sprite(img_mriceblock_left, img_mriceblock_right); + } else if(kind == BAD_JUMPY) { + set_sprite(img_jumpy_left_up, img_jumpy_left_up); } else if(kind == BAD_BOMB) { - set_texture(img_mrbomb_ticking_left, img_mrbomb_ticking_right, 1); - // hack so that the bomb doesn't hurt until it expldes... + set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right); + // hack so that the bomb doesn't hurt until it expldes... dying = DYING_SQUISHED; } else if(kind == BAD_FLAME) { - base.ym = 0; // we misuse base.ym as angle for the flame + angle = 0; physic.enable_gravity(false); - set_texture(img_flame, img_flame, 2, 0.5); + set_sprite(img_flame, img_flame); } else if(kind == BAD_BOUNCINGSNOWBALL) { - physic.set_velocity(-1.3, 0); - set_texture(img_bouncingsnowball_left, img_bouncingsnowball_right, 6); + physic.set_velocity(dirsign * 1.3, 0); + set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right); } else if(kind == BAD_STALACTITE) { physic.enable_gravity(false); - set_texture(img_stalactite, img_stalactite, 1); + set_sprite(img_stalactite, img_stalactite); } else if(kind == BAD_FISH) { - set_texture(img_fish, img_fish, 2, 1); + set_sprite(img_fish, img_fish); physic.enable_gravity(true); } else if(kind == BAD_FLYINGSNOWBALL) { - set_texture(img_flyingsnowball, img_flyingsnowball, 2, 5); + set_sprite(img_flyingsnowball, img_flyingsnowball); physic.enable_gravity(false); } else if(kind == BAD_SPIKY) { - physic.set_velocity(-1.3, 0); - set_texture(img_spiky_left, img_spiky_right, 3); + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + set_sprite(img_spiky_left, img_spiky_right); } else if(kind == BAD_SNOWBALL) { - physic.set_velocity(-1.3, 0); - set_texture(img_snowball_left, img_snowball_right, 4, 5); - } - - // if we're in a solid tile at start correct that now - if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(&base)) { - printf("Warning: badguy started in wall!.\n"); - while(collision_object_map(&base)) - --base.y; - } -} - -void -BadGuy::action_bsod(float frame_ratio) -{ - static const float BSODJUMP = 2; - - if (dying == DYING_NOT) - check_horizontal_bump(); - - fall(); - - // jump when we're about to fall - if (physic.get_velocity_y() == 0 && - !issolid(base.x+base.width/2, base.y + base.height)) { - physic.enable_gravity(true); - physic.set_velocity(physic.get_velocity_x(), BSODJUMP); + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + set_sprite(img_snowball_left, img_snowball_right); + } else if(kind == BAD_WINGLING) { + physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0); + physic.enable_gravity(false); + set_sprite(img_wingling_left, img_wingling_left); + } else if (kind == BAD_WALKINGTREE) { + // TODO: why isn't the height/width being set properly in set_sprite? + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + mode = BGM_BIG; + set_sprite(img_walkingtree_left, img_walkingtree_left); + base.width = 66; + base.height = 66; } - // Handle dying timer: - if (dying == DYING_SQUISHED && !timer_check(&timer)) - { - /* Remove it if time's up: */ - remove_me(); - return; - } - - // move - physic.apply(frame_ratio, base.x, base.y); - if(dying != DYING_FALLING) - collision_swept_object_map(&old_base, &base); + base.x = start_position.x; + base.y = start_position.y; + old_base = base; + seen = true; } void -BadGuy::action_laptop(float frame_ratio) +BadGuy::action_mriceblock(double elapsed_time) { - Player& tux = *World::current()->get_tux(); + Player& tux = *Sector::current()->player; - fall(); + if(mode != HELD) + fall(); /* Move left/right: */ - if (mode == NORMAL || mode == KICK) + if (mode != HELD) { // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); } else if (mode == HELD) { /* FIXME: The pbad object shouldn't know about pplayer objects. */ - /* If we're holding the laptop */ + /* If we're holding the iceblock */ dir = tux.dir; if(dir==RIGHT) { @@ -257,7 +339,7 @@ BadGuy::action_laptop(float frame_ratio) base.x = tux.base.x - 16; base.y = tux.base.y + tux.base.height/1.5 - base.height; } - if(collision_object_map(&base)) + if(collision_object_map(base)) { base.x = tux.base.x; base.y = tux.base.y + tux.base.height/1.5 - base.height; @@ -269,11 +351,13 @@ BadGuy::action_laptop(float frame_ratio) base.x -= 24; else base.x += 24; + old_base = base; mode=KICK; - set_texture(img_laptop_flat_left, img_laptop_flat_right, 1); - physic.set_velocity((dir == LEFT) ? -8 : 8, -8); - play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER); + tux.kick_timer.start(KICKING_TIME); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); + physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5); + SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos()); } } @@ -283,24 +367,18 @@ BadGuy::action_laptop(float frame_ratio) check_horizontal_bump(); if(mode == KICK && changed != dir) { - /* handle stereo sound (number 10 should be tweaked...)*/ - if (base.x < scroll_x + screen->w/2 - 10) - play_sound(sounds[SND_RICOCHET], SOUND_LEFT_SPEAKER); - else if (base.x > scroll_x + screen->w/2 + 10) - play_sound(sounds[SND_RICOCHET], SOUND_RIGHT_SPEAKER); - else - play_sound(sounds[SND_RICOCHET], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_RICOCHET), get_pos(), Sector::current()->player->get_pos()); } } /* Handle mode timer: */ if (mode == FLAT) { - if(!timer_check(&timer)) + if(!timer.check()) { mode = NORMAL; - set_texture(img_laptop_left, img_laptop_right, 4, 5); - physic.set_velocity( (dir == LEFT) ? -1.3 : 1.3, 0); + set_sprite(img_mriceblock_left, img_mriceblock_right); + physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0); } } } @@ -311,12 +389,19 @@ BadGuy::check_horizontal_bump(bool checkcliff) float halfheight = base.height / 2; if (dir == LEFT && issolid( base.x, (int) base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + Sector::current()->trybreakbrick(Vector(base.x, base.y + halfheight), false); + dir = RIGHT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; } if (dir == RIGHT && issolid( base.x + base.width, (int)base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + Sector::current()->trybreakbrick( + Vector(base.x + base.width, (int) base.y + halfheight), false); + dir = LEFT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; @@ -360,10 +445,28 @@ BadGuy::fall() if (physic.get_velocity_y() < 0) { base.y = int((base.y + base.height)/32) * 32 - base.height; - physic.set_velocity(physic.get_velocity_x(), 0); + physic.set_velocity_y(0); } // no gravity anymore please physic.enable_gravity(false); + + if (stay_on_platform && mode == NORMAL) + { + if (!issolid(base.x + ((dir == LEFT) ? 0 : base.width), + base.y + base.height)) + { + if (dir == LEFT) + { + dir = RIGHT; + physic.set_velocity_x(fabsf(physic.get_velocity_x())); + } + else + { + dir = LEFT; + physic.set_velocity_x(-fabsf(physic.get_velocity_x())); + } + } + } } } else @@ -373,22 +476,25 @@ BadGuy::fall() } void -BadGuy::remove_me() +BadGuy::action_jumpy(double elapsed_time) { - for(std::vector::iterator i = World::current()->bad_guys.begin(); - i != World::current()->bad_guys.end(); ++i) + if(frozen_timer.check()) { - if( & (*i) == this) { - World::current()->bad_guys.erase(i); - return; - } + set_sprite(img_jumpy_left_iced, img_jumpy_left_iced); + return; } -} -void -BadGuy::action_money(float frame_ratio) -{ - Player& tux = *World::current()->get_tux(); + const float vy = physic.get_velocity_y(); + + // XXX: These tests *should* use location from ground, not velocity + if (fabsf(vy) > 5.6f) + set_sprite(img_jumpy_left_down, img_jumpy_left_down); + else if (fabsf(vy) > 5.3f) + set_sprite(img_jumpy_left_middle, img_jumpy_left_middle); + else + set_sprite(img_jumpy_left_up, img_jumpy_left_up); + + Player& tux = *Sector::current()->player; static const float JUMPV = 6; @@ -396,14 +502,13 @@ BadGuy::action_money(float frame_ratio) // jump when on ground if(dying == DYING_NOT && issolid(base.x, base.y+32)) { - physic.set_velocity(physic.get_velocity_x(), JUMPV); + physic.set_velocity_y(JUMPV); physic.enable_gravity(true); - set_texture(&img_money_left[1], &img_money_right[1], 1); - mode = MONEY_JUMP; + + mode = JUMPY_JUMP; } - else if(mode == MONEY_JUMP) + else if(mode == JUMPY_JUMP) { - set_texture(&img_money_left[0], &img_money_right[0], 1); mode = NORMAL; } @@ -414,26 +519,32 @@ BadGuy::action_money(float frame_ratio) dir = LEFT; // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); } void -BadGuy::action_mrbomb(float frame_ratio) +BadGuy::action_mrbomb(double elapsed_time) { + if(frozen_timer.check()) + { + set_sprite(img_mrbomb_iced_left, img_mrbomb_iced_right); + return; + } + if (dying == DYING_NOT) check_horizontal_bump(true); fall(); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); } void -BadGuy::action_bomb(float frame_ratio) +BadGuy::action_bomb(double elapsed_time) { static const int TICKINGTIME = 1000; static const int EXPLODETIME = 1000; @@ -442,13 +553,15 @@ BadGuy::action_bomb(float frame_ratio) if(mode == NORMAL) { mode = BOMB_TICKING; - timer_start(&timer, TICKINGTIME); - } else if(!timer_check(&timer)) { + timer.start(TICKINGTIME); + } else if(!timer.check()) { if(mode == BOMB_TICKING) { mode = BOMB_EXPLODE; - set_texture(img_mrbomb_explosion, img_mrbomb_explosion, 1); + set_sprite(img_mrbomb_explosion, img_mrbomb_explosion); dying = DYING_NOT; // now the bomb hurts - timer_start(&timer, EXPLODETIME); + timer.start(EXPLODETIME); + + SoundManager::get()->play_sound(IDToSound(SND_EXPLODE), this, Sector::current()->player->get_pos()); } else if(mode == BOMB_EXPLODE) { remove_me(); return; @@ -456,14 +569,14 @@ BadGuy::action_bomb(float frame_ratio) } // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); collision_swept_object_map(&old_base,&base); } void -BadGuy::action_stalactite(float frame_ratio) +BadGuy::action_stalactite(double elapsed_time) { - Player& tux = *World::current()->get_tux(); + Player& tux = *Sector::current()->player; static const int SHAKETIME = 800; static const int RANGE = 40; @@ -472,13 +585,14 @@ BadGuy::action_stalactite(float frame_ratio) // start shaking when tux is below the stalactite and at least 40 pixels // near if(tux.base.x + 32 > base.x - RANGE && tux.base.x < base.x + 32 + RANGE - && tux.base.y + tux.base.height > base.y) { - timer_start(&timer, SHAKETIME); + && tux.base.y + tux.base.height > base.y + && tux.dying == DYING_NOT) { + timer.start(SHAKETIME); mode = STALACTITE_SHAKING; } } if(mode == STALACTITE_SHAKING) { base.x = old_base.x + (rand() % 6) - 3; // TODO this could be done nicer... - if(!timer_check(&timer)) { + if(!timer.check()) { mode = STALACTITE_FALL; } } else if(mode == STALACTITE_FALL) { @@ -486,66 +600,80 @@ BadGuy::action_stalactite(float frame_ratio) /* Destroy if we collides with land */ if(issolid(base.x+base.width/2, base.y+base.height)) { - timer_start(&timer, 2000); + timer.start(2000); dying = DYING_SQUISHED; mode = FLAT; - set_texture(img_stalactite_broken, img_stalactite_broken, 1); + set_sprite(img_stalactite_broken, img_stalactite_broken); } } else if(mode == FLAT) { fall(); } // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); - if(dying == DYING_SQUISHED && !timer_check(&timer)) + if(dying == DYING_SQUISHED && !timer.check()) remove_me(); } void -BadGuy::action_flame(float frame_ratio) +BadGuy::action_flame(double elapsed_time) { static const float radius = 100; static const float speed = 0.02; - base.x = old_base.x + cos(base.ym) * radius; - base.y = old_base.y + sin(base.ym) * radius; + base.x = old_base.x + cos(angle) * radius; + base.y = old_base.y + sin(angle) * radius; - base.ym = fmodf(base.ym + frame_ratio * speed, 2*M_PI); + angle = fmodf(angle + elapsed_time * speed, 2*M_PI); } void -BadGuy::action_fish(float frame_ratio) +BadGuy::action_fish(double elapsed_time) { + if(frozen_timer.check()) + { + if(physic.get_velocity_y() < 0) + set_sprite(img_fish_iced_down, img_fish_iced_down); + else + set_sprite(img_fish_iced, img_fish_iced); + + return; + } + static const float JUMPV = 6; static const int WAITTIME = 1000; // go in wait mode when back in water - if(dying == DYING_NOT && gettile(base.x, base.y+ base.height)->water - && physic.get_velocity_y() <= 0 && mode == NORMAL) + if(dying == DYING_NOT + && gettile(base.x, base.y + base.height) + && gettile(base.x, base.y + base.height)->attributes & Tile::WATER + && physic.get_velocity_y() <= 0 && mode == NORMAL) { mode = FISH_WAIT; - set_texture(0, 0); + set_sprite(0, 0); physic.set_velocity(0, 0); physic.enable_gravity(false); - timer_start(&timer, WAITTIME); + timer.start(WAITTIME); } - else if(mode == FISH_WAIT && !timer_check(&timer)) + else if(mode == FISH_WAIT && !timer.check()) { // jump again - set_texture(img_fish, img_fish, 2, 1.5); - animation_offset = global_frame_counter; // restart animation + set_sprite(img_fish, img_fish); mode = NORMAL; physic.set_velocity(0, JUMPV); physic.enable_gravity(true); } - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); + + if(physic.get_velocity_y() < 0) + set_sprite(img_fish_down, img_fish_down); } void -BadGuy::action_bouncingsnowball(float frame_ratio) +BadGuy::action_bouncingsnowball(double elapsed_time) { static const float JUMPV = 4.5; @@ -554,7 +682,7 @@ BadGuy::action_bouncingsnowball(float frame_ratio) // jump when on ground if(dying == DYING_NOT && issolid(base.x, base.y+32)) { - physic.set_velocity(physic.get_velocity_x(), JUMPV); + physic.set_velocity_y(JUMPV); physic.enable_gravity(true); } else @@ -565,21 +693,17 @@ BadGuy::action_bouncingsnowball(float frame_ratio) // check for right/left collisions check_horizontal_bump(); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); // Handle dying timer: - if (dying == DYING_SQUISHED && !timer_check(&timer)) - { - /* Remove it if time's up: */ - remove_me(); - return; - } + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); } void -BadGuy::action_flyingsnowball(float frame_ratio) +BadGuy::action_flyingsnowball(double elapsed_time) { static const float FLYINGSPEED = 1; static const int DIRCHANGETIME = 1000; @@ -587,40 +711,42 @@ BadGuy::action_flyingsnowball(float frame_ratio) // go into flyup mode if none specified yet if(dying == DYING_NOT && mode == NORMAL) { mode = FLY_UP; - physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED); - timer_start(&timer, DIRCHANGETIME/2); + physic.set_velocity_y(FLYINGSPEED); + timer.start(DIRCHANGETIME/2); } - if(dying == DYING_NOT && !timer_check(&timer)) { + if(dying == DYING_NOT && !timer.check()) { if(mode == FLY_UP) { mode = FLY_DOWN; - physic.set_velocity(physic.get_velocity_x(), -FLYINGSPEED); + physic.set_velocity_y(-FLYINGSPEED); } else if(mode == FLY_DOWN) { mode = FLY_UP; - physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED); + physic.set_velocity_y(FLYINGSPEED); } - timer_start(&timer, DIRCHANGETIME); + timer.start(DIRCHANGETIME); } if(dying != DYING_NOT) physic.enable_gravity(true); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if(dying == DYING_NOT || dying == DYING_SQUISHED) collision_swept_object_map(&old_base, &base); // Handle dying timer: - if (dying == DYING_SQUISHED && !timer_check(&timer)) - { - /* Remove it if time's up: */ - remove_me(); - return; - } + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); } void -BadGuy::action_spiky(float frame_ratio) +BadGuy::action_spiky(double elapsed_time) { + if(frozen_timer.check()) + { + set_sprite(img_spiky_iced_left, img_spiky_iced_right); + return; + } + if (dying == DYING_NOT) check_horizontal_bump(); @@ -630,233 +756,338 @@ BadGuy::action_spiky(float frame_ratio) if (physic.get_velocity_y() == 0 && !issolid(base.x+base.width/2, base.y + base.height)) { physic.enable_gravity(true); - physic.set_velocity(physic.get_velocity_x(), 2); + physic.set_velocity_y(2); } #endif - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); } void -BadGuy::action_snowball(float frame_ratio) +BadGuy::action_snowball(double elapsed_time) { if (dying == DYING_NOT) check_horizontal_bump(); fall(); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); } void -BadGuy::action(float frame_ratio) +BadGuy::action_wingling(double elapsed_time) { - // Remove if it's far off the screen: - if (base.x < scroll_x - OFFSCREEN_DISTANCE) + if (dying != DYING_NOT) + physic.enable_gravity(true); + else + { + Player& tux = *Sector::current()->player; + int dirsign = physic.get_velocity_x() < 0 ? -1 : 1; + + if (fabsf(tux.base.x - base.x) < 150 && base.y < tux.base.y && tux.dying == DYING_NOT) { - remove_me(); - return; + if (target.x < 0 && target.y < 0) + { + target.x = tux.base.x; + target.y = tux.base.y; + physic.set_velocity(dirsign * 1.5f, -2.25f); + } } + else if (base.y >= target.y - 16) + physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0); + } + + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); + + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); + // TODO: Winglings should be removed after flying off the screen +} + +void +BadGuy::action_walkingtree(double elapsed_time) +{ + if (dying == DYING_NOT) + check_horizontal_bump(); + + fall(); + + physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); + if (dying != DYING_FALLING) + collision_swept_object_map(&old_base,&base); + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); +} + +void +BadGuy::action(float elapsed_time) +{ + float scroll_x = Sector::current()->camera->get_translation().x; + float scroll_y = Sector::current()->camera->get_translation().y; + // BadGuy fall below the ground - if (base.y > screen->h) { + if (base.y > Sector::current()->solids->get_height() * 32) { remove_me(); return; } - // Once it's on screen, it's activated! - if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE) - seen = true; + // Kill us if we landed on spikes + if (dying == DYING_NOT + && (kind != BAD_STALACTITE && kind != BAD_FLAME && kind != BAD_BOMB) + && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y) + || isspike(base.x, base.y + base.height) + || isspike(base.x + base.width, base.y + base.height))) + { + physic.set_velocity_y(3); + kill_me(0); + } + if(!seen) { + /* activate badguys if they're just inside the offscreen_distance around the + * screen. Don't activate them inside the screen, since that might have the + * effect of badguys suddenly popping up from nowhere + */ + if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE && + start_position.x < scroll_x - base.width) + activate(RIGHT); + else if(start_position.x > scroll_y - Y_OFFSCREEN_DISTANCE && + start_position.y < scroll_y - base.height) + activate(LEFT); + else if(start_position.x > scroll_x + screen->w && + start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE) + activate(LEFT); + else if(start_position.y > scroll_y + screen->h && + start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) + activate(LEFT); + } else { + if(base.x + base.width < scroll_x - X_OFFSCREEN_DISTANCE*4 + || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE*4 + || base.y + base.height < scroll_y - Y_OFFSCREEN_DISTANCE*4 + || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4) { + seen = false; + if(dying != DYING_NOT) + remove_me(); + } + } + if(!seen) return; - + switch (kind) { - case BAD_BSOD: - action_bsod(frame_ratio); - break; - - case BAD_LAPTOP: - action_laptop(frame_ratio); + case BAD_MRICEBLOCK: + action_mriceblock(elapsed_time); break; - case BAD_MONEY: - action_money(frame_ratio); + case BAD_JUMPY: + action_jumpy(elapsed_time); break; case BAD_MRBOMB: - action_mrbomb(frame_ratio); + action_mrbomb(elapsed_time); break; case BAD_BOMB: - action_bomb(frame_ratio); + action_bomb(elapsed_time); break; case BAD_STALACTITE: - action_stalactite(frame_ratio); + action_stalactite(elapsed_time); break; case BAD_FLAME: - action_flame(frame_ratio); + action_flame(elapsed_time); break; case BAD_FISH: - action_fish(frame_ratio); + action_fish(elapsed_time); break; case BAD_BOUNCINGSNOWBALL: - action_bouncingsnowball(frame_ratio); + action_bouncingsnowball(elapsed_time); break; case BAD_FLYINGSNOWBALL: - action_flyingsnowball(frame_ratio); + action_flyingsnowball(elapsed_time); break; case BAD_SPIKY: - action_spiky(frame_ratio); + action_spiky(elapsed_time); break; case BAD_SNOWBALL: - action_snowball(frame_ratio); + action_snowball(elapsed_time); + break; + + case BAD_WINGLING: + action_wingling(elapsed_time); + break; + + case BAD_WALKINGTREE: + action_walkingtree(elapsed_time); + break; + + default: break; } } void -BadGuy::draw() +BadGuy::draw(DrawingContext& context) { - // Don't try to draw stuff that is outside of the screen - if(base.x <= scroll_x - base.width || base.x >= scroll_x + screen->w) - return; - if(texture_left == 0 || texture_right == 0) + Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right; + if(sprite == 0) return; - float global_frame = (float(global_frame_counter - animation_offset) / 10); - global_frame *= animation_speed; - size_t frame = size_t(global_frame) % animation_length; - texture_type* texture = - (dir == LEFT) ? &texture_left[frame] : &texture_right[frame]; - texture_draw(texture, base.x - scroll_x, base.y); + if(dying == DYING_FALLING && physic.get_velocity_y() < 0) + sprite->draw(context, Vector(base.x, base.y), LAYER_FOREGROUNDTILES+1, VERTICAL_FLIP); + else + sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS); + + if(debug_mode) + context.draw_filled_rect(Vector(base.x, base.y), + Vector(base.width, base.height), Color(75,0,75, 150), LAYER_OBJECTS+1); } void -BadGuy::set_texture(texture_type* left, texture_type* right, - int nanimlength, float nanimspeed) +BadGuy::set_sprite(Sprite* left, Sprite* right) { - if(left != 0) { - if(base.width == 0 && base.height == 0) { - base.width = left->w; - base.height = left->h; - } else if(base.width != left->w || base.height != left->h) { - base.x -= (left->w - base.width) / 2; - base.y -= left->h - base.height; - base.width = left->w; - base.height = left->h; - old_base = base; + if (1) + { + base.width = 32; + base.height = 32; + } + else + { + // FIXME: Using the image size for the physics and collision is + // a bad idea, since images should always overlap there physical + // representation + if(left != 0) { + if(base.width == 0 && base.height == 0) { + base.width = left->get_width(); + base.height = left->get_height(); + } else if(base.width != left->get_width() || base.height != left->get_height()) { + base.x -= (left->get_width() - base.width) / 2; + base.y -= left->get_height() - base.height; + base.width = left->get_width(); + base.height = left->get_height(); + old_base = base; + } + } else { + base.width = base.height = 0; + } } - } else { - base.width = base.height = 0; - } - animation_length = nanimlength; - animation_speed = nanimspeed; animation_offset = 0; - texture_left = left; - texture_right = right; + sprite_left = left; + sprite_right = right; } void BadGuy::bump() { - if(kind == BAD_BSOD || kind == BAD_LAPTOP || kind == BAD_MRBOMB - || kind == BAD_BOUNCINGSNOWBALL) { - kill_me(); - } -} + // these can't be bumped + if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH + || kind == BAD_FLYINGSNOWBALL) + return; -void -BadGuy::make_player_jump(Player* player) -{ - player->physic.set_velocity(player->physic.get_velocity_x(), 2); - player->base.y = base.y - player->base.height - 2; + physic.set_velocity_y(3); + kill_me(25); } void BadGuy::squish_me(Player* player) { - make_player_jump(player); + player->bounce(this); - World::current()->add_score(base.x - scroll_x, - base.y, 50 * player_status.score_multiplier); - play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); + Sector::current()->add_score(Vector(base.x, base.y), + 50 * player_status.score_multiplier); + + SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos()); player_status.score_multiplier++; dying = DYING_SQUISHED; - timer_start(&timer, 2000); + timer.start(2000); physic.set_velocity(0, 0); } void BadGuy::squish(Player* player) { + static const int MAX_ICEBLOCK_SQUICHES = 10; + if(kind == BAD_MRBOMB) { // mrbomb transforms into a bomb now - World::current()->add_bad_guy(base.x, base.y, BAD_BOMB); + explode(false); - make_player_jump(player); - World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier); - play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); + player->bounce(this); + Sector::current()->add_score(Vector(base.x, base.y), + 50 * player_status.score_multiplier); + SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos()); player_status.score_multiplier++; - - remove_me(); return; - } else if(kind == BAD_BSOD) { - squish_me(player); - set_texture(img_bsod_squished_left, img_bsod_squished_right, 1); - physic.set_velocity(0, physic.get_velocity_y()); - return; - - } else if (kind == BAD_LAPTOP) { + } else if (kind == BAD_MRICEBLOCK) { if (mode == NORMAL || mode == KICK) { /* Flatten! */ - play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_STOMP), get_pos(), Sector::current()->player->get_pos()); mode = FLAT; - set_texture(img_laptop_flat_left, img_laptop_flat_right, 1); - physic.set_velocity(0, physic.get_velocity_y()); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); + physic.set_velocity_x(0); - timer_start(&timer, 4000); + timer.start(4000); } else if (mode == FLAT) { /* Kick! */ - play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos()); if (player->base.x < base.x + (base.width/2)) { - physic.set_velocity(5, physic.get_velocity_y()); + physic.set_velocity_x(5); dir = RIGHT; } else { - physic.set_velocity(-5, physic.get_velocity_y()); + physic.set_velocity_x(-5); dir = LEFT; } mode = KICK; - set_texture(img_laptop_flat_left, img_laptop_flat_right, 1); + player->kick_timer.start(KICKING_TIME); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } - make_player_jump(player); - - World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier); + player->bounce(this); + player_status.score_multiplier++; + + // check for maximum number of squishes + squishcount++; + if(squishcount >= MAX_ICEBLOCK_SQUICHES) { + kill_me(50); + return; + } + return; } else if(kind == BAD_FISH) { - make_player_jump(player); + // fish can only be killed when falling down + if(physic.get_velocity_y() >= 0) + return; + + player->bounce(this); - World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier); + Sector::current()->add_score(Vector(base.x, base.y), + 25 * player_status.score_multiplier); player_status.score_multiplier++; // simply remove the fish... @@ -864,337 +1095,304 @@ BadGuy::squish(Player* player) return; } else if(kind == BAD_BOUNCINGSNOWBALL) { squish_me(player); - set_texture(img_bouncingsnowball_squished,img_bouncingsnowball_squished,1); + set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished); return; } else if(kind == BAD_FLYINGSNOWBALL) { squish_me(player); - set_texture(img_flyingsnowball_squished,img_flyingsnowball_squished,1); + set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished); return; } else if(kind == BAD_SNOWBALL) { squish_me(player); - set_texture(img_snowball_squished_left, img_snowball_squished_right, 1); + set_sprite(img_snowball_squished_left, img_snowball_squished_right); return; + } else if(kind == BAD_WINGLING) { + squish_me(player); + set_sprite(img_wingling_left, img_wingling_left); + } else if(kind == BAD_WALKINGTREE) { + if (mode == BGM_BIG) + { + set_sprite(img_walkingtree_left_small, img_walkingtree_left_small); + physic.set_velocity_x(physic.get_velocity_x() * 2.0f); + + /* Move to the player's direction */ + if(dir != Sector::current()->player->dir) + physic.set_velocity_x(-physic.get_velocity_x()); + dir = Sector::current()->player->dir; + + // XXX magic number: 66 is BGM_BIG height + + player->bounce(this); + base.y += 66 - base.height; + + Sector::current()->add_score(Vector(base.x, base.y), + 25 * player_status.score_multiplier); + player_status.score_multiplier++; + + mode = BGM_SMALL; + } + else + squish_me(player); } } void -BadGuy::kill_me() +BadGuy::kill_me(int score) { - if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME) + if(kind == BAD_BOMB) return; dying = DYING_FALLING; - if(kind == BAD_LAPTOP) - set_texture(img_laptop_falling_left, img_laptop_falling_right, 1); - else if(kind == BAD_BSOD) - set_texture(img_bsod_falling_left, img_bsod_falling_right, 1); - + if(kind == BAD_MRICEBLOCK) { + set_sprite(img_mriceblock_falling_left, img_mriceblock_falling_right); + if(mode == HELD) { + mode = NORMAL; + Player& tux = *Sector::current()->player; + tux.holding_something = false; + } + } + physic.enable_gravity(true); - physic.set_velocity(physic.get_velocity_x(), 0); /* Gain some points: */ - if (kind == BAD_BSOD) - World::current()->add_score(base.x - scroll_x, base.y, - 50 * player_status.score_multiplier); - else - World::current()->add_score(base.x - scroll_x, base.y, - 25 * player_status.score_multiplier); + if (score != 0) + Sector::current()->add_score(Vector(base.x, base.y), + score * player_status.score_multiplier); /* Play death sound: */ - play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_FALL), this, Sector::current()->player->get_pos()); +} + +void +BadGuy::explode(bool right_way) +{ + BadGuy *badguy = Sector::current()->add_bad_guy(base.x, base.y, BAD_BOMB); + if(right_way) + { + badguy->timer.start(0); + badguy->mode = BOMB_TICKING; + } + + remove_me(); +} + +void +BadGuy::collision(const MovingObject&, int) +{ + // later } void BadGuy::collision(void *p_c_object, int c_object, CollisionType type) { BadGuy* pbad_c = NULL; + Bullet* pbullet_c = NULL; if(type == COLLISION_BUMP) { bump(); return; } + if(type == COLLISION_SQUISH) { Player* player = static_cast(p_c_object); squish(player); return; } + /* COLLISION_NORMAL */ switch (c_object) { case CO_BULLET: - kill_me(); - break; + pbullet_c = (Bullet*) p_c_object; - case CO_BADGUY: - pbad_c = (BadGuy*) p_c_object; - if(kind == BAD_LAPTOP && mode == KICK && - pbad_c->kind != BAD_FLAME && pbad_c->kind != BAD_BOMB) + if(pbullet_c->kind == FIRE_BULLET) { - /* We're in kick mode, kill the other guy - and yourself(wuahaha) : */ - pbad_c->kill_me(); - kill_me(); + if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME) + kill_me(10); + } + else if(pbullet_c->kind == ICE_BULLET) + { + //if(kind == BAD_FLAME) + // kill_me(10); + //else + frozen_timer.start(FROZEN_TIME); } break; - } -} - -//--------------------------------------------------------------------------- - -void load_badguy_gfx() -{ - /* (BSOD) */ - texture_load(&img_bsod_left[0], datadir + - "/images/shared/bsod-left-0.png", - USE_ALPHA); - - texture_load(&img_bsod_left[1], datadir + - "/images/shared/bsod-left-1.png", - USE_ALPHA); - - texture_load(&img_bsod_left[2], datadir + - "/images/shared/bsod-left-2.png", - USE_ALPHA); - - texture_load(&img_bsod_left[3], datadir + - "/images/shared/bsod-left-3.png", - USE_ALPHA); - - texture_load(&img_bsod_right[0], datadir + - "/images/shared/bsod-right-0.png", - USE_ALPHA); - - texture_load(&img_bsod_right[1], datadir + - "/images/shared/bsod-right-1.png", - USE_ALPHA); - - texture_load(&img_bsod_right[2], datadir + - "/images/shared/bsod-right-2.png", - USE_ALPHA); - texture_load(&img_bsod_right[3], datadir + - "/images/shared/bsod-right-3.png", - USE_ALPHA); - - texture_load(&img_bsod_squished_left[0], datadir + - "/images/shared/bsod-squished-left.png", - USE_ALPHA); + case CO_BADGUY: + pbad_c = (BadGuy*) p_c_object; - texture_load(&img_bsod_squished_right[0], datadir + - "/images/shared/bsod-squished-right.png", - USE_ALPHA); - texture_load(&img_bsod_falling_left[0], datadir + - "/images/shared/bsod-falling-left.png", - USE_ALPHA); + /* If we're a kicked mriceblock, kill [almost] any badguys we hit */ + if(kind == BAD_MRICEBLOCK && mode == KICK && + kind != BAD_FLAME && kind != BAD_BOMB && kind != BAD_STALACTITE) + { + pbad_c->kill_me(25); + } - texture_load(&img_bsod_falling_right[0], datadir + - "/images/shared/bsod-falling-right.png", - USE_ALPHA); + // a held mriceblock kills the enemy too but falls to ground then + else if(kind == BAD_MRICEBLOCK && mode == HELD) + { + pbad_c->kill_me(25); + kill_me(0); + } + /* Kill badguys that run into exploding bomb */ + else if (kind == BAD_BOMB && dying == DYING_NOT) + { + if (pbad_c->kind == BAD_MRBOMB) + { + // mrbomb transforms into a bomb now + pbad_c->explode(true); + return; + } + else if (pbad_c->kind != BAD_MRBOMB) + { + pbad_c->kill_me(50); + } + } - /* (Laptop) */ + /* Kill any badguys that get hit by stalactite */ + else if (kind == BAD_STALACTITE && dying == DYING_NOT) + { + if (pbad_c->kind == BAD_MRBOMB) + { + // mrbomb transforms into a bomb now + pbad_c->explode(false); + return; + } + else + pbad_c->kill_me(50); + } - texture_load(&img_laptop_left[0], datadir + "/images/shared/mriceblock-left-0.png", USE_ALPHA); - texture_load(&img_laptop_left[1], datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA); - texture_load(&img_laptop_left[2], datadir + "/images/shared/mriceblock-left-2.png", USE_ALPHA); - texture_load(&img_laptop_left[3], datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA); + /* When enemies run into eachother, make them change directions */ + else + { + // Wingling doesn't interact with other badguys + if (pbad_c->kind == BAD_WINGLING || kind == BAD_WINGLING) + break; - texture_load(&img_laptop_right[0], datadir + "/images/shared/mriceblock-right-0.png", USE_ALPHA); - texture_load(&img_laptop_right[1], datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA); - texture_load(&img_laptop_right[2], datadir + "/images/shared/mriceblock-right-2.png", USE_ALPHA); - texture_load(&img_laptop_right[3], datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA); - - texture_load(&img_laptop_flat_left[0], - datadir + "/images/shared/laptop-flat-left.png", - USE_ALPHA); + // Jumpy, fish, flame, stalactites, wingling are exceptions + if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME + || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH) + break; - texture_load(&img_laptop_flat_right[0], datadir + - "/images/shared/laptop-flat-right.png", - USE_ALPHA); + // Bounce off of other badguy if we land on top of him + if (base.y + base.height < pbad_c->base.y + pbad_c->base.height) + { + if (pbad_c->dir == LEFT) + { + dir = RIGHT; + physic.set_velocity(fabsf(physic.get_velocity_x()), 2); + } + else if (pbad_c->dir == RIGHT) + { + dir = LEFT; + physic.set_velocity(-fabsf(physic.get_velocity_x()), 2); + } + + break; + } + else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height) + break; - texture_load(&img_laptop_falling_left[0], datadir + - "/images/shared/laptop-falling-left.png", - USE_ALPHA); + if (pbad_c->kind != BAD_FLAME) + { + if (dir == LEFT) + { + dir = RIGHT; + physic.set_velocity_x(fabsf(physic.get_velocity_x())); - texture_load(&img_laptop_falling_right[0], datadir + - "/images/shared/laptop-falling-right.png", - USE_ALPHA); + // Put bad guys a part (or they get jammed) + // only needed to do to one of them + base.x = pbad_c->base.x + pbad_c->base.width + 1; + } + else if (dir == RIGHT) + { + dir = LEFT; + physic.set_velocity_x(-fabsf(physic.get_velocity_x())); + } + } + } + + break; - /* (Money) */ + case CO_PLAYER: + Player* player = static_cast(p_c_object); + /* Get kicked if were flat */ + if (mode == FLAT && !dying) + { + SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos()); - texture_load(&img_money_left[0], datadir + - "/images/shared/bag-left-0.png", - USE_ALPHA); + // Hit from left side + if (player->base.x < base.x) { + physic.set_velocity_x(5); + dir = RIGHT; + } + // Hit from right side + else { + physic.set_velocity_x(-5); + dir = LEFT; + } - texture_load(&img_money_left[1], datadir + - "/images/shared/bag-left-1.png", - USE_ALPHA); + mode = KICK; + player->kick_timer.start(KICKING_TIME); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); + } + break; - texture_load(&img_money_right[0], datadir + - "/images/shared/bag-right-0.png", - USE_ALPHA); + } +} - texture_load(&img_money_right[1], datadir + - "/images/shared/bag-right-1.png", - USE_ALPHA); - /* Mr. Bomb */ - for(int i=0; i<4; ++i) { - char num[4]; - snprintf(num, 4, "%d", i); - texture_load(&img_mrbomb_left[i], - datadir + "/images/shared/mrbomb-left-" + num + ".png", USE_ALPHA); - texture_load(&img_mrbomb_right[i], - datadir + "/images/shared/mrbomb-right-" + num + ".png", USE_ALPHA); - } - texture_load(&img_mrbomb_ticking_left[0], - datadir + "/images/shared/mrbombx-left-0.png", USE_ALPHA); - texture_load(&img_mrbomb_ticking_right[0], - datadir + "/images/shared/mrbombx-right-0.png", USE_ALPHA); - texture_load(&img_mrbomb_explosion[0], - datadir + "/images/shared/mrbomb-explosion.png", USE_ALPHA); - - /* stalactite */ - texture_load(&img_stalactite[0], - datadir + "/images/shared/stalactite.png", USE_ALPHA); - texture_load(&img_stalactite_broken[0], - datadir + "/images/shared/stalactite-broken.png", USE_ALPHA); - - /* flame */ - texture_load(&img_flame[0], - datadir + "/images/shared/flame-0.png", USE_ALPHA); - texture_load(&img_flame[1], - datadir + "/images/shared/flame-1.png", USE_ALPHA); - - /* fish */ - texture_load(&img_fish[0], - datadir + "/images/shared/fish-left-0.png", USE_ALPHA); - texture_load(&img_fish[1], - datadir + "/images/shared/fish-left-1.png", USE_ALPHA); - - /* bouncing snowball */ - for(int i=0; i<6; ++i) { - char num[4]; - snprintf(num, 4, "%d", i); - texture_load(&img_bouncingsnowball_left[i], - datadir + "/images/shared/bouncingsnowball-left-" + num + ".png", - USE_ALPHA); - texture_load(&img_bouncingsnowball_right[i], - datadir + "/images/shared/bouncingsnowball-right-" + num + ".png", - USE_ALPHA); - } - texture_load(&img_bouncingsnowball_squished[0], - datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA); - - /* flying snowball */ - texture_load(&img_flyingsnowball[0], - datadir + "/images/shared/flyingsnowball-left-0.png", USE_ALPHA); - texture_load(&img_flyingsnowball[1], - datadir + "/images/shared/flyingsnowball-left-1.png", USE_ALPHA); - texture_load(&img_flyingsnowball_squished[0], - datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA); - - /* spiky */ - for(int i = 0; i < 3; ++i) { - char num[4]; - snprintf(num, 4, "%d", i); - texture_load(&img_spiky_left[i], - datadir + "/images/shared/spiky-left-" + num + ".png", - USE_ALPHA); - texture_load(&img_spiky_right[i], - datadir + "/images/shared/spiky-right-" + num + ".png", - USE_ALPHA); - } +//--------------------------------------------------------------------------- - /** snowball */ - texture_load(&img_snowball_left[0], datadir + "/images/shared/snowball-left-0.png", USE_ALPHA); - texture_load(&img_snowball_left[1], datadir + "/images/shared/snowball-left-1.png", USE_ALPHA); - texture_load(&img_snowball_left[2], datadir + "/images/shared/snowball-left-2.png", USE_ALPHA); - texture_load(&img_snowball_left[3], datadir + "/images/shared/snowball-left-1.png", USE_ALPHA); - - texture_load(&img_snowball_right[0], datadir + "/images/shared/snowball-right-0.png", USE_ALPHA); - texture_load(&img_snowball_right[1], datadir + "/images/shared/snowball-right-1.png", USE_ALPHA); - texture_load(&img_snowball_right[2], datadir + "/images/shared/snowball-right-2.png", USE_ALPHA); - texture_load(&img_snowball_right[3], datadir + "/images/shared/snowball-right-1.png", USE_ALPHA); - - texture_load(&img_snowball_squished_left[0], - datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA); - texture_load(&img_snowball_squished_right[0], - datadir + "/images/shared/bsod-squished-right.png", USE_ALPHA); +void load_badguy_gfx() +{ + img_mriceblock_flat_left = sprite_manager->load("mriceblock-flat-left"); + img_mriceblock_flat_right = sprite_manager->load("mriceblock-flat-right"); + img_mriceblock_falling_left = sprite_manager->load("mriceblock-falling-left"); + img_mriceblock_falling_right = sprite_manager->load("mriceblock-falling-right"); + img_mriceblock_left = sprite_manager->load("mriceblock-left"); + img_mriceblock_right = sprite_manager->load("mriceblock-right"); + img_jumpy_left_up = sprite_manager->load("jumpy-left-up"); + img_jumpy_left_down = sprite_manager->load("jumpy-left-down"); + img_jumpy_left_middle = sprite_manager->load("jumpy-left-middle"); + img_jumpy_left_iced = sprite_manager->load("jumpy-left-iced"); + img_mrbomb_left = sprite_manager->load("mrbomb-left"); + img_mrbomb_right = sprite_manager->load("mrbomb-right"); + img_mrbomb_iced_left = sprite_manager->load("mrbomb-iced-left"); + img_mrbomb_iced_right = sprite_manager->load("mrbomb-iced-right"); + img_mrbomb_ticking_left = sprite_manager->load("mrbomb-ticking-left"); + img_mrbomb_ticking_right = sprite_manager->load("mrbomb-ticking-right"); + img_mrbomb_explosion = sprite_manager->load("mrbomb-explosion"); + img_stalactite = sprite_manager->load("stalactite"); + img_stalactite_broken = sprite_manager->load("stalactite-broken"); + img_flame = sprite_manager->load("flame"); + img_fish = sprite_manager->load("fish"); + img_fish_down = sprite_manager->load("fish-down"); + img_fish_iced = sprite_manager->load("fish-iced"); + img_fish_iced_down = sprite_manager->load("fish-iced-down"); + img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left"); + img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right"); + img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished"); + img_flyingsnowball = sprite_manager->load("flyingsnowball"); + img_flyingsnowball_squished = sprite_manager->load("flyingsnowball-squished"); + img_spiky_left = sprite_manager->load("spiky-left"); + img_spiky_right = sprite_manager->load("spiky-right"); + img_spiky_iced_left = sprite_manager->load("spiky-iced-left"); + img_spiky_iced_right = sprite_manager->load("spiky-iced-right"); + img_snowball_left = sprite_manager->load("snowball-left"); + img_snowball_right = sprite_manager->load("snowball-right"); + img_snowball_squished_left = sprite_manager->load("snowball-squished-left"); + img_snowball_squished_right = sprite_manager->load("snowball-squished-right"); + img_wingling_left = sprite_manager->load("wingling-left"); + img_walkingtree_left = sprite_manager->load("walkingtree-left"); + img_walkingtree_left_small = sprite_manager->load("walkingtree-left-small"); } void free_badguy_gfx() { - for (int i = 0; i < 4; i++) - { - texture_free(&img_bsod_left[i]); - texture_free(&img_bsod_right[i]); - } - - texture_free(&img_bsod_squished_left[0]); - texture_free(&img_bsod_squished_right[0]); - - texture_free(&img_bsod_falling_left[0]); - texture_free(&img_bsod_falling_right[0]); - - for (int i = 0; i < 4; i++) - { - texture_free(&img_laptop_left[i]); - texture_free(&img_laptop_right[i]); - } - - texture_free(&img_laptop_flat_left[0]); - texture_free(&img_laptop_flat_right[0]); - - texture_free(&img_laptop_falling_left[0]); - texture_free(&img_laptop_falling_right[0]); - - for (int i = 0; i < 2; i++) - { - texture_free(&img_money_left[i]); - texture_free(&img_money_right[i]); - } - - for(int i = 0; i < 4; i++) { - texture_free(&img_mrbomb_left[i]); - texture_free(&img_mrbomb_right[i]); - } - - texture_free(&img_mrbomb_ticking_left[0]); - texture_free(&img_mrbomb_ticking_right[0]); - texture_free(&img_mrbomb_explosion[0]); - - texture_free(&img_stalactite[0]); - texture_free(&img_stalactite_broken[0]); - - texture_free(&img_flame[0]); - texture_free(&img_flame[1]); - - texture_free(&img_fish[0]); - texture_free(&img_fish[1]); - - for(int i=0; i<6; ++i) { - texture_free(&img_bouncingsnowball_left[i]); - texture_free(&img_bouncingsnowball_right[i]); - } - texture_free(&img_bouncingsnowball_squished[0]); - - texture_free(&img_flyingsnowball[0]); - texture_free(&img_flyingsnowball[1]); - texture_free(&img_flyingsnowball_squished[0]); - - for(int i = 0; i<3; ++i) { - texture_free(&img_spiky_left[i]); - texture_free(&img_spiky_right[i]); - } - for(int i = 0; i<4; ++i) { - texture_free(&img_snowball_left[i]); - texture_free(&img_snowball_right[i]); - } - texture_free(&img_snowball_squished_left[0]); - texture_free(&img_snowball_squished_right[0]); } // EOF //