- rework parse cursor

- fix newGame.json loading panel twice

gamefiles/level/newGame.json

@@ -20,7 +20,6 @@
           { "name": "loadingScreen.setProgress", "progress": 45 },
           { "name": "load", "file": ["level/player/save.json", "%charName%", "%charClass%"] },
           { "name": "load", "file": ["level/player/loadCel.json", "%charName%"] },
-          { "name": "load", "file": "level/loadBaseLevel.json" },
           { "name": "loadingScreen.setProgress", "progress": 55 },
           { "name": "resource.add", "id": "currentLevel" },
           { "name": "load", "file": "level/town/level.json" },

gamefiles/ui/credits.json

@@ -4,7 +4,7 @@
     "id": "credits",
     "ignorePrevious": true
   },
-  "cursor": {},
+  "cursor": null,
   "keyboard": {
     "key": ["enter", "esc", " "],
     "action": { "name": "button.click", "id": "back" }

gamefiles/ui/playVideo.json

@@ -9,7 +9,7 @@
       "name": "audio.pauseAll"
     }
   ],
-  "cursor": {},
+  "cursor": null,
   "keyboard": {
     "key": ["enter", "esc", " "],
     "action": { "name": "button.click", "id": "background" }

gamefiles/ui/settings.json

@@ -52,9 +52,6 @@
       "mask": "0x00FF00"
     }
   ],
-  "cursor": {
-    "texture": "cursor"
-  },
   "image": {
     "id": "mainmenu",
     "texture": "mainmenu",

src/Parser/ParseCursor.cpp

@@ -21,9 +21,19 @@ namespace Parser
 
 	void parseCursor(Game& game, const Value& elem)
 	{
+		if (elem.IsNull() == true)
+		{
+			game.Resources().addCursor(nullptr);
+			return;
+		}
+		else if (elem.IsObject() == false)
+		{
+			return;
+		}
+
 		game.Window().setMouseCursorVisible(getBool(elem, "show"));
 
-		if (getBool(elem, "pop") == true)
+		if (getBool(elem, "pop", false) == true)
 		{
 			game.Resources().popCursor();
 			game.updateMouse();
@@ -41,9 +51,5 @@ namespace Parser
 			game.Resources().addCursor(cursor);
 			game.updateMouse();
 		}
-		else
-		{
-			game.Resources().addCursor(nullptr);
-		}
 	}
 }