Key non-collidable after collection

justin-ys · Dec 27, 2023 · 7c9767f · 7c9767f
1 parent b890707
commit 7c9767f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/game/entities/misc.cpp b/game/entities/misc.cpp
@@ -12,11 +12,12 @@ void LevelTransition::on_collide(std::shared_ptr<TileEntity> collider) {
 void Key::on_collide(std::shared_ptr<TileEntity> collider) {
 	std::shared_ptr<Player> player = std::dynamic_pointer_cast<Player>(collider);
 	if (player) {
+		isCollidable = false;
 		Event ev("GAME_KeyCollect");
 		eventManager->emit(ev);
+		collectedTimer.reset();
+		state = KeyState::Collected;
 	}
-	collectedTimer.reset();
-	state = KeyState::Collected;
 }
 
 void Key::on_update() {

diff --git a/include/levelmap.h b/include/levelmap.h
@@ -34,8 +34,7 @@ class TileEntity : public Object, public std::enable_shared_from_this<TileEntity
 	protected:
 		std::shared_ptr<LevelMap> world;
 	public:
-	    // getter/setter
-		const bool isCollidable;
+		bool isCollidable;
 		const Tile* tile = nullptr;
 		void setTile(Tile* tileObj);
 		void setParent(std::shared_ptr<TileEntity> ent);