#include "resources.h"
#include "sprite_manager.h"
-Sprite* img_bsod_squished_left;
-Sprite* img_bsod_squished_right;
-Sprite* img_bsod_falling_left;
-Sprite* img_bsod_falling_right;
Sprite* img_mriceblock_flat_left;
Sprite* img_mriceblock_flat_right;
Sprite* img_mriceblock_falling_left;
Sprite* img_mriceblock_falling_right;
-Sprite* img_bsod_left;
-Sprite* img_bsod_right;
Sprite* img_mriceblock_left;
Sprite* img_mriceblock_right;
Sprite* img_jumpy_left_up;
return BAD_JUMPY;
else if (str == "laptop" || str == "mriceblock") // was laptop in old maps
return BAD_MRICEBLOCK;
- else if (str == "bsod")
- return BAD_BSOD;
else if (str == "mrbomb")
return BAD_MRBOMB;
else if (str == "stalactite")
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
{
printf("Couldn't convert badguy: '%s'\n", str.c_str());
- return BAD_BSOD;
+ return BAD_SNOWBALL;
}
}
case BAD_MRICEBLOCK:
return "mriceblock";
break;
- case BAD_BSOD:
- return "bsod";
- break;
case BAD_MRBOMB:
return "mrbomb";
break;
return "snowball";
break;
default:
- return "bsod";
+ return "snowball";
}
}
physic.reset();
timer.init(true);
- if(kind == BAD_BSOD) {
- physic.set_velocity(-BADGUY_WALK_SPEED, 0);
- set_sprite(img_bsod_left, img_bsod_right);
- } else if(kind == BAD_MRBOMB) {
+ if(kind == BAD_MRBOMB) {
physic.set_velocity(-BADGUY_WALK_SPEED, 0);
set_sprite(img_mrbomb_left, img_mrbomb_right);
} else if (kind == BAD_MRICEBLOCK) {
}
// 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);
- }
-
- // Handle dying timer:
- if (dying == DYING_SQUISHED && !timer.check())
+ if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base))
{
- /* Remove it if time's up: */
- remove_me();
- return;
+ 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;
}
-
- // move
- physic.apply(frame_ratio, base.x, base.y);
- if(dying != DYING_FALLING)
- collision_swept_object_map(&old_base, &base);
}
void
-BadGuy::action_mriceblock(float frame_ratio)
+BadGuy::action_mriceblock(double frame_ratio)
{
Player& tux = *World::current()->get_tux();
- if(dying == DYING_NOT)
+ if(mode != HELD)
fall();
/* Move left/right: */
- if (mode == NORMAL || mode == KICK)
+ if (mode != HELD)
{
// move
physic.apply(frame_ratio, base.x, base.y);
if (!issolid(base.x + ((dir == LEFT) ? 0 : base.width),
base.y + base.height))
{
- physic.set_velocity_x(-physic.get_velocity_x());
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()));
+ }
}
}
}
}
void
-BadGuy::action_jumpy(float frame_ratio)
+BadGuy::action_jumpy(double frame_ratio)
{
- if (fabsf(physic.get_velocity_y()) < 2.5f)
+ 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 if (physic.get_velocity_y() < 0)
+ else
set_sprite(img_jumpy_left_up, img_jumpy_left_up);
- else
- set_sprite(img_jumpy_left_down, img_jumpy_left_down);
Player& tux = *World::current()->get_tux();
}
void
-BadGuy::action_mrbomb(float frame_ratio)
+BadGuy::action_mrbomb(double frame_ratio)
{
if (dying == DYING_NOT)
check_horizontal_bump(true);
}
void
-BadGuy::action_bomb(float frame_ratio)
+BadGuy::action_bomb(double frame_ratio)
{
static const int TICKINGTIME = 1000;
static const int EXPLODETIME = 1000;
}
void
-BadGuy::action_stalactite(float frame_ratio)
+BadGuy::action_stalactite(double frame_ratio)
{
Player& tux = *World::current()->get_tux();
}
void
-BadGuy::action_flame(float frame_ratio)
+BadGuy::action_flame(double frame_ratio)
{
static const float radius = 100;
static const float speed = 0.02;
}
void
-BadGuy::action_fish(float frame_ratio)
+BadGuy::action_fish(double frame_ratio)
{
static const float JUMPV = 6;
static const int WAITTIME = 1000;
}
void
-BadGuy::action_bouncingsnowball(float frame_ratio)
+BadGuy::action_bouncingsnowball(double frame_ratio)
{
static const float JUMPV = 4.5;
}
void
-BadGuy::action_flyingsnowball(float frame_ratio)
+BadGuy::action_flyingsnowball(double frame_ratio)
{
static const float FLYINGSPEED = 1;
static const int DIRCHANGETIME = 1000;
}
void
-BadGuy::action_spiky(float frame_ratio)
+BadGuy::action_spiky(double frame_ratio)
{
if (dying == DYING_NOT)
check_horizontal_bump();
}
void
-BadGuy::action_snowball(float frame_ratio)
+BadGuy::action_snowball(double frame_ratio)
{
if (dying == DYING_NOT)
check_horizontal_bump();
}
void
-BadGuy::action(float frame_ratio)
+BadGuy::action(double frame_ratio)
{
// Remove if it's far off the screen:
if (base.x < scroll_x - OFFSCREEN_DISTANCE)
switch (kind)
{
- case BAD_BSOD:
- action_bsod(frame_ratio);
- break;
-
case BAD_MRICEBLOCK:
action_mriceblock(frame_ratio);
break;
case BAD_SNOWBALL:
action_snowball(frame_ratio);
break;
+ default:
+ break;
}
}
BadGuy::bump()
{
// these can't be bumped
- if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH)
+ if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH
+ || kind == BAD_FLYINGSNOWBALL)
return;
-
+
+ physic.set_velocity_y(3);
kill_me(25);
}
remove_me();
return;
- } else if(kind == BAD_BSOD) {
- squish_me(player);
- set_sprite(img_bsod_squished_left, img_bsod_squished_right);
- physic.set_velocity_x(0);
- return;
-
} else if (kind == BAD_MRICEBLOCK) {
if (mode == NORMAL || mode == KICK)
{
}
mode = KICK;
+ player->kick_timer.start(KICKING_TIME);
set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
}
Player& tux = *World::current()->get_tux();
tux.holding_something = false;
}
- } else if(kind == BAD_BSOD) {
- set_sprite(img_bsod_falling_left, img_bsod_falling_right);
}
physic.enable_gravity(true);
- physic.set_velocity_y(0);
/* Gain some points: */
-// if (kind == BAD_BSOD)
World::current()->add_score(base.x - scroll_x, base.y,
score * player_status.score_multiplier);
-/* else
- World::current()->add_score(base.x - scroll_x, base.y,
- 25 * player_status.score_multiplier);*/
/* Play death sound: */
play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
// 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)
{
- Direction old_dir = dir;
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);
+ }
- if (dir != old_dir)
- physic.inverse_velocity_x();
- physic.set_velocity(fabs(physic.get_velocity_x()), 2);
break;
}
if (pbad_c->kind != BAD_FLAME)
{
- if (dir == LEFT)
- dir = RIGHT;
- else if (dir == RIGHT)
- dir = LEFT;
-
- physic.inverse_velocity_x();
+ if (dir == LEFT)
+ {
+ dir = RIGHT;
+ physic.set_velocity_x(fabsf(physic.get_velocity_x()));
+ }
+ else if (dir == RIGHT)
+ {
+ dir = LEFT;
+ physic.set_velocity_x(-fabsf(physic.get_velocity_x()));
+ }
+
}
}
}
mode = KICK;
+ player->kick_timer.start(KICKING_TIME);
set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
}
break;
void load_badguy_gfx()
{
- img_bsod_squished_left = sprite_manager->load("bsod-squished-left");
- img_bsod_squished_right = sprite_manager->load("bsod-squished-right");
- img_bsod_falling_left = sprite_manager->load("bsod-falling-left");
- img_bsod_falling_right = sprite_manager->load("bsod-falling-right");
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_bsod_left = sprite_manager->load("bsod-left");
- img_bsod_right = sprite_manager->load("bsod-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");
projects / supertux.git / blobdiff