#include "special.h"
#include "camera.h"
#include "gameloop.h"
-#include "screen/screen.h"
-#include "sound.h"
+#include "video/screen.h"
#include "scene.h"
-#include "globals.h"
+#include "app/globals.h"
#include "player.h"
#include "sector.h"
-#include "sprite_manager.h"
+#include "special/sprite_manager.h"
#include "resources.h"
Sprite* img_firebullet;
float old_y = base.y;
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
collision_swept_object_map(&old_base,&base);
if (issolid(base.x+2, base.y + 4) || issolid(base.x+2, base.y))
Sector::current()->camera->get_translation().y;
if (base.x < scroll_x ||
base.x > scroll_x + screen->w ||
- base.y < scroll_y ||
+// base.y < scroll_y ||
base.y > scroll_y + screen->h ||
life_count <= 0)
{
}
/* Move around? */
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if(kind == UPGRADE_GROWUP) {
collision_swept_object_map(&old_base, &base);
}
case UPGRADE_1UP: sprite = img_1up; break;
default:
assert(!"wrong type in Powerup::draw()");
+ sprite = NULL; // added by neoneurone, g++ likes this !
}
if(base.height < 32) // still raising up?
if(kind != UPGRADE_GROWUP)
return;
- sound_manager->play_sound(sounds[SND_BUMP_UPGRADE], Vector(base.x, base.y));
+ SoundManager::get()->play_sound(IDToSound(SND_BUMP_UPGRADE), Vector(base.x, base.y), Sector::current()->player->get_pos());
// determine new direction
Direction old_dir = dir;
if (kind == UPGRADE_GROWUP)
{
- sound_manager->play_sound(sounds[SND_EXCELLENT]);
+ SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
pplayer->grow(true);
}
else if (kind == UPGRADE_FIREFLOWER)
{
- sound_manager->play_sound(sounds[SND_COFFEE]);
+ SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
pplayer->grow(true);
pplayer->got_power = pplayer->FIRE_POWER;
}
else if (kind == UPGRADE_ICEFLOWER)
{
- sound_manager->play_sound(sounds[SND_COFFEE]);
+ SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
pplayer->grow(true);
pplayer->got_power = pplayer->ICE_POWER;
}
else if (kind == UPGRADE_FIREFLOWER)
{
- sound_manager->play_sound(sounds[SND_COFFEE]);
+ SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
pplayer->grow(true);
pplayer->got_power = pplayer->FIRE_POWER;
}
else if (kind == UPGRADE_HERRING)
{
- sound_manager->play_sound(sounds[SND_HERRING]);
+ SoundManager::get()->play_sound(IDToSound(SND_HERRING));
pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
Sector::current()->play_music(HERRING_MUSIC);
}
{
if(player_status.lives < MAX_LIVES) {
player_status.lives++;
- sound_manager->play_sound(sounds[SND_LIFEUP]);
+ SoundManager::get()->play_sound(IDToSound(SND_LIFEUP));
}
}