From: lukel495 <lukel495@su15-111.ad.liu.se>
Date: Wed, 15 Nov 2023 13:43:47 +0000 (+0100)
Subject: Fixed merge error
X-Git-Url: https://gitweb.forssennils.se/?a=commitdiff_plain;h=dded46b176dd4bfdb66c26cfe130a7f99463c92b;p=TDDC76_proj.git

Fixed merge error
---

diff --git a/src/States.cc b/src/States.cc
index 8521e78..28269a0 100644
--- a/src/States.cc
+++ b/src/States.cc
@@ -86,9 +86,9 @@ void Game_state::update(Context &context)
 void Game_state::render(sf::RenderWindow &window) const
 {
     game_map.render(window);
-    player.render(window);
+    player->render(window);
     enemy.render(window);
-    helper.render(window);
+    helper->render(window);
     for (int i{}; i < int(bottles.size()); ++i)
     {
         bottles[i]->render(window);