diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/level.cpp | 6 | ||||
| -rw-r--r-- | src/level.h | 4 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/level.cpp b/src/level.cpp index b66aa3c..e88191a 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -96,9 +96,9 @@ void Level::draw(Bitmap& bitmap, int xo, int yo) } } -Train* Level::addVehicle() +Train& Level::addVehicle() { - return &m_vehicles.emplace_back(*this); + return m_vehicles.emplace_back(*this); } void Level::toggleTile(int x, int y) @@ -214,4 +214,4 @@ TrackDirection ChooseDirection(Level& level, int x, int y) } return NorthSouth; -}
\ No newline at end of file +} diff --git a/src/level.h b/src/level.h index cfe40e8..7bd52e2 100644 --- a/src/level.h +++ b/src/level.h @@ -38,7 +38,7 @@ public: void update(); void draw(Bitmap& bitmap, int xo, int yo); - Train* addVehicle(); + Train& addVehicle(); void toggleTile(int x, int y); void save() const; @@ -51,4 +51,4 @@ private: std::vector<Train> m_vehicles; }; -TrackDirection ChooseDirection(Level& level, int x, int y);
\ No newline at end of file +TrackDirection ChooseDirection(Level& level, int x, int y); diff --git a/src/main.cpp b/src/main.cpp index b555aa5..dcd5975 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,9 +46,9 @@ int main(int argc, char** argv) int my = y / Scale + yOffs; auto pos = ScreenToTile({ mx, my }); - Train* train = level.addVehicle(); - train->setPosition(pos.x, pos.y); - train->setSpeed(0.2f); + Train& train = level.addVehicle(); + train.setPosition(pos.x, pos.y); + train.setSpeed(0.2f); } }); |