// Copyright: See COPYING file that comes with this distribution
//
//
+#include <math.h>
#include "gameloop.h"
#include "globals.h"
#include "screen.h"
texture_type tux_life;
-texture_type tux_right[3];
-texture_type tux_left[3];
+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;
// FIXME: Make the start position configurable via the levelfile
base.x = 100;
base.y = 240;
-
base.xm = 0;
base.ym = 0;
old_base = base;
keymap.right = SDLK_RIGHT;
keymap.fire = SDLK_LCTRL;
- timer_init(&invincible_timer,true);
- timer_init(&skidding_timer,true);
- timer_init(&safe_timer,true);
- timer_init(&frame_timer,true);
- physic_init(&hphysic);
- physic_init(&vphysic);
+ invincible_timer.init(true);
+ skidding_timer.init(true);
+ safe_timer.init(true);
+ frame_timer.init(true);
+
+ physic.reset();
}
int
base.xm = 0;
base.ym = 0;
old_base = base;
+ previous_base = base;
+
+ dying = DYING_NOT;
player_input_init(&input);
- timer_init(&invincible_timer,true);
- timer_init(&skidding_timer,true);
- timer_init(&safe_timer,true);
- timer_init(&frame_timer,true);
- physic_init(&hphysic);
- physic_init(&vphysic);
+ invincible_timer.init(true);
+ skidding_timer.init(true);
+ safe_timer.init(true);
+ frame_timer.init(true);
+
+ physic.reset();
}
void
-Player::action()
+Player::action(double frame_ratio)
{
bool jumped_in_solid = false;
/* --- HANDLE TUX! --- */
- handle_input();
+ if(!dying)
+ handle_input();
/* Move tux: */
-
previous_base = base;
- base.x += base.xm * frame_ratio;
- base.y += base.ym * frame_ratio;
+ physic.apply(frame_ratio, base.x, base.y);
- collision_swept_object_map(&old_base,&base);
+ if (!dying)
+ {
- keep_in_bounds();
+ collision_swept_object_map(&old_base,&base);
+ keep_in_bounds();
+
+ /* Land: */
- /* Land: */
- if (!dying)
- {
if( !on_ground())
{
+ physic.enable_gravity(true);
if(under_solid())
{
- physic_set_state(&vphysic,PH_VT);
- physic_set_start_vy(&vphysic,0);
+ // fall down
+ physic.set_velocity(physic.get_velocity_x(), 0);
jumped_in_solid = true;
}
- else
- {
- if(!physic_is_set(&vphysic))
- {
- physic_set_state(&vphysic,PH_VT);
- physic_set_start_vy(&vphysic,0);
- }
- }
- base.ym = physic_get_velocity(&vphysic);
-
}
else
{
-
/* Land: */
-
- if (base.ym > 0)
+ if (physic.get_velocity_y() < 0)
{
base.y = (int)(((int)base.y / 32) * 32);
- base.ym = 0;
+ physic.set_velocity(physic.get_velocity_x(), 0);
}
- physic_init(&vphysic);
-
+ physic.enable_gravity(false);
/* Reset score multiplier (for multi-hits): */
-
- score_multiplier = 1;
+ player_status.score_multiplier = 1;
}
if(jumped_in_solid)
if (isbrick(base.x, base.y) ||
isfullbox(base.x, base.y))
{
- trygrabdistro(base.x, base.y - 32,BOUNCE);
- trybumpbadguy(base.x, base.y - 64);
+ World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE);
+ World::current()->trybumpbadguy(base.x, base.y - 64);
- if(size == BIG)
- trybreakbrick(base.x, base.y);
+ World::current()->trybreakbrick(base.x, base.y, size == SMALL);
bumpbrick(base.x, base.y);
- tryemptybox(base.x, base.y, RIGHT);
+ World::current()->tryemptybox(base.x, base.y, RIGHT);
}
if (isbrick(base.x+ 31, base.y) ||
isfullbox(base.x+ 31, base.y))
{
- trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
- trybumpbadguy(base.x+ 31, base.y - 64);
+ World::current()->trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
+ World::current()->trybumpbadguy(base.x+ 31, base.y - 64);
if(size == BIG)
- trybreakbrick(base.x+ 31, base.y);
+ World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL);
bumpbrick(base.x+ 31, base.y);
- tryemptybox(base.x+ 31, base.y, LEFT);
- }
-
-
- if(size == SMALL)
- {
- Tile* tile = gettile(base.x, base.y);
- /* Get a distro from a brick? */
- if (tile->brick)
- {
- add_bouncy_distro((((int)base.x)
- / 32) * 32,
- ((int)base.y / 32) * 32);
-
- if (counting_distros == false)
- {
- counting_distros = true;
- distro_counter = 100;
- }
-
- if (distro_counter <= 0)
- level_change(¤t_level,base.x,base.y - 1, TM_IA, tile->next_tile);
-
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
- score = score + SCORE_DISTRO;
- distros++;
- }
- }
- else
- {
- Tile* tile2 = gettile(base.x + 31, base.y);
- if (tile2->brick)
- {
- add_bouncy_distro((((int)base.x + 31)
- / 32) * 32,
- ((int)base.y / 32) * 32);
- if (counting_distros == false)
- {
- counting_distros = true;
- distro_counter = 100;
- }
-
- if (distro_counter <= 0)
- level_change(¤t_level,base.x+ 31, base.y, TM_IA, tile2->next_tile);
-
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
- score = score + SCORE_DISTRO;
- distros++;
- }
+ World::current()->tryemptybox(base.x+ 31, base.y, LEFT);
}
}
}
- timer_check(&safe_timer);
+ safe_timer.check();
/* ---- DONE HANDLING TUX! --- */
/* Handle invincibility timer: */
-
-
- if (get_current_music() == HERRING_MUSIC && !timer_check(&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(&skidding_timer);
+ // timer_check(&skidding_timer); // disabled
/* End of level? */
-
- if (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;
}
}
void
Player::handle_horizontal_input(int newdir)
{
- if ((newdir ? (base.xm < -SKID_XM) : (base.xm > SKID_XM)) && !timer_started(&skidding_timer) &&
- dir == !newdir && on_ground())
- {
- timer_start(&skidding_timer, SKID_TIME);
-
- play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
+ if(duck)
+ return;
- }
+ 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;
+ }
- if ((newdir ? (base.xm < 0) : (base.xm > 0)) && !isice(base.x, base.y + base.height) &&
- !timer_started(&skidding_timer))
+ if ((newdir ? (vx < 0) : (vx > 0)) && !isice(base.x, base.y + base.height) &&
+ !skidding_timer.started())
{
- base.xm = 0;
+ //vx = 0;
}
- if (!duck)
+ /* Facing the direction we're jumping? Go full-speed: */
+ if (input.fire == UP)
{
- if (dir == newdir)
+ 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 (input.fire == UP)
- {
- base.xm = base.xm + ( newdir ? WALK_SPEED : -WALK_SPEED) * frame_ratio;
-
- if(newdir)
- {
- if (base.xm > MAX_WALK_XM)
- base.xm = MAX_WALK_XM;
- }
- else
- {
- if (base.xm < -MAX_WALK_XM)
- base.xm = -MAX_WALK_XM;
- }
- }
- else if ( input.fire == DOWN)
- {
- base.xm = base.xm + ( newdir ? RUN_SPEED : -RUN_SPEED) * frame_ratio;
-
- if(newdir)
- {
- if (base.xm > MAX_RUN_XM)
- base.xm = MAX_RUN_XM;
- }
- else
- {
- if (base.xm < -MAX_RUN_XM)
- base.xm = -MAX_RUN_XM;
- }
- }
- else
- {
- /* Not facing the direction we're jumping?
- Go half-speed: */
-
- base.xm = base.xm + ( newdir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio;
-
- if(newdir)
- {
- if (base.xm > MAX_WALK_XM / 2)
- base.xm = MAX_WALK_XM / 2;
- }
- else
- {
- if (base.xm < -MAX_WALK_XM / 2)
- 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
+ }
+ else if ( input.fire == DOWN)
+ {
+ 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 (vx > MAX_RUN_XM)
+ vx = MAX_RUN_XM;
+ }
+ else
+ {
+ if (vx < -MAX_RUN_XM)
+ vx = -MAX_RUN_XM;
+ }
+#endif
+ }
+ else
+ {
+#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)
+ {
+ if (vx > MAX_WALK_XM / 2)
+ vx = MAX_WALK_XM / 2;
+ }
+ else
+ {
+ if (vx < -MAX_WALK_XM / 2)
+ vx = -MAX_WALK_XM / 2;
+ }
+#endif
}
+
+ physic.set_velocity(vx, vy);
}
void
{
if (on_ground())
{
- if(!physic_is_set(&vphysic))
- {
- physic_set_state(&vphysic,PH_VT);
- physic_set_start_vy(&vphysic,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);
- }
+ // 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);
}
}
else if(input.up == UP && jumping)
{
- if (on_ground())
- {
- physic_init(&vphysic);
- jumping = false;
- }
- else
- {
- jumping = false;
- if(physic_is_set(&vphysic))
- {
- if(physic_get_velocity(&vphysic) < 0.)
- {
- physic_set_state(&vphysic,PH_VT);
- physic_set_start_vy(&vphysic,0);
- }
- }
- else
- {
- if(!physic_is_set(&vphysic))
- {
- physic_set_state(&vphysic,PH_VT);
- }
- }
- }
+ jumping = false;
+ if(physic.get_velocity_y() > 0) {
+ physic.set_velocity(physic.get_velocity_x(), 0);
+ }
}
}
}
else
{
- if(base.xm > 0)
- {
- base.xm = (int)(base.xm - frame_ratio);
- if(base.xm < 0)
- base.xm = 0;
- }
- else if(base.xm < 0)
- {
- base.xm = (int)(base.xm + frame_ratio);
- if(base.xm > 0)
- 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);
+ }
}
}
if (input.fire == DOWN && input.old_fire == UP && got_coffee)
{
- add_bullet(base.x, base.y, base.xm, dir);
+ World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
}
/* (Tux): */
- if(!timer_check(&frame_timer))
+ if(!frame_timer.check())
{
- timer_start(&frame_timer,25);
+ frame_timer.start(25);
if (input.right == UP && input.left == UP)
{
frame_main = 1;
/* Grab distros: */
if (!dying)
{
- trygrabdistro(base.x, base.y, NO_BOUNCE);
- trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
+ World::current()->trygrabdistro(base.x, base.y, NO_BOUNCE);
+ World::current()->trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
- trygrabdistro(base.x, base.y + base.height, NO_BOUNCE);
- trygrabdistro(base.x+ 31, base.y + 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(size == BIG)
{
- trygrabdistro(base.x, base.y + base.height / 2, NO_BOUNCE);
- trygrabdistro(base.x+ 31, base.y + 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);
}
}
void
Player::draw()
{
- if (!timer_started(&safe_timer) || (global_frame_counter % 2) == 0)
+ if (!safe_timer.started() || (global_frame_counter % 2) == 0)
{
if (size == SMALL)
{
- if (timer_started(&invincible_timer))
+ if (invincible_timer.started())
{
/* Draw cape: */
if (!got_coffee)
{
- if (dir == RIGHT)
+ if (physic.get_velocity_y() != 0)
{
- texture_draw(&tux_right[frame_], base.x- scroll_x, 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[frame_], base.x- scroll_x, 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
}
else
{
- if (timer_started(&invincible_timer))
+ if (invincible_timer.started())
{
/* Draw cape: */
if (dir == RIGHT)
{
if (!duck)
{
- if (!timer_started(&skidding_timer))
+ if (!skidding_timer.started())
{
- if (!jumping || base.ym > 0)
+ if (!jumping || physic.get_velocity_y() > 0)
{
if (dir == RIGHT)
{
if (!duck)
{
- if (!timer_started(&skidding_timer))
+ if (!skidding_timer.started())
{
- if (!jumping || base.ym > 0)
+ if (!jumping || physic.get_velocity_y() > 0)
{
if (dir == RIGHT)
{
}
}
}
+
+ if(dying)
+ text_drawf(&gold_text,"Penguins can fly !:",0,0,A_HMIDDLE,A_VMIDDLE,1);
}
void
/* Hurt the player if he just touched it: */
if (!pbad_c->dying && !dying &&
- !timer_started(&safe_timer) &&
+ !safe_timer.started() &&
pbad_c->mode != HELD)
{
- if (pbad_c->mode == FLAT && input.fire != DOWN)
- {
- /* Kick: */
-
- pbad_c->mode = KICK;
- play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
-
- if (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 && 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 (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(&invincible_timer))
- {
- 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);
- }
+ 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(&invincible_timer ))
+ if (!invincible_timer.started())
{
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:
void
Player::kill(int mode)
{
- base.ym = -5;
-
play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
- if (dir == RIGHT)
- base.xm = -8;
- else if (dir == LEFT)
- base.xm = 8;
+ physic.set_velocity(0, physic.get_velocity_y());
if (mode == SHRINK && size == BIG)
{
size = SMALL;
base.height = 32;
- timer_start(&safe_timer,TUX_SAFE_TIME);
+ safe_timer.start(TUX_SAFE_TIME);
}
else
{
+ if(size == BIG)
+ duck = true;
+
+ physic.enable_gravity(true);
+ physic.set_acceleration(0, 0);
+ physic.set_velocity(0, 7);
dying = DYING_SQUISHED;
}
}
void
Player::is_dying()
{
- base.ym = base.ym + gravity;
-
/* He died :^( */
--lives;
remove_powerups();
dying = DYING_NOT;
-
- level_begin();
+}
+bool Player::is_dead()
+{
+ if(base.y > screen->h)
+ return true;
+ else
+ return false;
}
/* Remove Tux's power ups */
void
Player::keep_in_bounds()
{
+ Level* plevel = World::current()->get_level();
+
/* Keep tux in bounds: */
if (base.x< 0)
base.x= 0;
scroll_x = 0;
}
- else if (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 = base.x- screen->w / 2;
- /*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 (base.x> 608 + scroll_x)
{
projects / supertux.git / blobdiff