X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/875a5450a1974299bbfad500c4b0d5eedb60fc7c..5df5b3536a7e824c1340a07f3c26a7c61e78b68b:/mock/tools/level-converter.cc

diff --git a/mock/tools/level-converter.cc b/mock/tools/level-converter.cc
index d99928c..e4ab5ed 100644
--- a/mock/tools/level-converter.cc
+++ b/mock/tools/level-converter.cc
@@ -21,6 +21,8 @@ enum {
   LEVEL_LINE_COUNT = 13
 };
 
+#define PATH_PREFIX "../badge/jumpnrun/"
+
 namespace jnrcpp {
   struct descriptors {
     descriptors() {
@@ -40,7 +42,12 @@ namespace jnrcpp {
       enemies.add
         ("cat"      , JUMPNRUN_ENEMY_TYPE_CAT      )
         ("mushroom" , JUMPNRUN_ENEMY_TYPE_MUSHROOM )
-	("kaninchen", JUMPNRUN_ENEMY_TYPE_KANINCHEN)
+        ("bunny"    , JUMPNRUN_ENEMY_TYPE_BUNNY    )
+        ("kaninchen", JUMPNRUN_ENEMY_TYPE_BUNNY    ) // legacy
+        ("snake"    , JUMPNRUN_ENEMY_TYPE_SNAKE    )
+        ("spiral"   , JUMPNRUN_ENEMY_TYPE_SPIRAL   )
+        ("rotor"    , JUMPNRUN_ENEMY_TYPE_ROTOR    )
+        ("dog"      , JUMPNRUN_ENEMY_TYPE_DOG      )
         ;
     }
 
@@ -51,10 +58,10 @@ namespace jnrcpp {
 
   struct level_name_map {
     level_name_map() {
-      std::ifstream in("jumpnrun/levels.txt");
+      std::ifstream in(PATH_PREFIX "levels.txt");
 
       if(!in) {
-        throw std::logic_error("jumpnrun/levels.txt konnte nicht geöffnet werden.");
+        throw std::logic_error(PATH_PREFIX "levels.txt konnte nicht geöffnet werden.");
       }
 
       std::string name;
@@ -74,7 +81,7 @@ namespace jnrcpp {
       : name(name),
         level_lines(LEVEL_LINE_COUNT)
     {
-      std::ifstream in(("jumpnrun/" + name + ".lv").c_str());
+      std::ifstream in((PATH_PREFIX + name + ".lv").c_str());
 
       if(!in) {
         throw std::invalid_argument("Could not open file: " + name + ".lv");
@@ -238,7 +245,7 @@ namespace jnrcpp {
 void jumpnrun_level_dump(size_t level) {
   std::string name = jnrcpp::level_names.names[level];
   jnrcpp::level lv(name);
-  std::ofstream out(("jumpnrun/" + name + ".lvl").c_str());
+  std::ofstream out((PATH_PREFIX + name + ".lvl").c_str());
 
   lv.dump(out);
 }