From 7803be09b7c0a133b1009408fea2fb1f1474e786 Mon Sep 17 00:00:00 2001 From: cflip Date: Wed, 30 Mar 2022 21:48:07 -0600 Subject: Store train objects in a unique_ptr The trains were being destructed after leaving the scope of the addVehicle function. This change makes sure the trains stay allocated for the entire lifetime of the level. Fixes #2 --- src/level.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/level.h') diff --git a/src/level.h b/src/level.h index 7bd52e2..fa6376d 100644 --- a/src/level.h +++ b/src/level.h @@ -1,10 +1,11 @@ #pragma once -#include "bitmap.h" #include -#include +#include #include +#include "bitmap.h" + #define TILE_TYPE(x) ((x)&0xf) #define TILE_DATA(x) (x >> 4 & 0xf) #define MAKE_TILE(t, d) ((((d)&0xf) << 4) + ((t)&0xf)) @@ -38,17 +39,18 @@ public: void update(); void draw(Bitmap& bitmap, int xo, int yo); - Train& addVehicle(); + void addVehicle(int x, int y); void toggleTile(int x, int y); void save() const; void load(); + private: Bitmap& m_tileSprites; int m_width, m_height; uint8_t* m_tiles; - std::vector m_vehicles; + std::vector> m_vehicles; }; TrackDirection ChooseDirection(Level& level, int x, int y); -- cgit v1.2.3