Update for Tiled 1.10

CMakeLists.txt

@@ -80,7 +80,7 @@ set(CMAKE_C_STANDARD 17)
 set(CMAKE_C_EXTENSIONS OFF)
 set(CMAKE_C_FLAGS_RELEASE "-O2")
 if(WIN32)
-    set(CMAKE_C_FLAGS_DEBUG "-Z7")
+    set(CMAKE_C_FLAGS_DEBUG "-Od -Z7")
 else()
     set(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -fsanitize=address -fsanitize=undefined") 
 endif()

include/tmj.h

@@ -84,29 +84,17 @@ typedef struct Text{
     int pixelsize;
 } Text;
 
-typedef enum OBJECT_TYPE{
-    OBJECT,
-    ELLIPSE,
-    RECTANGLE,
-    POINT,
-    POLYGON,
-    POLYLINE,
-    TEXT
-} object_type;
-
 /**
  * https://doc.mapeditor.org/en/stable/reference/json-map-format/#object
  */
 typedef struct Object {
-    object_type type;
-
     bool ellipse;
     bool point;
     bool visible;
 
-    char* class; // Optional
     char* name;
     char* template;
+    char* type; // Optional
 
     int gid;
     int id;
@@ -221,8 +209,8 @@ typedef struct Frame {
  * https://doc.mapeditor.org/en/stable/reference/json-map-format/#tile-definition
  */
 typedef struct Tile {
-    char* class; // Optional
     char* image; // Optional
+    char* type; // Optional
 
     int id;
     int imageheight;

src/decode.c

@@ -137,7 +137,7 @@ uint8_t* tmj_zlib_decompress(const uint8_t* data, size_t data_size, size_t* deco
                     return NULL;
                 }
 
-                logmsg(TMJ_LOG_DEBUG, "Decode (zlib): Z_BUF_TMJ_LOG_ERROR");
+                logmsg(TMJ_LOG_DEBUG, "Decode (zlib): Z_BUF_ERROR");
             case Z_OK:
                 logmsg(TMJ_LOG_DEBUG, "Decode (zlib): inflate OK");
 

src/map.c

@@ -195,17 +195,17 @@ Object* unpack_objects(json_t* objects){
                                   0,
                                   "{"
                                   "s?b, s?b, s:b,"
-                                  "s?s, s:s, s?s,"
+                                  "s:s, s?s, s?s,"
                                   "s?i, s:i,"
                                   "s:F, s:F, s:F, s:F, s:F,"
                                   "s?o"
                                   "}",
                                   "ellipse", &ret[idx].ellipse,
                                   "point", &ret[idx].point,
                                   "visible", &ret[idx].visible,
-                                  "class", &ret[idx].class,
                                   "name", &ret[idx].name,
                                   "template", &ret[idx].template,
+                                  "type", &ret[idx].type,
                                   "gid", &ret[idx].gid,
                                   "id", &ret[idx].id,
                                   "height", &ret[idx].height,

src/tileset.c

@@ -247,8 +247,8 @@ int unpack_tileset(json_t* tileset, Tileset* ret){
                                   "s?F,"
                                   "s?o, s?o, s?o, s?o"
                                   "}",
-                                  "class", &ret->tiles[idx].class,
                                   "image", &ret->tiles[idx].image,
+                                  "type", &ret->tiles[idx].type,
                                   "id", &ret->tiles[idx].id,
                                   "imageheight", &ret->tiles[idx].imageheight,
                                   "imagewidth", &ret->tiles[idx].imagewidth,