Browse Source

use settings instead of persistentStorage

Laserlicht 8 months ago
parent
commit
52f7caa0e4

+ 1 - 1
client/mapView/MapView.cpp

@@ -211,7 +211,7 @@ void MapView::onViewMapActivated()
 {
 	controller->activateAdventureContext();
 
-	int zoom = persistentStorage["tileZoom"].Integer();
+	int zoom = settings["adventure"]["tileZoom"].Integer();
 	if(zoom)
 		controller->setTileSize(Point(zoom, zoom));
 	else

+ 1 - 1
client/mapView/MapViewController.cpp

@@ -140,7 +140,7 @@ void MapViewController::modifyTileSize(int stepsChange, bool useDeadZone)
 
 		if (adventureContext)
 		{
-			Settings tileZoom = persistentStorage.write["tileZoom"];
+			Settings tileZoom = settings.write["adventure"]["tileZoom"];
 			tileZoom->Integer() = actualZoom.x;
 		}
 	}

+ 2 - 2
client/windows/CKingdomInterface.cpp

@@ -475,7 +475,7 @@ CKingdomInterface::CKingdomInterface()
 	statusbar = CGStatusBar::create(std::make_shared<CPicture>(ImagePath::builtin("KSTATBAR"), 10,pos.h - 45));
 	resdatabar = std::make_shared<CResDataBar>(ImagePath::builtin("KRESBAR"), 7, 111+footerPos, 29, 3, 76, 81);
 
-	activateTab(persistentStorage["gui"]["lastKindomInterface"].Integer());
+	activateTab(settings["general"]["lastKindomInterface"].Integer());
 }
 
 void CKingdomInterface::generateObjectsList(const std::vector<const CGObjectInstance * > &ownedObjects)
@@ -640,7 +640,7 @@ void CKingdomInterface::generateButtons()
 
 void CKingdomInterface::activateTab(size_t which)
 {
-	Settings s = persistentStorage.write["gui"]["lastKindomInterface"];
+	Settings s = settings.write["general"]["lastKindomInterface"];
 	s->Integer() = which;
 
 	btnHeroes->block(which == 0);

+ 11 - 2
config/schemas/settings.json

@@ -43,7 +43,8 @@
 				"startTurnAutosave",
 				"enableUiEnhancements",
 				"audioMuteFocus",
-				"enableOverlay"
+				"enableOverlay",
+				"lastKindomInterface"
 			],
 			"properties" : {
 				"playerName" : {
@@ -151,6 +152,10 @@
 				"enableOverlay" : {
 					"type": "boolean",
 					"default": true
+				},
+				"lastKindomInterface" : {
+					"type" : "number",
+					"default" : 0
 				}
 			}
 		},
@@ -372,7 +377,7 @@
 			"type" : "object",
 			"additionalProperties" : false,
 			"default" : {},
-			"required" : [ "heroMoveTime", "enemyMoveTime", "scrollSpeedPixels", "heroReminder", "quickCombat", "objectAnimation", "terrainAnimation", "forceQuickCombat", "borderScroll", "leftButtonDrag", "rightButtonDrag", "smoothDragging", "backgroundDimLevel", "hideBackground", "backgroundDimSmallWindows" ],
+			"required" : [ "heroMoveTime", "enemyMoveTime", "scrollSpeedPixels", "heroReminder", "quickCombat", "objectAnimation", "terrainAnimation", "forceQuickCombat", "borderScroll", "leftButtonDrag", "rightButtonDrag", "smoothDragging", "backgroundDimLevel", "hideBackground", "backgroundDimSmallWindows", "tileZoom" ],
 			"properties" : {
 				"heroMoveTime" : {
 					"type" : "number",
@@ -436,6 +441,10 @@
 				"backgroundDimSmallWindows" : {
 					"type" : "boolean",
 					"default" : false
+				},
+				"tileZoom" : {
+					"type" : "number",
+					"default" : 32
 				}
 			}
 		},