aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/cpp/Map.cpp
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-02-12 19:31:00 +0100
committerNao Pross <naopross@thearcway.org>2018-02-12 19:31:00 +0100
commit6a1ad62b26698e2483a7ec692c60f6cc3fa76561 (patch)
tree9738ac38f2badd87589481a63116b440ee5c9d3c /src/main/cpp/Map.cpp
parentEdit makefile to build and run c++ by default (diff)
downloadSubconscious-old-6a1ad62b26698e2483a7ec692c60f6cc3fa76561.tar.gz
Subconscious-old-6a1ad62b26698e2483a7ec692c60f6cc3fa76561.zip
Add Actor* member to tiles and implement Map::moveActor()
Diffstat (limited to 'src/main/cpp/Map.cpp')
-rw-r--r--src/main/cpp/Map.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/cpp/Map.cpp b/src/main/cpp/Map.cpp
index 6d3ee01..3cb1b9d 100644
--- a/src/main/cpp/Map.cpp
+++ b/src/main/cpp/Map.cpp
@@ -24,5 +24,6 @@ const std::vector<Tile>& Map::tiles() const
bool Map::moveActor(Tile &from, Tile &to)
{
- // TODO
+ to.actor(from.actor());
+ from.clearActor();
}