projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated French translation
[supertux.git]
/
src
/
special.cpp
diff --git
a/src/special.cpp
b/src/special.cpp
index
38f548b
..
8d69815
100644
(file)
--- a/
src/special.cpp
+++ b/
src/special.cpp
@@
-26,13
+26,12
@@
#include "special.h"
#include "camera.h"
#include "gameloop.h"
#include "special.h"
#include "camera.h"
#include "gameloop.h"
-#include "screen/screen.h"
-#include "sound.h"
+#include "video/screen.h"
#include "scene.h"
#include "scene.h"
-#include "globals.h"
+#include "
app/
globals.h"
#include "player.h"
#include "sector.h"
#include "player.h"
#include "sector.h"
-#include "sprite_manager.h"
+#include "sp
ecial/sp
rite_manager.h"
#include "resources.h"
Sprite* img_firebullet;
#include "resources.h"
Sprite* img_firebullet;
@@
-81,7
+80,7
@@
Bullet::action(float elapsed_time)
float old_y = base.y;
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))
collision_swept_object_map(&old_base,&base);
if (issolid(base.x+2, base.y + 4) || issolid(base.x+2, base.y))
@@
-105,7
+104,7
@@
Bullet::action(float elapsed_time)
Sector::current()->camera->get_translation().y;
if (base.x < scroll_x ||
base.x > scroll_x + screen->w ||
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)
{
base.y > scroll_y + screen->h ||
life_count <= 0)
{
@@
-162,7
+161,7
@@
Upgrade::Upgrade(const Vector& pos, Direction dir_, UpgradeKind kind_)
physic.reset();
physic.enable_gravity(false);
physic.reset();
physic.enable_gravity(false);
- if(kind == UPGRADE_1UP || kind == UPGRADE_
HERRING
) {
+ if(kind == UPGRADE_1UP || kind == UPGRADE_
STAR
) {
physic.set_velocity(dir == LEFT ? -1 : 1, 4);
physic.enable_gravity(true);
base.height = 32;
physic.set_velocity(dir == LEFT ? -1 : 1, 4);
physic.enable_gravity(true);
base.height = 32;
@@
-210,13
+209,13
@@
Upgrade::action(float elapsed_time)
}
/* Move around? */
}
/* Move around? */
- physic.apply(elapsed_time, base.x, base.y);
- if(kind == UPGRADE_GROWUP) {
+ physic.apply(elapsed_time, base.x, base.y
, Sector::current()->gravity
);
+ if(kind == UPGRADE_GROWUP
|| kind == UPGRADE_STAR
) {
collision_swept_object_map(&old_base, &base);
}
// fall down?
collision_swept_object_map(&old_base, &base);
}
// fall down?
- if(kind == UPGRADE_GROWUP || kind == UPGRADE_
HERRING
) {
+ if(kind == UPGRADE_GROWUP || kind == UPGRADE_
STAR
) {
// falling?
if(physic.get_velocity_y() != 0) {
if(issolid(base.x, base.y + base.height)) {
// falling?
if(physic.get_velocity_y() != 0) {
if(issolid(base.x, base.y + base.height)) {
@@
-225,7
+224,7
@@
Upgrade::action(float elapsed_time)
if(kind == UPGRADE_GROWUP) {
physic.enable_gravity(false);
physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0);
if(kind == UPGRADE_GROWUP) {
physic.enable_gravity(false);
physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0);
- } else if(kind == UPGRADE_
HERRING
) {
+ } else if(kind == UPGRADE_
STAR
) {
physic.set_velocity(dir == LEFT ? -2 : 2, 3);
}
}
physic.set_velocity(dir == LEFT ? -2 : 2, 3);
}
}
@@
-240,7
+239,7
@@
Upgrade::action(float elapsed_time)
}
// horizontal bounce?
}
// horizontal bounce?
- if(kind == UPGRADE_GROWUP || kind == UPGRADE_
HERRING
) {
+ if(kind == UPGRADE_GROWUP || kind == UPGRADE_
STAR
) {
if ( (physic.get_velocity_x() < 0
&& issolid(base.x, (int) base.y + base.height/2))
|| (physic.get_velocity_x() > 0
if ( (physic.get_velocity_x() < 0
&& issolid(base.x, (int) base.y + base.height/2))
|| (physic.get_velocity_x() > 0
@@
-259,10
+258,11
@@
Upgrade::draw(DrawingContext& context)
case UPGRADE_GROWUP: sprite = img_growup; break;
case UPGRADE_ICEFLOWER: sprite = img_iceflower; break;
case UPGRADE_FIREFLOWER: sprite = img_fireflower; break;
case UPGRADE_GROWUP: sprite = img_growup; break;
case UPGRADE_ICEFLOWER: sprite = img_iceflower; break;
case UPGRADE_FIREFLOWER: sprite = img_fireflower; break;
- case UPGRADE_
HERRING
: sprite = img_star; break;
+ case UPGRADE_
STAR
: sprite = img_star; break;
case UPGRADE_1UP: sprite = img_1up; break;
default:
assert(!"wrong type in Powerup::draw()");
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(base.height < 32) // still raising up?
@@
-279,7
+279,7
@@
Upgrade::bump(Player* player)
if(kind != UPGRADE_GROWUP)
return;
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;
// determine new direction
Direction old_dir = dir;
@@
-327,30
+327,30
@@
Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
if (kind == UPGRADE_GROWUP)
{
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)
{
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)
{
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)
{
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;
}
pplayer->grow(true);
pplayer->got_power = pplayer->FIRE_POWER;
}
- else if (kind == UPGRADE_
HERRING
)
+ else if (kind == UPGRADE_
STAR
)
{
{
-
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);
}
pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
Sector::current()->play_music(HERRING_MUSIC);
}
@@
-358,7
+358,7
@@
Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
{
if(player_status.lives < MAX_LIVES) {
player_status.lives++;
{
if(player_status.lives < MAX_LIVES) {
player_status.lives++;
-
sound_manager->play_sound(sounds[SND_LIFEUP]
);
+
SoundManager::get()->play_sound(IDToSound(SND_LIFEUP)
);
}
}
}
}