Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16288/src
Modified Files:
sector.cpp special.cpp special.h
Log Message:
Forward bug fix port to HEAD.
Bug reported by Seneca.
Also changed UPGRADE_HERRING by UPGRADE_STAR.
Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sector.cpp 5 Aug 2004 10:10:19 -0000 1.19
+++ sector.cpp 18 Aug 2004 21:36:00 -0000 1.20
@@ -804,7 +804,7 @@
break;
case 3: // Add a golden herring
- add_upgrade(Vector(posx, posy), col_side, UPGRADE_HERRING);
+ add_upgrade(Vector(posx, posy), col_side, UPGRADE_STAR);
break;
case 4: // Add a 1up extra
Index: special.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- special.h 20 Jul 2004 18:04:48 -0000 1.27
+++ special.h 18 Aug 2004 21:36:00 -0000 1.28
@@ -35,7 +35,7 @@
UPGRADE_GROWUP,
UPGRADE_FIREFLOWER,
UPGRADE_ICEFLOWER,
- UPGRADE_HERRING,
+ UPGRADE_STAR,
UPGRADE_1UP
};
Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- special.cpp 10 Aug 2004 11:43:57 -0000 1.66
+++ special.cpp 18 Aug 2004 21:36:00 -0000 1.67
@@ -161,7 +161,7 @@
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;
@@ -210,12 +210,12 @@
/* Move around? */
physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
- if(kind == UPGRADE_GROWUP) {
+ if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) {
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)) {
@@ -224,7 +224,7 @@
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);
}
}
@@ -239,7 +239,7 @@
}
// 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
@@ -258,7 +258,7 @@
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()");
@@ -348,7 +348,7 @@
pplayer->grow(true);
pplayer->got_power = pplayer->FIRE_POWER;
}
- else if (kind == UPGRADE_HERRING)
+ else if (kind == UPGRADE_STAR)
{
SoundManager::get()->play_sound(IDToSound(SND_HERRING));
pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
|
