Merge remote-tracking branch 'origin/master' into pikalax_work

1 files changed, 2 insertions, 1 deletions

diff --git a/tools/nitrogfx/json.c b/tools/nitrogfx/json.c
index aad325be..b825c363 100644
--- a/tools/nitrogfx/json.c
+++ b/tools/nitrogfx/json.c
@@ -51,16 +51,17 @@ struct JsonToCellOptions *ParseNCERJson(char *path)
     cJSON *imageHeight = cJSON_GetObjectItemCaseSensitive(json, "imageHeight");
     cJSON *imageWidth = cJSON_GetObjectItemCaseSensitive(json, "imageWidth");
     cJSON *cellCount = cJSON_GetObjectItemCaseSensitive(json, "cellCount");
+    cJSON *mappingType = cJSON_GetObjectItemCaseSensitive(json, "mappingType");
 
     options->labelEnabled = GetBool(labelBool);
     options->extended = GetBool(extended);
     options->imageHeight = GetInt(imageHeight);
     options->imageWidth = GetInt(imageWidth);
     options->cellCount = GetInt(cellCount);
+    options->mappingType = GetInt(mappingType);
 
     options->cells = malloc(sizeof(struct Cell *) * options->cellCount);
 
-
     if (options->labelEnabled)
     {
         cJSON *labelCount = cJSON_GetObjectItemCaseSensitive(json, "labelCount");