Loading CMakeLists.txt +1 −1 Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ project(SpaceTour_) set(CMAKE_CXX_STANDARD 14) add_executable(SpaceTour_ main.cpp OpenSpace.cpp OpenSpace.h ScreenController.cpp ScreenController.h Falcon_9.cpp Falcon_9.h Enemy.cpp Enemy.h Enemies.cpp Enemies.h) add_executable(SpaceTour_ main.cpp OpenSpace.cpp OpenSpace.h ScreenController.cpp ScreenController.h Falcon_9.cpp Falcon_9.h Enemy.cpp Enemy.h Enemies.cpp Enemies.h Menu.cpp Menu.h) add_compile_options(-Wall -Wextra) include_directories(/usr/local/include) Loading Enemies.cpp +3 −3 Original line number Diff line number Diff line #include "Enemies.h" Enemies::Enemies(GameMode mode, sf::RenderWindow &win) : window(win), Enemy(mode) Enemies::Enemies(GameMode mode) :Enemy(mode) { int speed = 10; Loading @@ -12,10 +12,10 @@ Enemies::Enemies(GameMode mode, sf::RenderWindow &win) : window(win), Enemy(mode } } void Enemies::display_enemys() void Enemies::display_enemys(sf::RenderWindow &win) { for (int i = 0; i < enemy.size(); ++i) { enemy[i].draw_enemy(window); enemy[i].draw_enemy(win); } } Enemies.h +2 −3 Original line number Diff line number Diff line Loading @@ -8,13 +8,12 @@ class Enemies : public Enemy{ std::vector<Enemy> enemy; sf::RenderWindow &window; public: Enemies(GameMode mode, sf::RenderWindow &win); Enemies(GameMode mode); void add_enemy(); void remove_enemy(int &i); void display_enemys(); void display_enemys(sf::RenderWindow &win); }; Loading IMG/blue_enemy.png 0 → 100644 +15.8 KiB Loading image diff... IMG/main_manu.png 0 → 100644 +463 KiB Loading image diff... Loading
CMakeLists.txt +1 −1 Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ project(SpaceTour_) set(CMAKE_CXX_STANDARD 14) add_executable(SpaceTour_ main.cpp OpenSpace.cpp OpenSpace.h ScreenController.cpp ScreenController.h Falcon_9.cpp Falcon_9.h Enemy.cpp Enemy.h Enemies.cpp Enemies.h) add_executable(SpaceTour_ main.cpp OpenSpace.cpp OpenSpace.h ScreenController.cpp ScreenController.h Falcon_9.cpp Falcon_9.h Enemy.cpp Enemy.h Enemies.cpp Enemies.h Menu.cpp Menu.h) add_compile_options(-Wall -Wextra) include_directories(/usr/local/include) Loading
Enemies.cpp +3 −3 Original line number Diff line number Diff line #include "Enemies.h" Enemies::Enemies(GameMode mode, sf::RenderWindow &win) : window(win), Enemy(mode) Enemies::Enemies(GameMode mode) :Enemy(mode) { int speed = 10; Loading @@ -12,10 +12,10 @@ Enemies::Enemies(GameMode mode, sf::RenderWindow &win) : window(win), Enemy(mode } } void Enemies::display_enemys() void Enemies::display_enemys(sf::RenderWindow &win) { for (int i = 0; i < enemy.size(); ++i) { enemy[i].draw_enemy(window); enemy[i].draw_enemy(win); } }
Enemies.h +2 −3 Original line number Diff line number Diff line Loading @@ -8,13 +8,12 @@ class Enemies : public Enemy{ std::vector<Enemy> enemy; sf::RenderWindow &window; public: Enemies(GameMode mode, sf::RenderWindow &win); Enemies(GameMode mode); void add_enemy(); void remove_enemy(int &i); void display_enemys(); void display_enemys(sf::RenderWindow &win); }; Loading