+// $Id$
//
-// C Implementation: player/tux
+// SuperTux - A Jump'n Run
+// Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
//
-// Description:
+// 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.
//
+// 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.
//
-// Author: Tobias Glaesser <tobi.web@gmx.de> & Bill Kendrick, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-#include <math.h>
+// 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 <math.h>
+#include <iostream>
+#include <cassert>
#include "gameloop.h"
#include "globals.h"
#include "player.h"
#include "defines.h"
#include "scene.h"
#include "tile.h"
+#include "sprite.h"
#include "screen.h"
+#define AUTOSCROLL_DEAD_INTERVAL 300
+
Surface* tux_life;
-std::vector<Surface*> tux_right;
-std::vector<Surface*> tux_left;
-Surface* smalltux_jump_left;
-Surface* smalltux_jump_right;
-Surface* smalltux_stand_left;
-Surface* smalltux_stand_right;
-
-Surface* bigtux_right[3];
-Surface* bigtux_left[3];
-Surface* bigtux_right_jump;
-Surface* bigtux_left_jump;
-Surface* ducktux_right;
-Surface* ducktux_left;
-Surface* skidtux_right;
-Surface* skidtux_left;
-Surface* firetux_right[3];
-Surface* firetux_left[3];
-Surface* bigfiretux_right[3];
-Surface* bigfiretux_left[3];
-Surface* bigfiretux_right_jump;
-Surface* bigfiretux_left_jump;
-Surface* duckfiretux_right;
-Surface* duckfiretux_left;
-Surface* skidfiretux_right;
-Surface* skidfiretux_left;
-Surface* cape_right[2];
-Surface* cape_left[2];
-Surface* bigcape_right[2];
-Surface* bigcape_left[2];
+
+Sprite* smalltux_gameover;
+Sprite* smalltux_star;
+Sprite* largetux_star;
+
+PlayerSprite smalltux;
+PlayerSprite largetux;
+PlayerSprite icetux;
+PlayerSprite firetux;
+
+PlayerKeymap keymap;
+
+PlayerKeymap::PlayerKeymap()
+{
+ keymap.jump = SDLK_UP;
+ keymap.duck = SDLK_DOWN;
+ keymap.left = SDLK_LEFT;
+ keymap.right = SDLK_RIGHT;
+ keymap.fire = SDLK_LCTRL;
+}
void player_input_init(player_input_type* pplayer_input)
{
pplayer_input->old_fire = UP;
pplayer_input->right = UP;
pplayer_input->up = UP;
+ pplayer_input->old_up = UP;
}
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;
- // FIXME: Make the start position configurable via the levelfile
- base.x = 100;
- base.y = 240;
+ base.x = plevel->start_pos_x;
+ base.y = plevel->start_pos_y;
base.xm = 0;
base.ym = 0;
previous_base = old_base = base;
dir = RIGHT;
+ old_dir = dir;
duck = false;
dying = DYING_NOT;
jumping = false;
+ can_jump = true;
+ butt_jump = false;
frame_main = 0;
frame_ = 0;
player_input_init(&input);
- keymap.jump = SDLK_UP;
- keymap.duck = SDLK_DOWN;
- keymap.left = SDLK_LEFT;
- keymap.right = SDLK_RIGHT;
- keymap.fire = SDLK_LCTRL;
-
invincible_timer.init(true);
skidding_timer.init(true);
safe_timer.init(true);
frame_timer.init(true);
+ kick_timer.init(true);
physic.reset();
}
}
else if(key == keymap.fire)
{
+ if (state == UP)
+ input.old_fire = UP;
input.fire = state;
return true;
}
Player::level_begin()
{
base.x = 100;
- base.y = 240;
+ base.y = 170;
base.xm = 0;
base.ym = 0;
previous_base = old_base = base;
{
bool jumped_in_solid = false;
- /* --- HANDLE TUX! --- */
-
- if(dying == DYING_NOT)
- handle_input();
+ if (input.fire == UP)
+ holding_something = false;
/* Move tux: */
previous_base = base;
+ /* --- HANDLE TUX! --- */
+ if(dying == DYING_NOT)
+ handle_input();
+
physic.apply(frame_ratio, base.x, base.y);
- if(dying == DYING_NOT) {
+
+ if(dying == DYING_NOT)
+ {
+ base_type target = base;
+
collision_swept_object_map(&old_base, &base);
+
+ if (!invincible_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)
+ {
+ physic.set_velocity_x(0);
+ }
+
// special exception for cases where we're stuck under tiles after
// being ducked. In this case we drift out
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);
+ && collision_object_map(base))
+ {
+ base.x += frame_ratio * WALK_SPEED * (dir ? 1: -1);
previous_base = old_base = base;
- }
- keep_in_bounds();
- }
-
- if (dying == DYING_NOT)
- {
- /* Land: */
-
+ }
- if( !on_ground())
+ // Land:
+ if (!on_ground())
{
physic.enable_gravity(true);
if(under_solid())
{
// fall down
- physic.set_velocity(physic.get_velocity_x(), 0);
+ physic.set_velocity_y(0);
jumped_in_solid = true;
}
}
if (physic.get_velocity_y() < 0)
{
base.y = (int)(((int)base.y / 32) * 32);
- physic.set_velocity(physic.get_velocity_x(), 0);
+ physic.set_velocity_y(0);
}
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)
}
}
-
/* ---- DONE HANDLING TUX! --- */
- /* Handle invincibility timer: */
- if (get_current_music() == HERRING_MUSIC && !invincible_timer.check())
- {
- /*
- no, we are no more invincible
- or we were not in invincible mode
- but are we in hurry ?
- */
-
- // FIXME: Move this to gamesession
- if (GameSession::current()->time_left.get_left() < TIME_WARNING)
- {
- /* yes, we are in hurry
- stop the herring_song, prepare to play the correct
- fast level_song !
- */
- set_current_music(HURRYUP_MUSIC);
- }
- else
- {
- set_current_music(LEVEL_MUSIC);
- }
-
- /* start playing it */
- play_current_music();
- }
-
// check some timers
skidding_timer.check();
invincible_timer.check();
safe_timer.check();
+ kick_timer.check();
}
bool
float ay = physic.get_acceleration_y();
float dirsign = 0;
- if(!duck && input.left == DOWN && input.right == UP) {
+ if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) {
+ old_dir = dir;
dir = LEFT;
dirsign = -1;
- } else if(!duck && input.left == UP && input.right == DOWN) {
+ } 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()
{
- if(input.up == DOWN)
+ // Press jump key
+ if(input.up == DOWN && can_jump && on_ground())
{
- if (on_ground() && !duck)
- {
- // jump
- physic.set_velocity(physic.get_velocity_x(), 5.5);
- --base.y;
- jumping = true;
- if (size == SMALL)
- play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
- else
- play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
- }
+ 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);
}
- else if(input.up == UP && jumping)
+ // Let go of jump key
+ else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
{
jumping = false;
- if(physic.get_velocity_y() > 0) {
- physic.set_velocity(physic.get_velocity_x(), 0);
- }
+ physic.set_velocity_y(0);
+ }
+
+ if (input.down == DOWN && !on_ground() && !duck && size == BIG)
+ butt_jump = true;
+ else if (input.down == UP)
+ butt_jump = false;
+ if (input.down == DOWN && butt_jump && on_ground())
+ {
+ if(World::current()->trybreakbrick(base.x, base.y + base.height, false)
+ || World::current()->trybreakbrick(
+ base.x + base.width, base.y + base.height, false)) {
+ // make tux jumping a little bit again after breaking the bricks
+ physic.set_velocity_y(2);
+ }
+ butt_jump = false;
+ }
+
+ 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;
}
+
+ input.old_up = input.up;
}
void
/* Jump/jumping? */
- if ( input.up == DOWN || (input.up == UP && jumping))
- {
- handle_vertical_input();
- }
+ if (on_ground() && input.up == UP)
+ can_jump = true;
+ 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);
+ holding_something = true;
+ World::current()->add_bullet(base.x, base.y + (base.height/2), physic.get_velocity_x(), dir);
+ input.old_fire = DOWN;
}
/* tux animations: */
}
/* Duck! */
- if (input.down == DOWN && size == BIG && !duck)
+ if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0 && on_ground())
{
duck = true;
base.height = 32;
}
else if(input.down == UP && size == BIG && duck)
{
- duck = false;
+ // try if we can really unduck
base.y -= 32;
base.height = 64;
- 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()
+{
+ if(size == BIG)
+ return;
+
+ size = BIG;
+ base.height = 64;
+ base.y -= 32;
+
+ old_base = previous_base = base;
+}
+
+void
Player::grabdistros()
{
/* Grab distros: */
{
if (!safe_timer.started() || (global_frame_counter % 2) == 0)
{
- if (size == SMALL)
+ if (dying == DYING_SQUISHED)
+ {
+ smalltux_gameover->draw(base.x, base.y);
+ }
+ else
{
- if (invincible_timer.started())
+ 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;
+
+ if (duck && size != SMALL)
{
- /* Draw cape: */
-
if (dir == RIGHT)
- {
- cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
- }
- else
- {
- cape_left[global_frame_counter % 2]->draw(
- base.x- scroll_x, base.y);
- }
+ sprite->duck_right->draw(base.x, base.y);
+ else
+ sprite->duck_left->draw(base.x, base.y);
}
-
-
- if (!got_coffee)
+ else if (skidding_timer.started())
{
- if (physic.get_velocity_y() != 0)
- {
- if (dir == RIGHT)
- smalltux_jump_right->draw( base.x - scroll_x, base.y - 10);
- else
- smalltux_jump_left->draw( base.x - scroll_x, base.y - 10);
- }
+ if (dir == RIGHT)
+ sprite->skid_right->draw(base.x, base.y);
else
- {
- if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
- {
- if (dir == RIGHT)
- smalltux_stand_right->draw( base.x - scroll_x, base.y - 9);
- else
- smalltux_stand_left->draw( base.x - scroll_x, base.y - 9);
- }
- else // moving
- {
- if (dir == RIGHT)
- tux_right[(global_frame_counter/2) % tux_right.size()]->draw(
- base.x - scroll_x, base.y - 9);
- else
- tux_left[(global_frame_counter/2) % tux_left.size()]->draw(
- base.x - scroll_x, base.y - 9);
- }
- }
+ sprite->skid_left->draw(base.x, base.y);
}
- else
+ else if (kick_timer.started())
{
- /* Tux got coffee! */
-
if (dir == RIGHT)
- {
- firetux_right[frame_]->draw( base.x- scroll_x, base.y);
- }
+ sprite->kick_right->draw(base.x, base.y);
else
- {
- firetux_left[frame_]->draw( base.x- scroll_x, base.y);
- }
+ sprite->kick_left->draw(base.x, base.y);
}
- }
- else
- {
- if (invincible_timer.started())
+ else if (physic.get_velocity_y() != 0)
{
- float capex = base.x + (base.width - bigcape_right[0]->w) / 2;
- capex -= scroll_x;
- float capey = base.y + (base.height - bigcape_right[0]->h) / 2;
-
- /* Draw cape (just not in ducked mode since that looks silly): */
if (dir == RIGHT)
- {
- bigcape_right[global_frame_counter % 2]->draw(
- capex, capey);
- }
+ sprite->jump_right->draw(base.x, base.y);
else
- {
- bigcape_left[global_frame_counter % 2]->draw(
- capex, capey);
- }
+ sprite->jump_left->draw(base.x, base.y);
}
-
- if (!got_coffee)
+ else
{
- if (!duck)
+ if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
{
- if (!skidding_timer.started())
- {
- if (!jumping || physic.get_velocity_y() > 0)
- {
- if (dir == RIGHT)
- {
- bigtux_right[frame_]->draw(
- base.x- scroll_x - 8, base.y);
- }
- else
- {
- bigtux_left[frame_]->draw(
- base.x- scroll_x - 8, base.y);
- }
- }
- else
- {
- if (dir == RIGHT)
- {
- bigtux_right_jump->draw(
- base.x- scroll_x - 8, base.y);
- }
- else
- {
- bigtux_left_jump->draw(
- base.x- scroll_x - 8, base.y);
- }
- }
- }
+ if (dir == RIGHT)
+ sprite->stand_right->draw( base.x, base.y);
else
- {
- if (dir == RIGHT)
- {
- skidtux_right->draw(
- base.x- scroll_x - 8, base.y);
- }
- else
- {
- skidtux_left->draw(
- base.x- scroll_x - 8, base.y);
- }
- }
+ sprite->stand_left->draw( base.x, base.y);
}
- else
+ else // moving
{
if (dir == RIGHT)
- {
- ducktux_right->draw( base.x- scroll_x - 8, base.y - 16);
- }
+ sprite->walk_right->draw(base.x, base.y);
else
- {
- ducktux_left->draw( base.x- scroll_x - 8, base.y - 16);
- }
+ sprite->walk_left->draw(base.x, base.y);
}
}
- else
+
+ // Draw arm overlay graphics when Tux is holding something
+ if (holding_something && physic.get_velocity_y() == 0)
{
- /* Tux has coffee! */
- if (!duck)
- {
- if (!skidding_timer.started())
- {
- if (!jumping || physic.get_velocity_y() > 0)
- {
- if (dir == RIGHT)
- {
- bigfiretux_right[frame_]->draw(
- base.x- scroll_x - 8, base.y);
- }
- else
- {
- bigfiretux_left[frame_]->draw(
- base.x- scroll_x - 8, base.y);
- }
- }
- else
- {
- if (dir == RIGHT)
- {
- bigfiretux_right_jump->draw(
- base.x- scroll_x - 8, base.y);
- }
- else
- {
- bigfiretux_left_jump->draw(
- base.x- scroll_x - 8, base.y);
- }
- }
- }
- else
- {
- if (dir == RIGHT)
- {
- skidfiretux_right->draw(
- base.x- scroll_x - 8, base.y);
- }
- else
- {
- skidfiretux_left->draw(
- base.x- scroll_x - 8, base.y);
- }
- }
- }
+ if (dir == RIGHT)
+ sprite->grab_right->draw(base.x, base.y);
else
- {
- if (dir == RIGHT)
- {
- duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16);
- }
- else
- {
- duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16);
- }
- }
+ sprite->grab_left->draw(base.x, base.y);
}
- }
- }
+ // 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(base.x, base.y);
+ else
+ largetux_star->draw(base.x, base.y);
+ }
+ }
+ }
+
if (debug_mode)
- fillrect(base.x - scroll_x, base.y, 32, 32, 75,75,75, 150);
+ fillrect(base.x - scroll_x, base.y - scroll_y,
+ base.width, base.height, 75,75,75, 150);
}
void
Player::collision(void* p_c_object, int c_object)
{
BadGuy* pbad_c = NULL;
+ Trampoline* ptramp_c = NULL;
switch (c_object)
{
case CO_BADGUY:
pbad_c = (BadGuy*) p_c_object;
- /* Hurt the player if he just touched it: */
+ /* Hurt player if he touches a badguy */
if (!pbad_c->dying && !dying &&
!safe_timer.started() &&
- pbad_c->mode != HELD)
+ pbad_c->mode != BadGuy::HELD)
{
- if (pbad_c->mode == FLAT && input.fire == DOWN)
+ if (pbad_c->mode == BadGuy::FLAT && input.fire == DOWN
+ && !holding_something)
{
- pbad_c->mode = HELD;
+ holding_something = true;
+ pbad_c->mode = BadGuy::HELD;
pbad_c->base.y-=8;
}
- else if (pbad_c->mode == KICK)
+ else if (pbad_c->mode == BadGuy::FLAT)
+ {
+ // Don't get hurt if we're kicking a flat badguy!
+ }
+ else if (pbad_c->mode == BadGuy::KICK)
{
- if (base.y < pbad_c->base.y - 16)
+ /* Hurt if you get hit by kicked laptop: */
+ if (!invincible_timer.started())
{
- /* Step on (stop being kicked) */
-
- pbad_c->mode = FLAT;
- play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
+ kill(SHRINK);
}
else
- {
- /* Hurt if you get hit by kicked laptop: */
- if (!invincible_timer.started())
- {
- 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())
}
else
{
- pbad_c->kill_me();
+ pbad_c->kill_me(25);
}
}
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;
+
default:
break;
}
/* Kill Player! */
void
-Player::kill(int mode)
+Player::kill(HurtMode mode)
{
play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
- physic.set_velocity(0, physic.get_velocity_y());
+ physic.set_velocity_x(0);
if (mode == SHRINK && size == BIG)
{
- if (got_coffee)
- got_coffee = false;
-
- size = SMALL;
- base.height = 32;
- duck = false;
-
+ if (got_power != NONE_POWER)
+ {
+ got_power = NONE_POWER;
+ }
+ else
+ {
+ size = SMALL;
+ base.height = 32;
+ duck = false;
+ }
safe_timer.start(TUX_SAFE_TIME);
}
else
physic.enable_gravity(true);
physic.set_acceleration(0, 0);
physic.set_velocity(0, 7);
+ if(dying != DYING_SQUISHED)
+ --player_status.lives;
dying = DYING_SQUISHED;
}
}
bool Player::is_dead()
{
- if(base.y > screen->h)
+ if(base.y > screen->h + scroll_y || base.y > World::current()->get_level()->height*32 ||
+ base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL) // can happen in auto-scrolling
return true;
else
return false;
void
Player::remove_powerups()
{
- got_coffee = false;
+ got_power = NONE_POWER;
size = SMALL;
base.height = 32;
}
void
-Player::keep_in_bounds()
+Player::check_bounds(bool back_scrolling, bool hor_autoscroll)
{
- Level* plevel = World::current()->get_level();
-
/* 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 > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
{
kill(KILL);
}
- 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_x && (!back_scrolling || hor_autoscroll)) // can happen if back scrolling is disabled
+ base.x = scroll_x;
+
+ if(hor_autoscroll)
{
- 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;
- }
+ if(base.x == scroll_x)
+ if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
+ kill(KILL);
+
+ if(base.x + base.width > scroll_x + screen->w)
+ base.x = scroll_x + screen->w - base.width;
}
+
}
// EOF //