// Copyright: See COPYING file that comes with this distribution
//
//
+#include <math.h>
#include "gameloop.h"
#include "globals.h"
#include "player.h"
#include "defines.h"
#include "scene.h"
+#include "tile.h"
#include "screen.h"
-texture_type tux_life,
-tux_right[3], tux_left[3],
-bigtux_right[3], bigtux_left[3],
-bigtux_right_jump, bigtux_left_jump,
-ducktux_right, ducktux_left,
-skidtux_right, skidtux_left,
-firetux_right[3], firetux_left[3],
-bigfiretux_right[3], bigfiretux_left[3],
-bigfiretux_right_jump, bigfiretux_left_jump,
-duckfiretux_right, duckfiretux_left,
-skidfiretux_right, skidfiretux_left,
-cape_right[2], cape_left[2],
-bigcape_right[2], bigcape_left[2];
+texture_type tux_life;
+std::vector<texture_type> tux_right;
+std::vector<texture_type> tux_left;
+texture_type smalltux_jump_left;
+texture_type smalltux_jump_right;
+texture_type smalltux_stand_left;
+texture_type smalltux_stand_right;
+
+texture_type bigtux_right[3];
+texture_type bigtux_left[3];
+texture_type bigtux_right_jump;
+texture_type bigtux_left_jump;
+texture_type ducktux_right;
+texture_type ducktux_left;
+texture_type skidtux_right;
+texture_type skidtux_left;
+texture_type firetux_right[3];
+texture_type firetux_left[3];
+texture_type bigfiretux_right[3];
+texture_type bigfiretux_left[3];
+texture_type bigfiretux_right_jump;
+texture_type bigfiretux_left_jump;
+texture_type duckfiretux_right;
+texture_type duckfiretux_left;
+texture_type skidfiretux_right;
+texture_type skidfiretux_left;
+texture_type cape_right[2];
+texture_type cape_left[2];
+texture_type bigcape_right[2];
+texture_type bigcape_left[2];
void player_input_init(player_input_type* pplayer_input)
{
pplayer_input->up = UP;
}
-void player_init(player_type* pplayer)
+void
+Player::init()
{
- pplayer->base.width = 32;
- pplayer->base.height = 32;
-
- pplayer->size = SMALL;
- pplayer->got_coffee = false;
-
- pplayer->base.x = 0;
- pplayer->base.y = 240;
- pplayer->base.xm = 0;
- pplayer->base.ym = 0;
- pplayer->old_base = pplayer->base;
- pplayer->dir = RIGHT;
- pplayer->duck = false;
-
- pplayer->dying = DYING_NOT;
- pplayer->jumping = false;
-
- pplayer->frame_main = 0;
- pplayer->frame = 0;
- pplayer->lives = 3;
- pplayer->score = 0;
- pplayer->distros = 0;
-
- player_input_init(&pplayer->input);
-
- pplayer->keymap.jump = SDLK_UP;
- pplayer->keymap.duck = SDLK_DOWN;
- pplayer->keymap.left = SDLK_LEFT;
- pplayer->keymap.right = SDLK_RIGHT;
- pplayer->keymap.fire = SDLK_LCTRL;
-
- timer_init(&pplayer->invincible_timer,true);
- timer_init(&pplayer->skidding_timer,true);
- timer_init(&pplayer->safe_timer,true);
- timer_init(&pplayer->frame_timer,true);
- physic_init(&pplayer->hphysic);
- physic_init(&pplayer->vphysic);
+ base.width = 32;
+ base.height = 32;
+
+ size = SMALL;
+ got_coffee = false;
+
+ // FIXME: Make the start position configurable via the levelfile
+ base.x = 100;
+ base.y = 240;
+ base.xm = 0;
+ base.ym = 0;
+ old_base = base;
+ dir = RIGHT;
+ duck = false;
+
+ dying = DYING_NOT;
+ jumping = false;
+
+ frame_main = 0;
+ frame_ = 0;
+ lives = 3;
+ score = 0;
+ distros = 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);
+
+ physic.reset();
}
-int player_key_event(player_type* pplayer, SDLKey key, int state)
+int
+Player::key_event(SDLKey key, int state)
{
- if(key == pplayer->keymap.right)
+ if(key == keymap.right)
{
- pplayer->input.right = state;
+ input.right = state;
return true;
}
- else if( key == pplayer->keymap.left)
+ else if(key == keymap.left)
{
- pplayer->input.left = state;
+ input.left = state;
return true;
}
- else if(key == pplayer->keymap.jump)
+ else if(key == keymap.jump)
{
- pplayer->input.up = state;
+ input.up = state;
return true;
}
- else if(key == pplayer->keymap.duck)
+ else if(key == keymap.duck)
{
- pplayer->input.down = state;
+ input.down = state;
return true;
}
- else if(key == pplayer->keymap.fire)
+ else if(key == keymap.fire)
{
- pplayer->input.fire = state;
+ input.fire = state;
return true;
}
else
return false;
}
-void player_level_begin(player_type* pplayer)
+void
+Player::level_begin()
{
- pplayer->base.x = 0;
- pplayer->base.y = 240;
- pplayer->base.xm = 0;
- pplayer->base.ym = 0;
- pplayer->old_base = pplayer->base;
-
- player_input_init(&pplayer->input);
-
- timer_init(&pplayer->invincible_timer,true);
- timer_init(&pplayer->skidding_timer,true);
- timer_init(&pplayer->safe_timer,true);
- timer_init(&pplayer->frame_timer,true);
- physic_init(&pplayer->hphysic);
- physic_init(&pplayer->vphysic);
+ base.x = 100;
+ base.y = 240;
+ base.xm = 0;
+ base.ym = 0;
+ old_base = base;
+ previous_base = base;
+
+ dying = DYING_NOT;
+
+ player_input_init(&input);
+
+ invincible_timer.init(true);
+ skidding_timer.init(true);
+ safe_timer.init(true);
+ frame_timer.init(true);
+
+ physic.reset();
}
-void player_action(player_type* pplayer)
+void
+Player::action(double frame_ratio)
{
bool jumped_in_solid = false;
/* --- HANDLE TUX! --- */
- player_input(pplayer);
+ if(!dying)
+ handle_input();
/* Move tux: */
+ previous_base = base;
- pplayer->previous_base = pplayer->base;
-
- pplayer->base.x += pplayer->base.xm * frame_ratio;
- pplayer->base.y += pplayer->base.ym * frame_ratio;
+ physic.apply(frame_ratio, base.x, base.y);
- collision_swept_object_map(&pplayer->old_base,&pplayer->base);
-
- player_keep_in_bounds(pplayer);
+ if (!dying)
+ {
- /* Land: */
+ collision_swept_object_map(&old_base,&base);
+ keep_in_bounds();
- if (!pplayer->dying)
- {
+ /* Land: */
- if( !player_on_ground(pplayer))
+ if( !on_ground())
{
- if(player_under_solid(pplayer))
+ physic.enable_gravity(true);
+ if(under_solid())
{
- physic_set_state(&pplayer->vphysic,PH_VT);
- physic_set_start_vy(&pplayer->vphysic,0);
+ // fall down
+ physic.set_velocity(physic.get_velocity_x(), 0);
jumped_in_solid = true;
}
- else
- {
- if(!physic_is_set(&pplayer->vphysic))
- {
- physic_set_state(&pplayer->vphysic,PH_VT);
- physic_set_start_vy(&pplayer->vphysic,0);
- }
- }
- pplayer->base.ym = physic_get_velocity(&pplayer->vphysic);
-
}
else
{
-
/* Land: */
-
- if (pplayer->base.ym > 0)
+ if (physic.get_velocity_y() < 0)
{
- pplayer->base.y = (int)(((int)pplayer->base.y / 32) * 32);
- pplayer->base.ym = 0;
+ base.y = (int)(((int)base.y / 32) * 32);
+ physic.set_velocity(physic.get_velocity_x(), 0);
}
- physic_init(&pplayer->vphysic);
-
+ physic.enable_gravity(false);
/* Reset score multiplier (for multi-hits): */
-
- score_multiplier = 1;
+ player_status.score_multiplier = 1;
}
- if(jumped_in_solid == true)
+ if(jumped_in_solid)
{
-
- if (isbrick(pplayer->base.x, pplayer->base.y) ||
- isfullbox(pplayer->base.x, pplayer->base.y))
+ if (isbrick(base.x, base.y) ||
+ isfullbox(base.x, base.y))
{
- trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
- trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
+ World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE);
+ World::current()->trybumpbadguy(base.x, base.y - 64);
- if(pplayer->size == BIG)
- trybreakbrick(pplayer->base.x, pplayer->base.y);
+ World::current()->trybreakbrick(base.x, base.y, size == SMALL);
- bumpbrick(pplayer->base.x, pplayer->base.y);
- tryemptybox(pplayer->base.x, pplayer->base.y, RIGHT);
+ bumpbrick(base.x, base.y);
+ World::current()->tryemptybox(base.x, base.y, RIGHT);
}
- if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
- isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+ if (isbrick(base.x+ 31, base.y) ||
+ isfullbox(base.x+ 31, base.y))
{
- trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32,BOUNCE);
- trybumpbadguy(pplayer->base.x+ 31, pplayer->base.y - 64);
+ World::current()->trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
+ World::current()->trybumpbadguy(base.x+ 31, base.y - 64);
- if(pplayer->size == BIG)
- trybreakbrick(pplayer->base.x+ 31, pplayer->base.y);
+ if(size == BIG)
+ World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL);
- bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
- tryemptybox(pplayer->base.x+ 31, pplayer->base.y, LEFT);
- }
-
-
- if(pplayer->size == SMALL)
- {
- /* Get a distro from a brick? */
-
- if (shape(pplayer->base.x, pplayer->base.y) == 'x' ||
- shape(pplayer->base.x, pplayer->base.y) == 'y')
- {
- add_bouncy_distro((((int)pplayer->base.x)
- / 32) * 32,
- ((int)pplayer->base.y / 32) * 32);
- if (counting_distros == false)
- {
- counting_distros = true;
- distro_counter = 100;
- }
-
- if (distro_counter <= 0)
- level_change(¤t_level,pplayer->base.x,pplayer->base.y - 1, 'a');
-
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
- score = score + SCORE_DISTRO;
- distros++;
- }
- else if (shape(pplayer->base.x+ 31, pplayer->base.y) == 'x' ||
- shape(pplayer->base.x+ 31, pplayer->base.y) == 'y')
- {
- add_bouncy_distro((((int)pplayer->base.x + 31)
- / 32) * 32,
- ((int)pplayer->base.y / 32) * 32);
- if (counting_distros == false)
- {
- counting_distros = true;
- distro_counter = 100;
- }
-
- if (distro_counter <= 0)
- level_change(¤t_level,pplayer->base.x+ 31, pplayer->base.y, 'a');
-
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
- score = score + SCORE_DISTRO;
- distros++;
- }
+ bumpbrick(base.x+ 31, base.y);
+ World::current()->tryemptybox(base.x+ 31, base.y, LEFT);
}
}
- player_grabdistros(pplayer);
- if(jumped_in_solid == true)
+ grabdistros();
+
+ if (jumped_in_solid)
{
- ++pplayer->base.y;
- ++pplayer->old_base.y;
- if(player_on_ground(pplayer))
+ ++base.y;
+ ++old_base.y;
+ if(on_ground())
{
/* Make sure jumping is off. */
- pplayer->jumping = false;
+ jumping = false;
}
}
}
- timer_check(&pplayer->safe_timer);
+ safe_timer.check();
/* ---- DONE HANDLING TUX! --- */
/* Handle invincibility timer: */
-
-
- if (get_current_music() == HERRING_MUSIC && !timer_check(&pplayer->invincible_timer))
+ if (get_current_music() == HERRING_MUSIC && !invincible_timer.check())
{
/*
no, we are no more invincible
but are we in hurry ?
*/
-
- if (timer_get_left(&time_left) < TIME_WARNING)
+ // 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
/* Handle skidding: */
- timer_check(&pplayer->skidding_timer);
+ // timer_check(&skidding_timer); // disabled
/* End of level? */
-
- if (pplayer->base.x >= endpos && endpos != 0)
+ if (base.x >= World::current()->get_level()->endpos
+ && World::current()->get_level()->endpos != 0)
{
- next_level = 1;
+ player_status.next_level = 1;
}
}
-bool player_on_ground(player_type *pplayer)
+bool
+Player::on_ground()
{
- return ( issolid(pplayer->base.x + pplayer->base.width / 2, pplayer->base.y + pplayer->base.height) ||
- issolid(pplayer->base.x + 1, pplayer->base.y + pplayer->base.height) ||
- issolid(pplayer->base.x + pplayer->base.width - 1, pplayer->base.y + pplayer->base.height) );
+ 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) );
}
-bool player_under_solid(player_type *pplayer)
+bool
+Player::under_solid()
{
- return ( issolid(pplayer->base.x + pplayer->base.width / 2, pplayer->base.y) ||
- issolid(pplayer->base.x + 1, pplayer->base.y) ||
- issolid(pplayer->base.x + pplayer->base.width - 1, pplayer->base.y) );
+ return ( issolid(base.x + base.width / 2, base.y) ||
+ issolid(base.x + 1, base.y) ||
+ issolid(base.x + base.width - 1, base.y) );
}
-void player_handle_horizontal_input(player_type *pplayer, int dir)
+void
+Player::handle_horizontal_input(int newdir)
{
+ if(duck)
+ return;
- if ((dir ? (pplayer->base.xm < -SKID_XM) : (pplayer->base.xm > SKID_XM)) && !timer_started(&pplayer->skidding_timer) &&
- pplayer->dir == !dir && player_on_ground(pplayer))
- {
- timer_start(&pplayer->skidding_timer, SKID_TIME);
+ float vx = physic.get_velocity_x();
+ float vy = physic.get_velocity_y();
+ dir = newdir;
+ // skid if we're too fast
+ if(dir != newdir && on_ground() && fabs(physic.get_velocity_x()) > SKID_XM
+ && !skidding_timer.started())
+ {
+ skidding_timer.start(SKID_TIME);
play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
-
+ return;
}
- pplayer->dir = dir;
-
- if ((dir ? (pplayer->base.xm < 0) : (pplayer->base.xm > 0)) && !isice(pplayer->base.x, pplayer->base.y + pplayer->base.height) &&
- !timer_started(&pplayer->skidding_timer))
+ if ((newdir ? (vx < 0) : (vx > 0)) && !isice(base.x, base.y + base.height) &&
+ !skidding_timer.started())
{
- pplayer->base.xm = 0;
+ //vx = 0;
}
- if (!pplayer->duck)
+ /* Facing the direction we're jumping? Go full-speed: */
+ if (input.fire == UP)
{
- if (pplayer->dir == dir)
+ if(vx >= MAX_WALK_XM) {
+ vx = MAX_WALK_XM;
+ physic.set_acceleration(0, 0); // enough speedup
+ } else if(vx <= -MAX_WALK_XM) {
+ vx = -MAX_WALK_XM;
+ physic.set_acceleration(0, 0);
+ }
+ physic.set_acceleration(newdir ? 0.02 : -0.02, 0);
+ if(fabs(vx) < 1) // set some basic run speed
+ vx = newdir ? 1 : -1;
+#if 0
+ vx += ( newdir ? WALK_SPEED : -WALK_SPEED) * frame_ratio;
+
+ if(newdir)
{
- /* Facing the direction we're jumping? Go full-speed: */
-
- if (pplayer->input.fire == UP)
- {
- pplayer->base.xm = pplayer->base.xm + ( dir ? WALK_SPEED : -WALK_SPEED) * frame_ratio;
-
- if(dir)
- {
- if (pplayer->base.xm > MAX_WALK_XM)
- pplayer->base.xm = MAX_WALK_XM;
- }
- else
- {
- if (pplayer->base.xm < -MAX_WALK_XM)
- pplayer->base.xm = -MAX_WALK_XM;
- }
- }
- else if ( pplayer->input.fire == DOWN)
- {
- pplayer->base.xm = pplayer->base.xm + ( dir ? RUN_SPEED : -RUN_SPEED) * frame_ratio;
-
- if(dir)
- {
- if (pplayer->base.xm > MAX_RUN_XM)
- pplayer->base.xm = MAX_RUN_XM;
- }
- else
- {
- if (pplayer->base.xm < -MAX_RUN_XM)
- pplayer->base.xm = -MAX_RUN_XM;
- }
- }
- else
- {
- /* Not facing the direction we're jumping?
- Go half-speed: */
-
- pplayer->base.xm = pplayer->base.xm + ( dir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio;
-
- if(dir)
- {
- if (pplayer->base.xm > MAX_WALK_XM / 2)
- pplayer->base.xm = MAX_WALK_XM / 2;
- }
- else
- {
- if (pplayer->base.xm < -MAX_WALK_XM / 2)
- pplayer->base.xm = -MAX_WALK_XM / 2;
- }
- }
+ if (vx > MAX_WALK_XM)
+ vx = MAX_WALK_XM;
}
-
+ else
+ {
+ if (vx < -MAX_WALK_XM)
+ vx = -MAX_WALK_XM;
+ }
+#endif
}
-}
-
-void player_handle_vertical_input(player_type *pplayer)
-{
- if(pplayer->input.up == DOWN)
+ else if ( input.fire == DOWN)
{
- if (player_on_ground(pplayer))
+ if(vx >= MAX_RUN_XM) {
+ vx = MAX_RUN_XM;
+ physic.set_acceleration(0, 0); // enough speedup
+ } else if(vx <= -MAX_RUN_XM) {
+ vx = -MAX_RUN_XM;
+ physic.set_acceleration(0, 0);
+ }
+ physic.set_acceleration(newdir ? 0.03 : -0.03, 0);
+ if(fabs(vx) < 1) // set some basic run speed
+ vx = newdir ? 1 : -1;
+
+#if 0
+ vx = vx + ( newdir ? RUN_SPEED : -RUN_SPEED) * frame_ratio;
+
+ if(newdir)
{
- if(!physic_is_set(&pplayer->vphysic))
- {
- physic_set_state(&pplayer->vphysic,PH_VT);
- physic_set_start_vy(&pplayer->vphysic,5.5);
- --pplayer->base.y;
- pplayer->jumping = true;
- if (pplayer->size == SMALL)
- play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
- else
- play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
- }
+ if (vx > MAX_RUN_XM)
+ vx = MAX_RUN_XM;
}
+ else
+ {
+ if (vx < -MAX_RUN_XM)
+ vx = -MAX_RUN_XM;
+ }
+#endif
}
- else if(pplayer->input.up == UP && pplayer->jumping == true)
+ else
{
- if (player_on_ground(pplayer))
+#if 0
+ /* Not facing the direction we're jumping?
+ Go half-speed: */
+ vx = vx + ( newdir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio;
+
+ if(newdir)
{
- physic_init(&pplayer->vphysic);
- pplayer->jumping = false;
+ if (vx > MAX_WALK_XM / 2)
+ vx = MAX_WALK_XM / 2;
}
else
{
- pplayer->jumping = false;
- if(physic_is_set(&pplayer->vphysic))
- {
- if(physic_get_velocity(&pplayer->vphysic) < 0.)
- {
- physic_set_state(&pplayer->vphysic,PH_VT);
- physic_set_start_vy(&pplayer->vphysic,0);
- }
- }
+ if (vx < -MAX_WALK_XM / 2)
+ vx = -MAX_WALK_XM / 2;
+ }
+#endif
+ }
+
+ physic.set_velocity(vx, vy);
+}
+
+void
+Player::handle_vertical_input()
+{
+ if(input.up == DOWN)
+ {
+ if (on_ground())
+ {
+ // 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
- {
- if(!physic_is_set(&pplayer->vphysic))
- {
- physic_set_state(&pplayer->vphysic,PH_VT);
- }
- }
+ play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
}
}
+ else if(input.up == UP && jumping)
+ {
+ jumping = false;
+ if(physic.get_velocity_y() > 0) {
+ physic.set_velocity(physic.get_velocity_x(), 0);
+ }
+ }
}
-void player_input(player_type *pplayer)
+void
+Player::handle_input()
{
/* Handle key and joystick state: */
-
- if(pplayer->duck == false)
+ if(duck == false)
{
- if (pplayer->input.right == DOWN && pplayer->input.left == UP)
+ if (input.right == DOWN && input.left == UP)
{
- player_handle_horizontal_input(pplayer,RIGHT);
+ handle_horizontal_input(RIGHT);
}
- else if (pplayer->input.left == DOWN && pplayer->input.right == UP)
+ else if (input.left == DOWN && input.right == UP)
{
- player_handle_horizontal_input(pplayer,LEFT);
+ handle_horizontal_input(LEFT);
}
else
{
- if(pplayer->base.xm > 0)
- {
- pplayer->base.xm = (int)(pplayer->base.xm - frame_ratio);
- if(pplayer->base.xm < 0)
- pplayer->base.xm = 0;
- }
- else if(pplayer->base.xm < 0)
- {
- pplayer->base.xm = (int)(pplayer->base.xm + frame_ratio);
- if(pplayer->base.xm > 0)
- pplayer->base.xm = 0;
- }
+ float vx = physic.get_velocity_x();
+ if(fabs(vx) < 0.01) {
+ physic.set_velocity(0, physic.get_velocity_y());
+ physic.set_acceleration(0, 0);
+ } else if(vx < 0) {
+ physic.set_acceleration(0.1, 0);
+ } else {
+ physic.set_acceleration(-0.1, 0);
+ }
}
}
/* Jump/jumping? */
- if ( pplayer->input.up == DOWN || (pplayer->input.up == UP && pplayer->jumping == true))
+ if ( input.up == DOWN || (input.up == UP && jumping))
{
- player_handle_vertical_input(pplayer);
+ handle_vertical_input();
}
/* Shoot! */
- if (pplayer->input.fire == DOWN && pplayer->input.old_fire == UP && pplayer->got_coffee)
+ if (input.fire == DOWN && input.old_fire == UP && got_coffee)
{
- add_bullet(pplayer->base.x, pplayer->base.y, pplayer->base.xm, pplayer->dir);
+ World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
}
/* Duck! */
- if (pplayer->input.down == DOWN)
+ if (input.down == DOWN)
{
- if (pplayer->size == BIG && pplayer->duck != true)
+ if (size == BIG && duck != true)
{
- pplayer->duck = true;
- pplayer->base.height = 32;
- pplayer->base.y += 32;
+ duck = true;
+ base.height = 32;
+ base.y += 32;
}
}
else
{
- if (pplayer->size == BIG && pplayer->duck == true)
+ if (size == BIG && duck)
{
/* Make sure we're not standing back up into a solid! */
- pplayer->base.height = 64;
- pplayer->base.y -= 32;
+ base.height = 64;
+ base.y -= 32;
- if (!collision_object_map(&pplayer->base) /*issolid(pplayer->base.x + 16, pplayer->base.y - 16)*/)
+ if (!collision_object_map(&base) /*issolid(base.x + 16, base.y - 16)*/)
{
- pplayer->duck = false;
- pplayer->base.height = 64;
- pplayer->old_base.y -= 32;
- pplayer->old_base.height = 64;
+ duck = false;
+ base.height = 64;
+ old_base.y -= 32;
+ old_base.height = 64;
}
else
{
- pplayer->base.height = 32;
- pplayer->base.y += 32;
+ base.height = 32;
+ base.y += 32;
}
}
else
{
- pplayer->duck = false;
+ duck = false;
}
}
/* (Tux): */
- if(!timer_check(&pplayer->frame_timer))
+ if(!frame_timer.check())
{
- timer_start(&pplayer->frame_timer,25);
- if (pplayer->input.right == UP && pplayer->input.left == UP)
+ frame_timer.start(25);
+ if (input.right == UP && input.left == UP)
{
- pplayer->frame_main = 1;
- pplayer->frame = 1;
+ frame_main = 1;
+ frame_ = 1;
}
else
{
- if ((pplayer->input.fire == DOWN && (frame % 2) == 0) ||
- (frame % 4) == 0)
- pplayer->frame_main = (pplayer->frame_main + 1) % 4;
+ if ((input.fire == DOWN && (global_frame_counter % 2) == 0) ||
+ (global_frame_counter % 4) == 0)
+ frame_main = (frame_main + 1) % 4;
- pplayer->frame = pplayer->frame_main;
+ frame_ = frame_main;
- if (pplayer->frame == 3)
- pplayer->frame = 1;
+ if (frame_ == 3)
+ frame_ = 1;
}
}
}
-void player_grabdistros(player_type *pplayer)
+void
+Player::grabdistros()
{
/* Grab distros: */
- if (!pplayer->dying)
+ if (!dying)
{
- trygrabdistro(pplayer->base.x, pplayer->base.y, NO_BOUNCE);
- trygrabdistro(pplayer->base.x+ 31, pplayer->base.y, NO_BOUNCE);
+ World::current()->trygrabdistro(base.x, base.y, NO_BOUNCE);
+ World::current()->trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
- trygrabdistro(pplayer->base.x, pplayer->base.y + pplayer->base.height, NO_BOUNCE);
- trygrabdistro(pplayer->base.x+ 31, pplayer->base.y + pplayer->base.height, 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);
- if(pplayer->size == BIG)
+ if(size == BIG)
{
- trygrabdistro(pplayer->base.x, pplayer->base.y + pplayer->base.height / 2, NO_BOUNCE);
- trygrabdistro(pplayer->base.x+ 31, pplayer->base.y + pplayer->base.height / 2, NO_BOUNCE);
+ 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);
}
}
-
/* Enough distros for a One-up? */
-
if (distros >= DISTROS_LIFEUP)
{
distros = distros - DISTROS_LIFEUP;
- if(pplayer->lives < MAX_LIVES)
- pplayer->lives++;
+ if(lives < MAX_LIVES)
+ lives++;
/*We want to hear the sound even, if MAX_LIVES is reached*/
play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER);
}
}
-void player_draw(player_type* pplayer)
+void
+Player::draw()
{
- if (!timer_started(&pplayer->safe_timer) || (frame % 2) == 0)
+ if (!safe_timer.started() || (global_frame_counter % 2) == 0)
{
- if (pplayer->size == SMALL)
+ if (size == SMALL)
{
- if (timer_started(&pplayer->invincible_timer))
+ if (invincible_timer.started())
{
/* Draw cape: */
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&cape_right[frame % 2],
- pplayer->base.x- scroll_x, pplayer->base.y);
+ texture_draw(&cape_right[global_frame_counter % 2],
+ base.x- scroll_x, base.y);
}
else
{
- texture_draw(&cape_left[frame % 2],
- pplayer->base.x- scroll_x, pplayer->base.y);
+ texture_draw(&cape_left[global_frame_counter % 2],
+ base.x- scroll_x, base.y);
}
}
- if (!pplayer->got_coffee)
+ if (!got_coffee)
{
- if (pplayer->dir == RIGHT)
+ if (physic.get_velocity_y() != 0)
{
- texture_draw(&tux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+ if (dir == RIGHT)
+ texture_draw(&smalltux_jump_right, base.x - scroll_x, base.y - 10);
+ else
+ texture_draw(&smalltux_jump_left, base.x - scroll_x, base.y - 10);
}
else
{
- texture_draw(&tux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+ if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
+ {
+ if (dir == RIGHT)
+ texture_draw(&smalltux_stand_right, base.x - scroll_x, base.y - 9);
+ else
+ texture_draw(&smalltux_stand_left, base.x - scroll_x, base.y - 9);
+ }
+ else // moving
+ {
+ if (dir == RIGHT)
+ texture_draw(&tux_right[(global_frame_counter/2) % tux_right.size()],
+ base.x - scroll_x, base.y - 9);
+ else
+ texture_draw(&tux_left[(global_frame_counter/2) % tux_left.size()],
+ base.x - scroll_x, base.y - 9);
+ }
}
}
else
{
/* Tux got coffee! */
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&firetux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+ texture_draw(&firetux_right[frame_], base.x- scroll_x, base.y);
}
else
{
- texture_draw(&firetux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+ texture_draw(&firetux_left[frame_], base.x- scroll_x, base.y);
}
}
}
else
{
- if (timer_started(&pplayer->invincible_timer))
+ if (invincible_timer.started())
{
/* Draw cape: */
-
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&bigcape_right[frame % 2],
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ texture_draw(&bigcape_right[global_frame_counter % 2],
+ base.x- scroll_x - 8, base.y);
}
else
{
- texture_draw(&bigcape_left[frame % 2],
- pplayer->base.x-scroll_x - 8, pplayer->base.y);
+ texture_draw(&bigcape_left[global_frame_counter % 2],
+ base.x-scroll_x - 8, base.y);
}
}
- if (!pplayer->got_coffee)
+ if (!got_coffee)
{
- if (!pplayer->duck)
+ if (!duck)
{
- if (!timer_started(&pplayer->skidding_timer))
+ if (!skidding_timer.started())
{
- if (!pplayer->jumping || pplayer->base.ym > 0)
+ if (!jumping || physic.get_velocity_y() > 0)
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&bigtux_right[pplayer->frame],
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ texture_draw(&bigtux_right[frame_],
+ base.x- scroll_x - 8, base.y);
}
else
{
- texture_draw(&bigtux_left[pplayer->frame],
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ texture_draw(&bigtux_left[frame_],
+ base.x- scroll_x - 8, base.y);
}
}
else
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
texture_draw(&bigtux_right_jump,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
else
{
texture_draw(&bigtux_left_jump,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
}
}
else
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
texture_draw(&skidtux_right,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
else
{
texture_draw(&skidtux_left,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
}
}
else
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&ducktux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
+ texture_draw(&ducktux_right, base.x- scroll_x - 8, base.y - 16);
}
else
{
- texture_draw(&ducktux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
+ texture_draw(&ducktux_left, base.x- scroll_x - 8, base.y - 16);
}
}
}
{
/* Tux has coffee! */
- if (!pplayer->duck)
+ if (!duck)
{
- if (!timer_started(&pplayer->skidding_timer))
+ if (!skidding_timer.started())
{
- if (!pplayer->jumping || pplayer->base.ym > 0)
+ if (!jumping || physic.get_velocity_y() > 0)
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&bigfiretux_right[pplayer->frame],
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ texture_draw(&bigfiretux_right[frame_],
+ base.x- scroll_x - 8, base.y);
}
else
{
- texture_draw(&bigfiretux_left[pplayer->frame],
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ texture_draw(&bigfiretux_left[frame_],
+ base.x- scroll_x - 8, base.y);
}
}
else
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
texture_draw(&bigfiretux_right_jump,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
else
{
texture_draw(&bigfiretux_left_jump,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
}
}
else
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
texture_draw(&skidfiretux_right,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
else
{
texture_draw(&skidfiretux_left,
- pplayer->base.x- scroll_x - 8, pplayer->base.y);
+ base.x- scroll_x - 8, base.y);
}
}
}
else
{
- if (pplayer->dir == RIGHT)
+ if (dir == RIGHT)
{
- texture_draw(&duckfiretux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
+ texture_draw(&duckfiretux_right, base.x- scroll_x - 8, base.y - 16);
}
else
{
- texture_draw(&duckfiretux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
+ texture_draw(&duckfiretux_left, base.x- scroll_x - 8, base.y - 16);
}
}
}
}
}
+
+ if(dying)
+ text_drawf(&gold_text,"Penguins can fly !:",0,0,A_HMIDDLE,A_VMIDDLE,1);
}
-void player_collision(player_type* pplayer, void* p_c_object, int c_object)
+void
+Player::collision(void* p_c_object, int c_object)
{
- bad_guy_type* pbad_c = NULL;
+ BadGuy* pbad_c = NULL;
switch (c_object)
{
case CO_BADGUY:
- pbad_c = (bad_guy_type*) p_c_object;
+ pbad_c = (BadGuy*) p_c_object;
/* Hurt the player if he just touched it: */
- if (!pbad_c->dying && !pplayer->dying &&
- !timer_started(&pplayer->safe_timer) &&
+ if (!pbad_c->dying && !dying &&
+ !safe_timer.started() &&
pbad_c->mode != HELD)
{
- if (pbad_c->mode == FLAT && pplayer->input.fire != DOWN)
- {
- /* Kick: */
-
- pbad_c->mode = KICK;
- play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
-
- if (pplayer->base.x < pbad_c->base.x + (pbad_c->base.width/2))
- {
- pbad_c->dir = RIGHT;
- pbad_c->base.x = pbad_c->base.x + 16;
- }
- else
- {
- pbad_c->dir = LEFT;
- pbad_c->base.x = pbad_c->base.x - 32;
- }
-
- timer_start(&pbad_c->timer,5000);
- }
- else if (pbad_c->mode == FLAT && pplayer->input.fire == DOWN)
+ if (pbad_c->mode == FLAT && input.fire == DOWN)
{
pbad_c->mode = HELD;
pbad_c->base.y-=8;
}
else if (pbad_c->mode == KICK)
{
- if (pplayer->base.y < pbad_c->base.y - 16 &&
- timer_started(&pbad_c->timer))
+ if (base.y < pbad_c->base.y - 16)
{
/* Step on (stop being kicked) */
pbad_c->mode = FLAT;
play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
- timer_start(&pbad_c->timer, 10000);
}
else
{
/* Hurt if you get hit by kicked laptop: */
-
- if (timer_started(&pbad_c->timer))
+ if (!invincible_timer.started())
{
- if (!timer_started(&pplayer->invincible_timer))
- {
- player_kill(pplayer,SHRINK);
- }
- else
- {
- pbad_c->dying = DYING_FALLING;
- play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
- add_score(pbad_c->base.x - scroll_x,
- pbad_c->base.y,
- 25 * score_multiplier);
- }
+ 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);
}
}
}
else
{
- if (!timer_started(&pplayer->invincible_timer ))
+ if (!invincible_timer.started())
{
- player_kill(pplayer,SHRINK);
+ kill(SHRINK);
}
else
{
- pbad_c->dying = DYING_FALLING;
- play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
- add_score(pbad_c->base.x - scroll_x,
- pbad_c->base.y,
- 25 * score_multiplier);
+ pbad_c->kill_me();
}
}
- score_multiplier++;
+ player_status.score_multiplier++;
}
break;
default:
/* Kill Player! */
-void player_kill(player_type* pplayer, int mode)
+void
+Player::kill(int mode)
{
- pplayer->base.ym = -5;
-
play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
- if (pplayer->dir == RIGHT)
- pplayer->base.xm = -8;
- else if (pplayer->dir == LEFT)
- pplayer->base.xm = 8;
+ physic.set_velocity(0, physic.get_velocity_y());
- if (mode == SHRINK && pplayer->size == BIG)
+ if (mode == SHRINK && size == BIG)
{
- if (pplayer->got_coffee)
- pplayer->got_coffee = false;
+ if (got_coffee)
+ got_coffee = false;
- pplayer->size = SMALL;
- pplayer->base.height = 32;
+ size = SMALL;
+ base.height = 32;
- timer_start(&pplayer->safe_timer,TUX_SAFE_TIME);
+ safe_timer.start(TUX_SAFE_TIME);
}
else
{
- pplayer->dying = DYING_SQUISHED;
+ if(size == BIG)
+ duck = true;
+
+ physic.enable_gravity(true);
+ physic.set_acceleration(0, 0);
+ physic.set_velocity(0, 7);
+ dying = DYING_SQUISHED;
}
}
-void player_dying(player_type *pplayer)
+void
+Player::is_dying()
{
- pplayer->base.ym = pplayer->base.ym + gravity;
-
/* He died :^( */
- --pplayer->lives;
- player_remove_powerups(pplayer);
- pplayer->dying = DYING_NOT;
-
- player_level_begin(pplayer);
+ --lives;
+ 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(player_type* pplayer)
+void
+Player::remove_powerups()
{
- pplayer->got_coffee = false;
- pplayer->size = SMALL;
- pplayer->base.height = 32;
+ got_coffee = false;
+ size = SMALL;
+ base.height = 32;
}
-void player_keep_in_bounds(player_type* pplayer)
+void
+Player::keep_in_bounds()
{
+ Level* plevel = World::current()->get_level();
+
/* Keep tux in bounds: */
- if (pplayer->base.x< 0)
- pplayer->base.x= 0;
- else if(pplayer->base.x< scroll_x)
- pplayer->base.x= scroll_x;
- else if (pplayer->base.x< 160 + scroll_x && scroll_x > 0 && debug_mode == true)
+ if (base.x< 0)
+ base.x= 0;
+ else if(base.x< scroll_x)
+ base.x= scroll_x;
+ else if (base.x< 160 + scroll_x && scroll_x > 0 && debug_mode)
{
- scroll_x = pplayer->base.x- 160;
- /*pplayer->base.x+= 160;*/
+ scroll_x = base.x- 160;
+ /*base.x+= 160;*/
if(scroll_x < 0)
scroll_x = 0;
}
- else if (pplayer->base.x> screen->w / 2 + scroll_x && scroll_x < ((current_level.width * 32) - screen->w))
+ else if (base.x > screen->w / 2 + scroll_x
+ && scroll_x < ((World::current()->get_level()->width * 32) - screen->w))
{
- /* Scroll the screen in past center: */
+ // FIXME: Scrolling needs to be handled by a seperate View
+ // class, doing it as a player huck is ugly
- scroll_x = pplayer->base.x- screen->w / 2;
- /*pplayer->base.x= 320 + scroll_x;*/
+ // Scroll the screen in past center:
+ scroll_x = base.x - screen->w / 2;
- if (scroll_x > ((current_level.width * 32) - screen->w))
- scroll_x = ((current_level.width * 32) - screen->w);
+ if (scroll_x > ((plevel->width * 32) - screen->w))
+ scroll_x = ((plevel->width * 32) - screen->w);
}
- else if (pplayer->base.x> 608 + scroll_x)
+ else if (base.x> 608 + scroll_x)
{
/* ... unless there's no more to scroll! */
- /*pplayer->base.x= 608 + scroll_x;*/
+ /*base.x= 608 + scroll_x;*/
}
/* Keep in-bounds, vertically: */
- if (pplayer->base.y > screen->h)
+ if (base.y > screen->h)
{
- player_kill(&tux,KILL);
+ kill(KILL);
}
}
projects / supertux.git / blobdiff