Menü.

[hackover2013-badge-firmware.git] / mock / tools / level-converter.cc

diff --git a/mock/tools/level-converter.cc b/mock/tools/level-converter.cc
index f54b589..54be8f7 100644 (file)
--- a/mock/tools/level-converter.cc
+++ b/mock/tools/level-converter.cc
@@ -18,7 +18,7 @@ extern "C" {
 #include <vector>
 
 enum {
 #include <vector>
 
 enum {

-  LEVEL_LINE_COUNT = 13
+  LEVEL_LINE_COUNT = 14

 };
 
 #define PATH_PREFIX "../badge/jumpnrun/"
 };
 
 #define PATH_PREFIX "../badge/jumpnrun/"


@@ -33,10 +33,17 @@ namespace jnrcpp {
         ("tube_right"    , JUMPNRUN_TILE_TYPE_TUBE_RIGHT    )
         ("brick"         , JUMPNRUN_TILE_TYPE_BRICK         )
         ("square"        , JUMPNRUN_TILE_TYPE_SQUARE        )
         ("tube_right"    , JUMPNRUN_TILE_TYPE_TUBE_RIGHT    )
         ("brick"         , JUMPNRUN_TILE_TYPE_BRICK         )
         ("square"        , JUMPNRUN_TILE_TYPE_SQUARE        )

+        ("spike_up"      , JUMPNRUN_TILE_TYPE_SPIKE_UP      )
+        ("spike_right"   , JUMPNRUN_TILE_TYPE_SPIKE_RIGHT   )
+        ("spike_down"    , JUMPNRUN_TILE_TYPE_SPIKE_DOWN    )
+        ("spike_left"    , JUMPNRUN_TILE_TYPE_SPIKE_LEFT    )

         ;
 
       items.add
         ;
 
       items.add

-        ("doc", JUMPNRUN_ITEM_TYPE_DOCUMENT)
+        ("doc"          , JUMPNRUN_ITEM_TYPE_DOCUMENT          )
+        ("checkpoint"   , JUMPNRUN_ITEM_TYPE_CHECKPOINT        )
+        ("key"          , JUMPNRUN_ITEM_TYPE_KEY               )
+        ("doc_encrypted", JUMPNRUN_ITEM_TYPE_ENCRYPTED_DOCUMENT)

         ;
 
       enemies.add
         ;
 
       enemies.add


@@ -176,7 +183,7 @@ namespace jnrcpp {
 
           if(iter != objmap.end()) {
             unsigned char buf[3];
 
           if(iter != objmap.end()) {
             unsigned char buf[3];

-            buf[0] = static_cast<uint8_t>(y + 1) << 4 | static_cast<uint8_t>(x >> 8);
+            buf[0] = static_cast<uint8_t>(y) << 4 | static_cast<uint8_t>(x >> 8);

             buf[1] = static_cast<uint8_t>(x);
             buf[2] = static_cast<uint8_t>(find_type(types, iter->second, error));
 
             buf[1] = static_cast<uint8_t>(x);
             buf[2] = static_cast<uint8_t>(find_type(types, iter->second, error));