projects
/
TDDC76_proj.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1edb61
)
Fixed merge error
author
lukel495
<lukel495@su15-111.ad.liu.se>
Wed, 15 Nov 2023 13:43:47 +0000
(14:43 +0100)
committer
lukel495
<lukel495@su15-111.ad.liu.se>
Wed, 15 Nov 2023 13:43:47 +0000
(14:43 +0100)
src/States.cc
patch
|
blob
|
history
diff --git
a/src/States.cc
b/src/States.cc
index 8521e78c8bb9b58c66bce0bb145f407fbb6d4386..28269a028bffc806b74989878883e722147d9b6f 100644
(file)
--- 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);