From 5245ad67d7984b14a389a66d6c4435bf08c5739a Mon Sep 17 00:00:00 2001 From: Wintermute Date: Tue, 22 Oct 2013 20:23:03 +0200 Subject: [PATCH] =?utf8?q?Eigenes=20Verzeichnis=20f=C3=BCr=20Level=20spend?= =?utf8?q?iert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- badge/jumpnrun/{ => levels}/foo.lv | 0 badge/jumpnrun/{ => levels}/gnobbel.lv | 0 badge/jumpnrun/{ => levels}/levels.lst | 0 badge/jumpnrun/{ => levels}/levels.txt | 0 badge/jumpnrun/{ => levels}/lubiXOXO.lv | 0 badge/jumpnrun/{ => levels}/lubilove.lv | 0 badge/jumpnrun/{ => levels}/mean.lv | 0 badge/jumpnrun/{ => levels}/skynet.lv | 0 badge/jumpnrun/{ => levels}/sleazy.lv | 0 badge/jumpnrun/{ => levels}/slentry.lv | 0 badge/jumpnrun/{ => levels}/sljowy.lv | 0 badge/jumpnrun/{ => levels}/slpipe.lv | 0 badge/jumpnrun/{ => levels}/slsky.lv | 0 badge/jumpnrun/{ => levels}/slsnake.lv | 0 badge/jumpnrun/{ => levels}/sltwice.lv | 0 badge/jumpnrun/{ => levels}/smb.lv | 0 badge/jumpnrun/{ => levels}/wrongtrn.lv | 0 mock/badge_main_loop.c | 6 ++++-- mock/tools/level-converter.cc | 2 +- 19 files changed, 5 insertions(+), 3 deletions(-) rename badge/jumpnrun/{ => levels}/foo.lv (100%) rename badge/jumpnrun/{ => levels}/gnobbel.lv (100%) rename badge/jumpnrun/{ => levels}/levels.lst (100%) rename badge/jumpnrun/{ => levels}/levels.txt (100%) rename badge/jumpnrun/{ => levels}/lubiXOXO.lv (100%) rename badge/jumpnrun/{ => levels}/lubilove.lv (100%) rename badge/jumpnrun/{ => levels}/mean.lv (100%) rename badge/jumpnrun/{ => levels}/skynet.lv (100%) rename badge/jumpnrun/{ => levels}/sleazy.lv (100%) rename badge/jumpnrun/{ => levels}/slentry.lv (100%) rename badge/jumpnrun/{ => levels}/sljowy.lv (100%) rename badge/jumpnrun/{ => levels}/slpipe.lv (100%) rename badge/jumpnrun/{ => levels}/slsky.lv (100%) rename badge/jumpnrun/{ => levels}/slsnake.lv (100%) rename badge/jumpnrun/{ => levels}/sltwice.lv (100%) rename badge/jumpnrun/{ => levels}/smb.lv (100%) rename badge/jumpnrun/{ => levels}/wrongtrn.lv (100%) diff --git a/badge/jumpnrun/foo.lv b/badge/jumpnrun/levels/foo.lv similarity index 100% rename from badge/jumpnrun/foo.lv rename to badge/jumpnrun/levels/foo.lv diff --git a/badge/jumpnrun/gnobbel.lv b/badge/jumpnrun/levels/gnobbel.lv similarity index 100% rename from badge/jumpnrun/gnobbel.lv rename to badge/jumpnrun/levels/gnobbel.lv diff --git a/badge/jumpnrun/levels.lst b/badge/jumpnrun/levels/levels.lst similarity index 100% rename from badge/jumpnrun/levels.lst rename to badge/jumpnrun/levels/levels.lst diff --git a/badge/jumpnrun/levels.txt b/badge/jumpnrun/levels/levels.txt similarity index 100% rename from badge/jumpnrun/levels.txt rename to badge/jumpnrun/levels/levels.txt diff --git a/badge/jumpnrun/lubiXOXO.lv b/badge/jumpnrun/levels/lubiXOXO.lv similarity index 100% rename from badge/jumpnrun/lubiXOXO.lv rename to badge/jumpnrun/levels/lubiXOXO.lv diff --git a/badge/jumpnrun/lubilove.lv b/badge/jumpnrun/levels/lubilove.lv similarity index 100% rename from badge/jumpnrun/lubilove.lv rename to badge/jumpnrun/levels/lubilove.lv diff --git a/badge/jumpnrun/mean.lv b/badge/jumpnrun/levels/mean.lv similarity index 100% rename from badge/jumpnrun/mean.lv rename to badge/jumpnrun/levels/mean.lv diff --git a/badge/jumpnrun/skynet.lv b/badge/jumpnrun/levels/skynet.lv similarity index 100% rename from badge/jumpnrun/skynet.lv rename to badge/jumpnrun/levels/skynet.lv diff --git a/badge/jumpnrun/sleazy.lv b/badge/jumpnrun/levels/sleazy.lv similarity index 100% rename from badge/jumpnrun/sleazy.lv rename to badge/jumpnrun/levels/sleazy.lv diff --git a/badge/jumpnrun/slentry.lv b/badge/jumpnrun/levels/slentry.lv similarity index 100% rename from badge/jumpnrun/slentry.lv rename to badge/jumpnrun/levels/slentry.lv diff --git a/badge/jumpnrun/sljowy.lv b/badge/jumpnrun/levels/sljowy.lv similarity index 100% rename from badge/jumpnrun/sljowy.lv rename to badge/jumpnrun/levels/sljowy.lv diff --git a/badge/jumpnrun/slpipe.lv b/badge/jumpnrun/levels/slpipe.lv similarity index 100% rename from badge/jumpnrun/slpipe.lv rename to badge/jumpnrun/levels/slpipe.lv diff --git a/badge/jumpnrun/slsky.lv b/badge/jumpnrun/levels/slsky.lv similarity index 100% rename from badge/jumpnrun/slsky.lv rename to badge/jumpnrun/levels/slsky.lv diff --git a/badge/jumpnrun/slsnake.lv b/badge/jumpnrun/levels/slsnake.lv similarity index 100% rename from badge/jumpnrun/slsnake.lv rename to badge/jumpnrun/levels/slsnake.lv diff --git a/badge/jumpnrun/sltwice.lv b/badge/jumpnrun/levels/sltwice.lv similarity index 100% rename from badge/jumpnrun/sltwice.lv rename to badge/jumpnrun/levels/sltwice.lv diff --git a/badge/jumpnrun/smb.lv b/badge/jumpnrun/levels/smb.lv similarity index 100% rename from badge/jumpnrun/smb.lv rename to badge/jumpnrun/levels/smb.lv diff --git a/badge/jumpnrun/wrongtrn.lv b/badge/jumpnrun/levels/wrongtrn.lv similarity index 100% rename from badge/jumpnrun/wrongtrn.lv rename to badge/jumpnrun/levels/wrongtrn.lv diff --git a/mock/badge_main_loop.c b/mock/badge_main_loop.c index 41d4113..70da0ff 100644 --- a/mock/badge_main_loop.c +++ b/mock/badge_main_loop.c @@ -13,9 +13,11 @@ #define MAX_LEVELS 1024 +#define PATH_PREFIX "../badge/jumpnrun/levels/" + void badge_main_loop(void) { char menu_buf[MAX_LEVELS][32]; - FILE *fd = fopen("../badge/jumpnrun/levels.txt", "r"); + FILE *fd = fopen(PATH_PREFIX "levels.txt", "r"); int i; @@ -36,7 +38,7 @@ void badge_main_loop(void) { for(;;) { choice = badge_menu(menu, ARRAY_SIZE(menu), &first_visible, choice); char lvname[256]; - sprintf(lvname, "../badge/jumpnrun/%s.lvl", menu[choice]); + sprintf(lvname, PATH_PREFIX "%s.lvl", menu[choice]); jumpnrun_play_level(lvname); } diff --git a/mock/tools/level-converter.cc b/mock/tools/level-converter.cc index 88e9315..b900cdb 100644 --- a/mock/tools/level-converter.cc +++ b/mock/tools/level-converter.cc @@ -22,7 +22,7 @@ enum { LEVEL_LINE_COUNT = 14 }; -#define PATH_PREFIX "../badge/jumpnrun/" +#define PATH_PREFIX "../badge/jumpnrun/levels/" namespace jnrcpp { struct descriptors { -- 2.20.1