// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <math.h>
-
+#include <iostream>
+#include <cassert>
#include "gameloop.h"
#include "globals.h"
#include "player.h"
#include "scene.h"
#include "tile.h"
#include "sprite.h"
-#include "screen.h"
+#include "sector.h"
+#include "tilemap.h"
+#include "camera.h"
+#include "gameobjs.h"
+#include "interactive_object.h"
+#include "screen/screen.h"
+
+// behavior definitions:
+#define TILES_FOR_BUTTJUMP 3
+// animation times (in ms):
+#define SHOOTING_TIME 320
+// others stuff:
+#define AUTOSCROLL_DEAD_INTERVAL 300
Surface* tux_life;
Sprite* smalltux_gameover;
Sprite* smalltux_star;
Sprite* largetux_star;
+Sprite* growingtux_left;
+Sprite* growingtux_right;
PlayerSprite smalltux;
PlayerSprite largetux;
+PlayerSprite icetux;
PlayerSprite firetux;
PlayerKeymap keymap;
PlayerKeymap::PlayerKeymap()
{
- keymap.jump = SDLK_UP;
+ keymap.jump = SDLK_SPACE;
+ keymap.activate = SDLK_UP;
keymap.duck = SDLK_DOWN;
keymap.left = SDLK_LEFT;
keymap.right = SDLK_RIGHT;
pplayer_input->old_fire = UP;
pplayer_input->right = UP;
pplayer_input->up = UP;
+ pplayer_input->old_up = UP;
+ pplayer_input->activate = UP;
+}
+
+Player::Player()
+{
+ init();
+}
+
+Player::~Player()
+{
}
void
Player::init()
{
- Level* plevel = World::current()->get_level();
-
holding_something = false;
base.width = 32;
base.height = 32;
size = SMALL;
- got_coffee = false;
+ got_power = NONE_POWER;
- base.x = plevel->start_pos_x;
- base.y = plevel->start_pos_y;
- base.xm = 0;
- base.ym = 0;
+ base.x = 0;
+ base.y = 0;
previous_base = old_base = base;
dir = RIGHT;
+ old_dir = dir;
duck = false;
+ dead = false;
dying = DYING_NOT;
+ last_ground_y = 0;
+ fall_mode = ON_GROUND;
jumping = false;
can_jump = true;
+ butt_jump = false;
frame_main = 0;
frame_ = 0;
safe_timer.init(true);
frame_timer.init(true);
kick_timer.init(true);
+ shooting_timer.init(true);
+ growing_timer.init(true);
physic.reset();
}
input.fire = state;
return true;
}
+ else if(key == keymap.activate)
+ {
+ input.activate = state;
+
+ if(state == DOWN) {
+ /** check for interactive objects */
+ for(Sector::InteractiveObjects::iterator i
+ = Sector::current()->interactive_objects.begin();
+ i != Sector::current()->interactive_objects.end(); ++i) {
+ if(rectcollision(base, (*i)->get_area())) {
+ (*i)->interaction(INTERACTION_ACTIVATE);
+ }
+ }
+ }
+
+ return true;
+ }
else
return false;
}
{
base.x = 100;
base.y = 170;
- base.xm = 0;
- base.ym = 0;
previous_base = old_base = base;
duck = false;
skidding_timer.init(true);
safe_timer.init(true);
frame_timer.init(true);
+ growing_timer.init(true);
physic.reset();
}
void
-Player::action(double frame_ratio)
+Player::action(float elapsed_time)
{
bool jumped_in_solid = false;
+ if(dying && !dying_timer.check()) {
+ dead = true;
+ return;
+ }
+
if (input.fire == UP)
holding_something = false;
if(dying == DYING_NOT)
handle_input();
- physic.apply(frame_ratio, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y);
if(dying == DYING_NOT)
{
collision_swept_object_map(&old_base, &base);
+ if ((!invincible_timer.started() && !safe_timer.started())
+ && (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)))
+ {
+ kill(SHRINK);
+ }
+
// Don't accelerate Tux if he is running against a wall
if (target.x != base.x)
{
if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y
&& collision_object_map(base))
{
- base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1);
+ base.x += elapsed_time * WALK_SPEED * (dir ? 1: -1);
previous_base = old_base = base;
}
- keep_in_bounds();
// Land:
if (!on_ground())
// fall down
physic.set_velocity_y(0);
jumped_in_solid = true;
+ jumping = false;
}
}
else
physic.enable_gravity(false);
/* Reset score multiplier (for multi-hits): */
- player_status.score_multiplier = 1;
+ if (!invincible_timer.started())
+ player_status.score_multiplier = 1;
}
if(jumped_in_solid)
if (isbrick(base.x, base.y) ||
isfullbox(base.x, base.y))
{
- World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE);
- World::current()->trybumpbadguy(base.x, base.y - 64);
+ Sector::current()->trygrabdistro(
+ Vector(base.x, base.y - 32), BOUNCE);
+ Sector::current()->trybumpbadguy(Vector(base.x, base.y - 64));
- World::current()->trybreakbrick(base.x, base.y, size == SMALL);
+ Sector::current()->trybreakbrick(
+ Vector(base.x, base.y), size == SMALL);
bumpbrick(base.x, base.y);
- World::current()->tryemptybox(base.x, base.y, RIGHT);
+ Sector::current()->tryemptybox(Vector(base.x, base.y), RIGHT);
}
if (isbrick(base.x+ 31, base.y) ||
isfullbox(base.x+ 31, base.y))
{
- World::current()->trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
- World::current()->trybumpbadguy(base.x+ 31, base.y - 64);
+ Sector::current()->trygrabdistro(
+ Vector(base.x+ 31, base.y - 32), BOUNCE);
+ Sector::current()->trybumpbadguy(Vector(base.x+ 31, base.y - 64));
if(size == BIG)
- World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL);
+ Sector::current()->trybreakbrick(
+ Vector(base.x+ 31, base.y), size == SMALL);
bumpbrick(base.x+ 31, base.y);
- World::current()->tryemptybox(base.x+ 31, base.y, LEFT);
+ Sector::current()->tryemptybox(Vector(base.x+ 31, base.y), LEFT);
}
}
{
return ( issolid(base.x + base.width / 2, base.y + base.height) ||
issolid(base.x + 1, base.y + base.height) ||
- issolid(base.x + base.width - 1, base.y + base.height) );
+ issolid(base.x + base.width - 1, base.y + base.height));
}
bool
issolid(base.x + base.width - 1, base.y) );
}
+bool
+Player::tiles_on_air(int tiles)
+{
+ for(int t = 0; t != tiles; t++)
+ {
+ if(issolid(base.x + base.width / 2, base.y + base.height + (tiles*32)) ||
+ issolid(base.x + 1, base.y + base.height + (tiles*32)) ||
+ issolid(base.x + base.width - 1, base.y + base.height + (tiles*32)))
+ return false;
+ }
+ return true;
+}
+
void
Player::handle_horizontal_input()
{
float dirsign = 0;
if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) {
+ old_dir = dir;
dir = LEFT;
dirsign = -1;
} else if(input.left == UP && input.right == DOWN && (!duck || physic.get_velocity_y() != 0)) {
+ old_dir = dir;
dir = RIGHT;
dirsign = 1;
}
void
Player::handle_vertical_input()
{
+ // set fall mode...
+ if(on_ground()) {
+ fall_mode = ON_GROUND;
+ last_ground_y = base.y;
+ } else {
+ if(base.y > last_ground_y)
+ fall_mode = FALLING;
+ else if(fall_mode == ON_GROUND)
+ fall_mode = JUMPING;
+ }
+
// Press jump key
- if(input.up == DOWN && can_jump)
+ if(input.up == DOWN && can_jump && on_ground())
{
- if (on_ground())
- {
- // jump higher if we are running
- if (physic.get_velocity_x() > MAX_WALK_XM)
- physic.set_velocity_y(5.8);
- else
- physic.set_velocity_y(5.2);
+ if(duck) { // only jump a little bit when in duck mode {
+ physic.set_velocity_y(3);
+ } else {
+ // jump higher if we are running
+ if (fabs(physic.get_velocity_x()) > MAX_WALK_XM)
+ physic.set_velocity_y(5.8);
+ else
+ physic.set_velocity_y(5.2);
+ }
- --base.y;
- jumping = true;
- can_jump = false;
- if (size == SMALL)
- play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
- else
- play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
- }
+ --base.y;
+ jumping = true;
+ can_jump = false;
+ if (size == SMALL)
+ play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+ else
+ play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
}
// Let go of jump key
- else if(input.up == UP && jumping)
+ else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
{
jumping = false;
- can_jump = true;
- if(physic.get_velocity_y() > 0) {
- physic.set_velocity_y(0);
+ physic.set_velocity_y(0);
+ }
+
+ /* In case the player has pressed Down while in a certain range of air,
+ enable butt jump action */
+ if (input.down == DOWN && !butt_jump)
+ if(tiles_on_air(TILES_FOR_BUTTJUMP) && jumping)
+ butt_jump = true;
+
+ /* When Down is not held anymore, disable butt jump */
+ if(butt_jump && input.down == UP)
+ butt_jump = false;
+
+ // Do butt jump
+ if (butt_jump && on_ground() && size == BIG)
+ {
+ butt_jump = false;
+
+ // Break bricks beneath Tux
+ if(Sector::current()->trybreakbrick(
+ Vector(base.x + 1, base.y + base.height), false)
+ || Sector::current()->trybreakbrick(
+ Vector(base.x + base.width - 1, base.y + base.height), false))
+ {
+ physic.set_velocity_y(2);
+ butt_jump = true;
+ }
+
+ // Kill nearby badguys
+ std::vector<GameObject*> gameobjects = Sector::current()->gameobjects;
+ for (std::vector<GameObject*>::iterator i = gameobjects.begin();
+ i != gameobjects.end();
+ i++)
+ {
+ BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
+ if(badguy)
+ {
+ if (fabsf(base.x - badguy->base.x) < 300 &&
+ fabsf(base.y - badguy->base.y) < 300 &&
+ (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
+ issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
+ badguy->kill_me(25);
}
}
+ }
+
+ if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) ||
+ issolid(base.x + 1, base.y + base.height + 64) ||
+ issolid(base.x + base.width - 1, base.y + base.height + 64))
+ && jumping == false
+ && can_jump == false
+ && input.up == DOWN
+ && input.old_up == UP)
+ {
+ can_jump = true;
+ }
+
+ if(on_ground()) /* Make sure jumping is off. */
+ jumping = false;
+
+ input.old_up = input.up;
}
void
if (on_ground() && input.up == UP)
can_jump = true;
- if (input.up == DOWN || (input.up == UP && jumping))
- {
- handle_vertical_input();
- }
+ handle_vertical_input();
/* Shoot! */
-
- if (input.fire == DOWN && input.old_fire == UP && got_coffee)
+ if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER)
{
- World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
+ if(Sector::current()->add_bullet(Vector(base.x, base.y + (base.height/2)),
+ physic.get_velocity_x(), dir))
+ shooting_timer.start(SHOOTING_TIME);
input.old_fire = DOWN;
}
// changing base size confuses collision otherwise
old_base = previous_base = base;
}
- else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0 && on_ground())
+ else if(input.down == UP && size == BIG && duck)
{
- duck = false;
+ // try if we can really unduck
base.y -= 32;
base.height = 64;
- // changing base size confuses collision otherwise
- old_base = previous_base = base;
+ // when unducking in air we need some space to do so
+ if(on_ground() || !collision_object_map(base)) {
+ duck = false;
+ // changing base size confuses collision otherwise
+ old_base = previous_base = base;
+ } else {
+ // undo the ducking changes
+ base.y += 32;
+ base.height = 32;
+ }
}
}
void
-Player::grow()
+Player::grow(bool animate)
{
if(size == BIG)
return;
base.height = 64;
base.y -= 32;
+ if(animate)
+ growing_timer.start((int)((growingtux_left->get_frames() / growingtux_left->get_fps()) * 1000));
+
old_base = previous_base = base;
}
/* Grab distros: */
if (!dying)
{
- World::current()->trygrabdistro(base.x, base.y, NO_BOUNCE);
- World::current()->trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
+ Sector::current()->trygrabdistro(Vector(base.x, base.y), NO_BOUNCE);
+ Sector::current()->trygrabdistro(Vector(base.x+ 31, base.y), NO_BOUNCE);
- World::current()->trygrabdistro(base.x, base.y + base.height, NO_BOUNCE);
- World::current()->trygrabdistro(base.x+ 31, base.y + base.height, NO_BOUNCE);
+ Sector::current()->trygrabdistro(
+ Vector(base.x, base.y + base.height), NO_BOUNCE);
+ Sector::current()->trygrabdistro(
+ Vector(base.x+ 31, base.y + base.height), NO_BOUNCE);
if(size == BIG)
{
- World::current()->trygrabdistro(base.x, base.y + base.height / 2, NO_BOUNCE);
- World::current()->trygrabdistro(base.x+ 31, base.y + base.height / 2, NO_BOUNCE);
+ Sector::current()->trygrabdistro(
+ Vector(base.x, base.y + base.height / 2), NO_BOUNCE);
+ Sector::current()->trygrabdistro(
+ Vector(base.x+ 31, base.y + base.height / 2), NO_BOUNCE);
}
}
}
void
-Player::draw()
+Player::draw(DrawingContext& context)
{
+ PlayerSprite* sprite;
+
+ if (size == SMALL)
+ sprite = &smalltux;
+ else if (got_power == FIRE_POWER)
+ sprite = &firetux;
+ else if (got_power == ICE_POWER)
+ sprite = &icetux;
+ else
+ sprite = &largetux;
+
+ int layer = LAYER_OBJECTS - 1;
+ Vector pos = Vector(base.x, base.y);
+
if (!safe_timer.started() || (global_frame_counter % 2) == 0)
{
if (dying == DYING_SQUISHED)
{
- smalltux_gameover->draw(base.x - scroll_x, base.y);
+ smalltux_gameover->draw(context, pos, LAYER_OBJECTS);
}
else
{
- PlayerSprite* sprite;
-
- if (size == SMALL)
- sprite = &smalltux;
- else if (got_coffee)
- sprite = &firetux;
- else
- sprite = &largetux;
-
- if (duck && size != SMALL)
+ if(growing_timer.check())
+ {
+ if (dir == RIGHT)
+ growingtux_right->draw(context, pos, layer);
+ else
+ growingtux_left->draw(context, pos, layer);
+ }
+ else if (duck && size != SMALL)
{
if (dir == RIGHT)
- sprite->duck_right->draw(base.x - scroll_x, base.y);
+ sprite->duck_right->draw(context, pos, layer);
else
- sprite->duck_left->draw(base.x - scroll_x, base.y);
+ sprite->duck_left->draw(context, pos, layer);
}
else if (skidding_timer.started())
{
if (dir == RIGHT)
- sprite->skid_right->draw(base.x - scroll_x, base.y);
+ sprite->skid_right->draw(context, pos, layer);
else
- sprite->skid_left->draw(base.x - scroll_x, base.y);
+ sprite->skid_left->draw(context, pos, layer);
}
else if (kick_timer.started())
{
if (dir == RIGHT)
- sprite->kick_right->draw(base.x - scroll_x, base.y);
+ sprite->kick_right->draw(context, pos, layer);
else
- sprite->kick_left->draw(base.x - scroll_x, base.y);
+ sprite->kick_left->draw(context, pos, layer);
}
else if (physic.get_velocity_y() != 0)
{
if (dir == RIGHT)
- sprite->jump_right->draw(base.x - scroll_x, base.y);
+ sprite->jump_right->draw(context, pos, layer);
else
- sprite->jump_left->draw(base.x - scroll_x, base.y);
+ sprite->jump_left->draw(context, pos, layer);
}
else
{
if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
{
if (dir == RIGHT)
- sprite->stand_right->draw( base.x - scroll_x, base.y);
+ sprite->stand_right->draw(context, pos, layer);
else
- sprite->stand_left->draw( base.x - scroll_x, base.y);
+ sprite->stand_left->draw(context, pos, layer);
}
else // moving
{
if (dir == RIGHT)
- sprite->walk_right->draw(base.x - scroll_x, base.y);
+ sprite->walk_right->draw(context, pos, layer);
else
- sprite->walk_left->draw(base.x - scroll_x, base.y);
+ sprite->walk_left->draw(context, pos, layer);
}
}
-
- // Draw arm overlay graphics when Tux is holding something
- if (holding_something && physic.get_velocity_y() == 0)
- {
- if (dir == RIGHT)
- sprite->grab_right->draw(base.x - scroll_x, base.y);
- else
- sprite->grab_left->draw(base.x - scroll_x, base.y);
- }
-
- // Draw blinking star overlay
- if (invincible_timer.started() && (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 2))
- {
- if (size == SMALL || duck)
- smalltux_star->draw(base.x - scroll_x, base.y);
- else
- largetux_star->draw(base.x - scroll_x, base.y);
- }
}
}
-
+
+ // Draw arm overlay graphics when Tux is holding something
+ if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck)
+ {
+ if (dir == RIGHT)
+ sprite->grab_right->draw(context, pos, LAYER_OBJECTS + 1);
+ else
+ sprite->grab_left->draw(context, pos, LAYER_OBJECTS + 1);
+ }
+
+ // Draw blinking star overlay
+ if (invincible_timer.started() &&
+ (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
+ {
+ if (size == SMALL || duck)
+ smalltux_star->draw(context, pos, LAYER_OBJECTS + 2);
+ else
+ largetux_star->draw(context, pos, LAYER_OBJECTS + 2);
+ }
+
if (debug_mode)
- fillrect(base.x - scroll_x, base.y,
- base.width, base.height, 75,75,75, 150);
+ context.draw_filled_rect(Vector(base.x, base.y),
+ Vector(base.width, base.height), Color(75,75,75, 150), LAYER_OBJECTS+1);
+}
+
+void
+Player::collision(const MovingObject& other, int collision_type)
+{
+ (void) other;
+ (void) collision_type;
+ // will be implemented later
}
void
Player::collision(void* p_c_object, int c_object)
{
BadGuy* pbad_c = NULL;
+ Trampoline* ptramp_c = NULL;
+ FlyingPlatform* pplatform_c = NULL;
switch (c_object)
{
kill(SHRINK);
}
else
- {
- pbad_c->dying = DYING_FALLING;
- play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
- World::current()->add_score(pbad_c->base.x - scroll_x,
- pbad_c->base.y,
- 25 * player_status.score_multiplier);
- }
+ pbad_c->kill_me(20);
}
+ else if (pbad_c->frozen_timer.check() && (pbad_c->kind == BAD_MRBOMB
+ || pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FISH
+ || pbad_c->kind == BAD_SPIKY))
+ pbad_c->kill_me(20);
else
{
if (!invincible_timer.started())
player_status.score_multiplier++;
}
break;
+
+ case CO_TRAMPOLINE:
+ ptramp_c = (Trampoline*) p_c_object;
+
+ // Pick up trampoline
+ if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something && on_ground())
+ {
+ holding_something = true;
+ ptramp_c->mode = Trampoline::M_HELD;
+ ptramp_c->base.y -= 8;
+ }
+ // Set down trampoline
+ else if (ptramp_c->mode == Trampoline::M_HELD && input.fire != DOWN)
+ {
+ holding_something = false;
+ ptramp_c->mode = Trampoline::M_NORMAL;
+ ptramp_c->base.y += 8;
+ ptramp_c->physic.set_velocity(physic.get_velocity_x(), physic.get_velocity_y());
+
+ //if (dir == RIGHT)
+ // ptramp_c->base.x = base.x + base.width+1;
+ //else /* LEFT */
+ // ptramp_c->base.x = base.x - base.width-1;
+ }
+/*
+ // Don't let tux walk through trampoline
+ else if (ptramp_c->mode != Trampoline::M_HELD && on_ground())
+ {
+ if (physic.get_velocity_x() > 0) // RIGHT
+ {
+ physic.set_velocity_x(0);
+ base.x = ptramp_c->base.x - base.width;
+ }
+ else if (physic.get_velocity_x() < 0) // LEFT
+ {
+ physic.set_velocity_x(0);
+ base.x = ptramp_c->base.x + ptramp_c->base.width;
+ }
+ }
+*/
+ break;
+ case CO_FLYING_PLATFORM:
+ pplatform_c = (FlyingPlatform*) p_c_object;
+
+ base.y = pplatform_c->base.y - base.height;
+ physic.set_velocity_x(pplatform_c->get_vel_x());
+
+ physic.enable_gravity(false);
+ can_jump = true;
+ fall_mode = ON_GROUND;
+ break;
+
default:
break;
}
void
Player::kill(HurtMode mode)
{
+ if(dying)
+ return;
+
play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
physic.set_velocity_x(0);
if (mode == SHRINK && size == BIG)
{
- if (got_coffee)
+ if (got_power != NONE_POWER)
{
- got_coffee = false;
+ got_power = NONE_POWER;
}
else
{
physic.enable_gravity(true);
physic.set_acceleration(0, 0);
physic.set_velocity(0, 7);
+ --player_status.lives;
dying = DYING_SQUISHED;
+ dying_timer.start(3000);
}
}
-void
-Player::is_dying()
-{
- remove_powerups();
- dying = DYING_NOT;
-}
-
-bool Player::is_dead()
-{
- if(base.y > screen->h)
- return true;
- else
- return false;
-}
-
/* Remove Tux's power ups */
void
Player::remove_powerups()
{
- got_coffee = false;
+ got_power = NONE_POWER;
size = SMALL;
base.height = 32;
}
void
-Player::keep_in_bounds()
+Player::move(const Vector& vector)
{
- Level* plevel = World::current()->get_level();
+ base.x = vector.x;
+ base.y = vector.y;
+ old_base = previous_base = base;
+}
+void
+Player::check_bounds(Camera* camera)
+{
/* Keep tux in bounds: */
if (base.x < 0)
{ // Lock Tux to the size of the level, so that he doesn't fall of
// on the left side
base.x = 0;
}
- else if (base.x < scroll_x)
- {
- base.x = scroll_x;
- }
/* Keep in-bounds, vertically: */
- if (base.y > screen->h)
+ if (base.y > Sector::current()->solids->get_height() * 32)
{
kill(KILL);
+ return;
}
- int scroll_threshold = screen->w/2 - 80;
- if (debug_mode)
- {
- scroll_x += screen->w/2;
- // Backscrolling for debug mode
- if (scroll_x < base.x - 80)
- scroll_x = base.x - 80;
- else if (scroll_x > base.x + 80)
- scroll_x = base.x + 80;
- scroll_x -= screen->w/2;
-
- if(scroll_x < 0)
- scroll_x = 0;
- }
- else
- {
- if (base.x > scroll_threshold + scroll_x
- && scroll_x < ((World::current()->get_level()->width * 32) - screen->w))
- {
- // FIXME: Scrolling needs to be handled by a seperate View
- // class, doing it as a player huck is ugly
-
- // Scroll the screen in past center:
- scroll_x = base.x - scroll_threshold;
-
- // Lock the scrolling to the levelsize, so that we don't
- // scroll over the right border
- if (scroll_x > 32 * plevel->width - screen->w)
- scroll_x = 32 * plevel->width - screen->w;
- }
+ bool adjust = false;
+ // can happen if back scrolling is disabled
+ if(base.x < camera->get_translation().x) {
+ base.x = camera->get_translation().x;
+ adjust = true;
+ }
+ if(base.x >= camera->get_translation().x + screen->w - base.width) {
+ base.x = camera->get_translation().x + screen->w - base.width;
+ adjust = true;
+ }
+
+ if(adjust) {
+ // squished now?
+ if(collision_object_map(base)) {
+ kill(KILL);
+ return;
}
+ }
}
-// EOF //
-
projects / supertux.git / blobdiff