sfja/reimar-zombo-shooter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use new and delete

Browse Source
This commit is contained in:
Simon From Jakobsen 2025-10-29 13:09:16 +01:00
parent 012d021a08
commit 127b96a92f
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Game.cpp
View File

@ -8,13 +8,6 @@
using namespace std::literals::chrono_literals; using namespace std::literals::chrono_literals;
Game::~Game()
{
for (const Arrow *arrow : arrows) {
delete arrow;
}
}
void Game::update(std::stop_token stop_token) void Game::update(std::stop_token stop_token)
{ {
while (!stop_token.stop_requested()) { while (!stop_token.stop_requested()) {
@ -25,16 +18,16 @@ void Game::update(std::stop_token stop_token)
player.update(); player.update();
for (Arrow *arrow : arrows) { for (auto& arrow : arrows) {
arrow->update(); arrow.update();
} }
for (Zombo *zombo : zombos) { for (auto& zombo : zombos) {
zombo->update(player.x, player.y); zombo.update(player.x, player.y);
} }
if (ticks % 1000 == 0) { if (ticks % 1000 == 0) {
zombos.push_back(new Zombo(&renderer, 20.0, 20.0)); // doesn't work :(((( zombos.push_back(Zombo(&renderer, 20.0, 20.0)); // doesn't work :((((
} }
renderer.redraw(); renderer.redraw();
@ -54,8 +47,8 @@ void Game::draw()
map.draw(player.x, player.y); map.draw(player.x, player.y);
for (const Arrow *arrow : arrows) { for (const auto& arrow : arrows) {
arrow->draw(player.x, player.y); arrow. draw(player.x, player.y);
} }
player.draw(); player.draw();
@ -117,7 +110,7 @@ void Game::run()
} }
if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == 1) { if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == 1) {
arrows.push_back(new Arrow(&renderer, player.x, player.y, player.angle)); arrows.push_back(Arrow(&renderer, player.x, player.y, player.angle));
} }
int mouse_x, mouse_y; int mouse_x, mouse_y;

7
src/Game.hpp
View File

@ -1,7 +1,6 @@
#ifndef GAME_HPP #ifndef GAME_HPP
#define GAME_HPP #define GAME_HPP
#include <thread>
#include <vector> #include <vector>
#include <mutex> #include <mutex>
#include "Arrow.hpp" #include "Arrow.hpp"
@ -16,8 +15,8 @@ private:
GameRenderer renderer; GameRenderer renderer;
Player player; Player player;
Map map; Map map;
std::vector<Arrow*> arrows; std::vector<Arrow> arrows;
std::vector<Zombo*> zombos; std::vector<Zombo> zombos;
std::mutex game_mutex; std::mutex game_mutex;
unsigned int ticks = 0; unsigned int ticks = 0;
@ -27,8 +26,6 @@ private:
public: public:
Game() : renderer("Zombo Shooter", 800, 450), player(&renderer), map(&renderer, 40) {} Game() : renderer("Zombo Shooter", 800, 450), player(&renderer), map(&renderer, 40) {}
~Game();
void run(); void run();
void draw(); void draw();