diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Game.cpp | 12 | ||||
| -rw-r--r-- | src/Makefile | 15 |
2 files changed, 5 insertions, 22 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(); diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index b4ed4bd..0000000 --- a/src/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -CXX = g++ -CXXFLAGS = --std=c++14 -g -O2 -Wall -SRC_DIR = src/ -OBJECTS = main.o State.o Game.o Global.o Enemy1.o Enemy2.o Enemy3.o Powerup.o Entity.o Player.o - -all: sfml-rpg - -sfml-rpg: $(OBJECTS) - $(CXX) $(CXXFLAGS) $(OBJECTS) -o sfml-rpg -lsfml-graphics -lsfml-window -lsfml-system - -%.o : %.cpp - $(CXX) $(CXXFLAGS) -c $< - -clean: - rm -f $(OBJECTS) sfml-rpg |