aboutsummaryrefslogtreecommitdiff
path: root/src/Game.cpp
diff options
context:
space:
mode:
authoraleksav013 <aleksav013@gmail.com>2021-06-03 10:16:19 +0200
committeraleksav013 <aleksav013@gmail.com>2021-06-03 10:16:19 +0200
commit4a4ed128e30bb7318cef1e5f74f28a0c96fe1686 (patch)
treecc2745c6ffd29ada5ddd0fa0e8de1813ef8862d4 /src/Game.cpp
parentdbe41a2f77774ee716d3ff45db766d6400970f57 (diff)
Finishing Makefile
Diffstat (limited to 'src/Game.cpp')
-rw-r--r--src/Game.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Game.cpp b/src/Game.cpp
index fdb5f54..a0c28af 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -24,7 +24,7 @@ void Game::initshapes()
}
void Game::initui()
{
- if(!font.loadFromFile("../assets/fonts/LiberationMono-Regular.ttf"))
+ if(!font.loadFromFile("assets/fonts/LiberationMono-Regular.ttf"))
{
std::cerr<<"Font not found\n";
}
@@ -49,11 +49,11 @@ void Game::initui()
}
void Game::inittex()
{
- if(!healthtex.loadFromFile("../assets/images/healing.png"))
+ if(!healthtex.loadFromFile("assets/images/healing.png"))
{
std::cerr<<"Texture not found\n";
}
- if(!neprijateljtex.loadFromFile("../assets/images/nep.png"))
+ if(!neprijateljtex.loadFromFile("assets/images/nep.png"))
{
std::cerr<<"Texture not found\n";
}
@@ -83,10 +83,10 @@ void Game::updatewin()
Game::Game(sf::RenderWindow *glprozor)
{
prozor=glprozor;
- initui();
updatewin();
- initent();
+ initui();
initshapes();
+ initent();
inittex();
}
bool Game::gameover()
@@ -261,10 +261,8 @@ void Game::respawn()
void Game::run()
{
if(gameover()) return;
-
updateui();
igrac.updatest(dt);
-
respawn();
position();
checkcollision();