diff --git a/Makefile b/Makefile index c714de1..80d0060 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ INCLUDE = -I ./include -I lib/gamacon/include -I lib/gamacon/lib/xmlparser/inclu CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra LDFLAGS = -L lib/gamacon -L lib/my -L lib/xmlparser -L lib/quadtree\ --lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-window -lm +-lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-audio -lcsfml-window -lm NAME = my_runner diff --git a/assets/musics/music.m4a b/assets/musics/music.m4a new file mode 100644 index 0000000..3d06a28 Binary files /dev/null and b/assets/musics/music.m4a differ diff --git a/assets/musics/music.ogg b/assets/musics/music.ogg new file mode 100644 index 0000000..d92661a Binary files /dev/null and b/assets/musics/music.ogg differ diff --git a/lib/gamacon b/lib/gamacon index b8245b3..c42c412 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit b8245b3f5dd18e31b0c33515b093ff92bccfc74e +Subproject commit c42c41291f0dcd526ecc823b6572aea0e07aeffa diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 6211013..f8da168 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -6,6 +6,7 @@ + diff --git a/prefabs/pause.gcprefab b/prefabs/pause.gcprefab new file mode 100644 index 0000000..1f305a4 --- /dev/null +++ b/prefabs/pause.gcprefab @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/game_loader.c b/src/game_loader.c index 114a175..66be0d4 100644 --- a/src/game_loader.c +++ b/src/game_loader.c @@ -56,6 +56,10 @@ int start_game(const char *map) return (ERROR); while (engine->is_open(engine)) { engine->game_loop(engine, sfTime_asSeconds(sfClock_restart(clock))); + if (engine->is_keypressed(sfKeyEscape)) { + prefab_load(engine, "prefabs/pause.gcprefab"); + sfClock_restart(clock); + } } engine->destroy(engine); sfClock_destroy(clock);