Renombradas las variables de param_t

source/load_param.cpp

@@ -9,30 +9,30 @@ bool setOptions(param_t *param, std::string var, std::string value);
 void initParam(param_t *param)
 {
 	// GAME
-	param->gameWidth = 320;
-	param->gameHeight = 240;
-	param->itemSize = 20;
+	param->game.width = 320;
+	param->game.height = 240;
+	param->game.itemSize = 20;
 
 	// SCOREBOARD
 	param->scoreboard = {0, 200, 320, 40};
 
 	// FADE
-	param->numSquaresWidth = 160;
-	param->numSquaresHeight = 120;
-	param->fadeRandomSquaresDelay = 1;
-	param->fadeRandomSquaresMult = 500;
-	param->fadePostDuration = 80;
-	param->venetianSize = 16;
+	param->fade.numSquaresWidth = 160;
+	param->fade.numSquaresHeight = 120;
+	param->fade.randomSquaresDelay = 1;
+	param->fade.randomSquaresMult = 500;
+	param->fade.postDuration = 80;
+	param->fade.venetianSize = 16;
 
 	// TITLE
-	param->pressStart = 160;
-	param->titleCounter = 800;
-	param->arcadeEdition = 123;
-	param->titleCC = 11;
+	param->title.pressStartPosition = 160;
+	param->title.titleDuration = 800;
+	param->title.arcadeEditionPosition = 123;
+	param->title.titleCCPosition = 11;
 
 	// BACKGROUND
-	param->backgroundAttenuateColor = {255, 255, 255};
-	param->backgroundAttenuateAlpha = 32;
+	param->background.attenuateColor = {255, 255, 255};
+	param->background.attenuateAlpha = 32;
 
 	// BALLOONS
 	param->balloon1.vel = 2.60f;
@@ -139,50 +139,50 @@ bool setOptions(param_t *param, std::string var, std::string value)
 	bool success = true;
 
 	// GAME
-	if (var == "gameWidth")
+	if (var == "game.width")
 	{
-		param->gameWidth = std::stoi(value);
+		param->game.width = std::stoi(value);
 	}
 
-	else if (var == "gameHeight")
+	else if (var == "game.height")
 	{
-		param->gameHeight = std::stoi(value);
+		param->game.height = std::stoi(value);
 	}
 
-	else if (var == "itemSize")
+	else if (var == "game.itemSize")
 	{
-		param->itemSize = std::stoi(value);
+		param->game.itemSize = std::stoi(value);
 	}
 
 	// FADE
-	else if (var == "numSquaresWidth")
+	else if (var == "fade.numSquaresWidth")
 	{
-		param->numSquaresWidth = std::stoi(value);
+		param->fade.numSquaresWidth = std::stoi(value);
 	}
 
-	else if (var == "numSquaresHeight")
+	else if (var == "fade.numSquaresHeight")
 	{
-		param->numSquaresHeight = std::stoi(value);
+		param->fade.numSquaresHeight = std::stoi(value);
 	}
 
-	else if (var == "fadeRandomSquaresDelay")
+	else if (var == "fade.randomSquaresDelay")
 	{
-		param->fadeRandomSquaresDelay = std::stoi(value);
+		param->fade.randomSquaresDelay = std::stoi(value);
 	}
 
-	else if (var == "fadeRandomSquaresMult")
+	else if (var == "fade.randomSquaresMult")
 	{
-		param->fadeRandomSquaresMult = std::stoi(value);
+		param->fade.randomSquaresMult = std::stoi(value);
 	}
 
-	else if (var == "fadePostDuration")
+	else if (var == "fade.postDuration")
 	{
-		param->fadePostDuration = std::stoi(value);
+		param->fade.postDuration = std::stoi(value);
 	}
 
-	else if (var == "venetianSize")
+	else if (var == "fade.venetianSize")
 	{
-		param->venetianSize = std::stoi(value);
+		param->fade.venetianSize = std::stoi(value);
 	}
 
 	// SCOREBOARD
@@ -207,45 +207,45 @@ bool setOptions(param_t *param, std::string var, std::string value)
 	}
 
 	// TITLE
-	else if (var == "pressStart")
+	else if (var == "title.pressStartPosition")
 	{
-		param->pressStart = std::stoi(value);
+		param->title.pressStartPosition = std::stoi(value);
 	}
 
-	else if (var == "titleCounter")
+	else if (var == "title.titleDuration")
 	{
-		param->titleCounter = std::stoi(value);
+		param->title.titleDuration = std::stoi(value);
 	}
 
-	else if (var == "arcadeEdition")
+	else if (var == "title.arcadeEditionPosition")
 	{
-		param->arcadeEdition = std::stoi(value);
+		param->title.arcadeEditionPosition = std::stoi(value);
 	}
 
-	else if (var == "titleCC")
+	else if (var == "title.titleCCPosition")
 	{
-		param->titleCC = std::stoi(value);
+		param->title.titleCCPosition = std::stoi(value);
 	}
 
 	// BACKGROUND
-	else if (var == "backgroundAttenuateColor.r")
+	else if (var == "background.attenuateColor.r")
 	{
-		param->backgroundAttenuateColor.r = std::stoi(value);
+		param->background.attenuateColor.r = std::stoi(value);
 	}
 
-	else if (var == "backgroundAttenuateColor.g")
+	else if (var == "background.attenuateColor.g")
 	{
-		param->backgroundAttenuateColor.g = std::stoi(value);
+		param->background.attenuateColor.g = std::stoi(value);
 	}
 
-	else if (var == "backgroundAttenuateColor.b")
+	else if (var == "background.attenuateColor.b")
 	{
-		param->backgroundAttenuateColor.b = std::stoi(value);
+		param->background.attenuateColor.b = std::stoi(value);
 	}
 
-	else if (var == "backgroundAttenuateColor.a")
+	else if (var == "background.attenuateAlpha")
 	{
-		param->backgroundAttenuateAlpha = std::stoi(value);
+		param->background.attenuateAlpha = std::stoi(value);
 	}
 
 	// BALLOON