#include <stdlib.h>
#include "scene.h"
-int score, distros, level, next_level, game_pause, quit, score_multiplier, endpos, counting_distros, distro_counter;
+int score;
+int distros;
+int level;
+int next_level;
+int game_pause;
+bool quit;
+int score_multiplier;
+int endpos;
+bool counting_distros;
+int distro_counter;
timer_type super_bkgd_timer;
float scroll_x;
-int frame;
-bouncy_distro_type *bouncy_distros;
-broken_brick_type *broken_bricks;
-bouncy_brick_type *bouncy_bricks;
-bad_guy_type *bad_guys;
-floating_score_type *floating_scores;
-upgrade_type *upgrades;
-bullet_type *bullets;
-int num_bad_guys;
-int num_bouncy_distros;
-int num_broken_bricks;
-int num_bouncy_bricks;
-int num_floating_scores;
-int num_upgrades;
-int num_bullets;
-player_type tux;
-texture_type img_box_full, img_box_empty, img_mints, img_coffee, img_super_bkgd, img_red_glow;
+unsigned int global_frame_counter;
+
+std::vector<bouncy_distro_type> bouncy_distros;
+std::vector<broken_brick_type> broken_bricks;
+std::vector<bouncy_brick_type> bouncy_bricks;
+std::vector<BadGuy> bad_guys;
+std::vector<floating_score_type> floating_scores;
+std::vector<upgrade_type> upgrades;
+std::vector<bullet_type> bullets;
+std::vector<ParticleSystem*> particle_systems;
+Player tux;
+texture_type img_box_full;
+texture_type img_box_empty;
+texture_type img_mints;
+texture_type img_coffee;
+texture_type img_super_bkgd;
+texture_type img_red_glow;
timer_type time_left;
double frame_ratio;
-/* Initialize all 'dynamic' arrays */
void arrays_init(void)
{
-num_bad_guys = 0;
-num_bouncy_distros = 0;
-num_broken_bricks = 0;
-num_bouncy_bricks = 0;
-num_floating_scores = 0;
-num_upgrades = 0;
-num_bullets = 0;
-bad_guys = NULL;
-bouncy_distros = NULL;
-broken_bricks = NULL;
-bouncy_bricks = NULL;
-floating_scores = NULL;
-upgrades = NULL;
-bullets = NULL;
}
-/* Free memory of 'dynamic' arrays */
void arrays_free(void)
{
-free(bad_guys);
-free(bouncy_distros);
-free(broken_bricks);
-free(bouncy_bricks);
-free(floating_scores);
-free(upgrades);
-free(bullets);
+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 set_defaults(void)
scroll_x = 0;
score_multiplier = 1;
- timer_init(&super_bkgd_timer, YES);
+ timer_init(&super_bkgd_timer, true);
- counting_distros = NO;
+ counting_distros = false;
distro_counter = 0;
endpos = 0;
set_current_music(LEVEL_MUSIC);
}
-/* Add score: */
-
void add_score(float x, float y, int s)
{
- int i, found;
-
-
- /* Add the score: */
-
score += s;
-
- /* Add a floating score thing to the game: */
-
- found = -1;
-
- for (i = 0; i < num_floating_scores && found == -1; i++)
- {
- if (!floating_scores[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_floating_scores;
- floating_scores = (floating_score_type*) realloc(floating_scores,num_floating_scores*sizeof(floating_score_type));
- floating_score_init(&floating_scores[num_floating_scores-1],x,y,s);
- found = -1;
- }
-
- if (found != -1)
- {
- floating_score_init(&floating_scores[found],x,y,s);
- }
+ floating_score_type new_floating_score;
+ floating_score_init(&new_floating_score,x,y,s);
+ floating_scores.push_back(new_floating_score);
}
-/* Add a bouncy distro: */
-
void add_bouncy_distro(float x, float y)
{
- int i, found;
- found = -1;
-
- for (i = 0; i < num_bouncy_distros && found == -1; i++)
- {
- if (!bouncy_distros[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_bouncy_distros;
- bouncy_distros = (bouncy_distro_type*) realloc(bouncy_distros,num_bouncy_distros*sizeof(bouncy_distro_type));
- found = num_bouncy_distros - 1;
- }
-
- if (found != -1)
- {
- bouncy_distro_init(&bouncy_distros[found],x,y);
- }
+ bouncy_distro_type new_bouncy_distro;
+ bouncy_distro_init(&new_bouncy_distro,x,y);
+ bouncy_distros.push_back(new_bouncy_distro);
}
-
-/* Add broken brick pieces: */
-
void add_broken_brick(float x, float y)
{
add_broken_brick_piece(x, y, -1, -4);
add_broken_brick_piece(x + 16, y + 16, 1.5, -3);
}
-
-/* Add a broken brick piece: */
-
void add_broken_brick_piece(float x, float y, float xm, float ym)
{
- int i, found;
-
- found = -1;
-
- for (i = 0; i < num_broken_bricks && found == -1; i++)
- {
- if (!broken_bricks[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_broken_bricks;
- broken_bricks = (broken_brick_type*) realloc(broken_bricks,num_broken_bricks*sizeof(broken_brick_type));
- found = num_broken_bricks - 1;
- }
-
- if (found != -1)
- {
- broken_brick_init(&broken_bricks[found], x, y, xm, ym);
- }
+ broken_brick_type new_broken_brick;
+ broken_brick_init(&new_broken_brick,x,y,xm,ym);
+ broken_bricks.push_back(new_broken_brick);
}
-
-/* Add a bouncy brick piece: */
-
void add_bouncy_brick(float x, float y)
{
- int i, found;
-
- found = -1;
-
- for (i = 0; i < num_bouncy_bricks && found == -1; i++)
- {
- if (!bouncy_bricks[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_bouncy_bricks;
- bouncy_bricks = (bouncy_brick_type*) realloc(bouncy_bricks,num_bouncy_bricks*sizeof(bouncy_brick_type));
- found = num_bouncy_bricks - 1;
- }
-
- if (found != -1)
- {
- bouncy_brick_init(&bouncy_bricks[found],x,y);
- }
+ bouncy_brick_type new_bouncy_brick;
+ bouncy_brick_init(&new_bouncy_brick,x,y);
+ bouncy_bricks.push_back(new_bouncy_brick);
}
-
-/* Add a bad guy: */
-
-void add_bad_guy(float x, float y, int kind)
+void add_bad_guy(float x, float y, BadGuyKind kind)
{
- int i, found;
-
- found = -1;
-
- for (i = 0; i < num_bad_guys && found == -1; i++)
- {
- if (!bad_guys[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_bad_guys;
- bad_guys = (bad_guy_type*) realloc(bad_guys,num_bad_guys*sizeof(bad_guy_type));
- found = num_bad_guys - 1;
- }
-
- if (found != -1)
- {
- badguy_init(&bad_guys[found], x, y, kind);
- }
+ BadGuy new_bad_guy;
+ new_bad_guy.init(x,y,kind);
+ bad_guys.push_back(new_bad_guy);
}
-/* Add an upgrade: */
-
void add_upgrade(float x, float y, int dir, int kind)
{
- int i, found;
-
- found = -1;
-
- for (i = 0; i < num_upgrades && found == -1; i++)
- {
- if (!upgrades[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_upgrades;
- upgrades = (upgrade_type*) realloc(upgrades,num_upgrades*sizeof(upgrade_type));
- found = num_upgrades - 1;
- }
-
- if (found != -1)
- {
- upgrade_init(&upgrades[found], x, y, dir, kind);
- }
+ upgrade_type new_upgrade;
+ upgrade_init(&new_upgrade,x,y,dir,kind);
+ upgrades.push_back(new_upgrade);
}
-/* Add a bullet: */
-
void add_bullet(float x, float y, float xm, int dir)
{
- int i, found;
+ bullet_type new_bullet;
+ bullet_init(&new_bullet,x,y,xm,dir);
+ bullets.push_back(new_bullet);
- found = -1;
-
- for (i = 0; i < num_bullets && found == -1; i++)
- {
- if (!bullets[i].base.alive)
- found = i;
- }
-
- if (found == -1)
- {
- ++num_bullets;
- bullets = (bullet_type*) realloc(bullets,num_bullets*sizeof(bullet_type));
- found = num_bullets - 1;
- }
-
- if (found != -1)
- {
- bullet_init(&bullets[found], x, y, xm, dir);
-
- play_sound(sounds[SND_SHOOT], SOUND_CENTER_SPEAKER);
- }
+ play_sound(sounds[SND_SHOOT], SOUND_CENTER_SPEAKER);
}
+// EOF //
+
projects / supertux.git / blobdiff