}
Player::Player(PlayerStatus* _player_status)
- : player_status(_player_status), grabbed_object(0)
+ : player_status(_player_status), grabbed_object(NULL)
{
controller = main_controller;
smalltux_gameover = sprite_manager->create("images/creatures/tux_small/smalltux-gameover.sprite");
smalltux_star = sprite_manager->create("images/creatures/tux_small/smalltux-star.sprite");
bigtux_star = sprite_manager->create("images/creatures/tux_big/bigtux-star.sprite");
+ sound_manager->preload("sounds/bigjump.wav");
+ sound_manager->preload("sounds/jump.wav");
+ sound_manager->preload("sounds/hurt.wav");
+ sound_manager->preload("sounds/skid.wav");
+
init();
}
visible = true;
on_ground_flag = false;
- grabbed_object = 0;
+ grabbed_object = NULL;
floor_normal = Vector(0,-1);
movement = physic.get_movement(elapsed_time);
- if(grabbed_object != 0) {
+ if(grabbed_object != NULL && !dying) {
Vector pos = get_pos() +
Vector(dir == LEFT ? -16 : 16,
bbox.get_height()*0.66666 - 32);
grabbed_object->grab(*this, pos, dir);
}
+
+ if(grabbed_object != NULL && dying){
+ grabbed_object->ungrab(*this, dir);
+ grabbed_object = NULL;
+ }
on_ground_flag = false;
}
log_debug << "Non MovingObjetc grabbed?!?" << std::endl;
}
grabbed_object->ungrab(*this, dir);
- grabbed_object = 0;
+ grabbed_object = NULL;
}
}
if(other.get_flags() & FLAG_PORTABLE) {
Portable* portable = dynamic_cast<Portable*> (&other);
- if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION)
+ assert(portable != NULL);
+ if(portable && grabbed_object == NULL
+ && controller->hold(Controller::ACTION)
&& fabsf(hit.normal.x) > .9) {
grabbed_object = portable;
+ grabbed_object->grab(*this, get_pos(), dir);
return CONTINUE;
}
}