#include "supertux/sector.hpp"
namespace{
- static const float WALK_SPEED = 100;
+ static const float CAPTAIN_WALK_SPEED = 100;
static const float BOARDING_SPEED = 200;
}
x1 = bbox.p2.x + 1;
x2 = bbox.p2.x + width;
}
- return ((!Sector::current()->is_free_of_statics(Rect(x1, y1a, x2, y2a))) && (Sector::current()->is_free_of_statics(Rect(x1, y1b, x2, y2b))));
+ return ((!Sector::current()->is_free_of_statics(Rectf(x1, y1a, x2, y2a))) &&
+ (Sector::current()->is_free_of_statics(Rectf(x1, y1b, x2, y2b))));
}
void
CaptainSnowball::collision_solid(const CollisionHit& hit)
{
if (is_active() && (walk_speed == BOARDING_SPEED)) {
- walk_speed = WALK_SPEED;
+ walk_speed = CAPTAIN_WALK_SPEED;
physic.set_velocity_x(dir == LEFT ? -walk_speed : walk_speed);
}
WalkingBadguy::collision_solid(hit);