#include "tile.h"
#include "resources.h"
-texture_type img_distro[4];
+Surface* img_distro[4];
World* World::current_ = 0;
-World::World()
+World::World(const std::string& filename)
{
// FIXME: Move this to action and draw and everywhere else where the
// world calls child functions
level = new Level;
tux.init();
+
+ level->load(filename);
+ set_defaults();
+
+ get_level()->load_gfx();
+ activate_bad_guys();
+ activate_particle_systems();
+ get_level()->load_song();
+}
+
+World::World(const std::string& subset, int level_nr)
+{
+ // FIXME: Move this to action and draw and everywhere else where the
+ // world calls child functions
+ current_ = this;
+
+ level = new Level;
+ tux.init();
+
+ level->load(subset, level_nr);
+ set_defaults();
+
+ get_level()->load_gfx();
+ activate_bad_guys();
+ activate_particle_systems();
+ get_level()->load_song();
}
World::~World()
set_current_music(LEVEL_MUSIC);
}
-int
-World::load(const std::string& subset, int level_nr)
-{
- return level->load(subset, level_nr);
-}
-
-int
-World::load(const std::string& filename)
-{
- return level->load(filename);
-}
-
-void
-World::arrays_free(void)
-{
- bad_guys.clear();
- bouncy_distros.clear();
- broken_bricks.clear();
- bouncy_bricks.clear();
- floating_scores.clear();
- upgrades.clear();
- bullets.clear();
- std::vector<ParticleSystem*>::iterator i;
- for(i = particle_systems.begin(); i != particle_systems.end(); ++i) {
- delete *i;
- }
- particle_systems.clear();
-}
-
void
World::activate_bad_guys()
{
/* Draw the real background */
if(get_level()->bkgd_image[0] != '\0')
{
- int s = (int)scroll_x / 30;
- texture_draw_part(&level->img_bkgd, s, 0,0,0,level->img_bkgd.w - s, level->img_bkgd.h);
- texture_draw_part(&level->img_bkgd, 0, 0,screen->w - s ,0,s,level->img_bkgd.h);
+ int s = ((int)scroll_x / 2)%640;
+ level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h);
+ level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h);
}
else
{
- drawgradient(level->bkgd_top_red, level->bkgd_top_green, level->bkgd_top_blue,
- level->bkgd_bottom_red, level->bkgd_bottom_green, level->bkgd_bottom_blue);
+ drawgradient(level->bkgd_top, level->bkgd_bottom);
}
/* Draw particle systems (background) */
else
{
tux.collision(&bad_guys[i], CO_BADGUY);
+ bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_NORMAL);
}
}
}
else
col_side = LEFT;
+ int posx = ((int)(x+1) / 32) * 32;
+ int posy = (int)(y/32) * 32 - 32;
switch(tile->data)
{
case 1: // Box with a distro!
- add_bouncy_distro(((int)(x + 1) / 32) * 32, (int)(y / 32) * 32 - 32);
+ add_bouncy_distro(posx, posy);
play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
player_status.score = player_status.score + SCORE_DISTRO;
player_status.distros++;
case 2: // Add an upgrade!
if (tux.size == SMALL) /* Tux is small, add mints! */
- add_upgrade((int)((x + 1) / 32) * 32, (int)(y / 32) * 32 - 32, col_side, UPGRADE_MINTS);
- else /* Tux is big, add coffee: */
- add_upgrade((int)((x + 1) / 32) * 32, (int)(y / 32) * 32 - 32, col_side, UPGRADE_COFFEE);
+ add_upgrade(posx, posy, col_side, UPGRADE_GROWUP);
+ else /* Tux is big, add an iceflower: */
+ add_upgrade(posx, posy, col_side, UPGRADE_ICEFLOWER);
play_sound(sounds[SND_UPGRADE], SOUND_CENTER_SPEAKER);
break;
case 3: // Add a golden herring
- add_upgrade((int)((x + 1) / 32) * 32, (int)(y / 32) * 32 - 32, col_side, UPGRADE_HERRING);
+ add_upgrade(posx, posy, col_side, UPGRADE_HERRING);
+ break;
+
+ case 4: // Add a 1up extra
+ add_upgrade(posx, posy, col_side, UPGRADE_1UP);
break;
default:
break;