Update sites slider in metagame setup

Author: orengg

GUI/GUISlider.cpp

@@ -632,10 +632,13 @@ int GUISlider::GetTickDirection(void)
 
 void GUISlider::SetMinimum(int Minimum)
 {
-    m_Minimum = Minimum;
+	if (Minimum != m_Minimum) {
+		m_Minimum = Minimum;
+		m_Value = std::max(m_Value, m_Minimum);
 
-    // Re-Calculate the knob info
-    CalculateKnob();
+		// Re-Calculate the knob info
+		CalculateKnob();
+	}
 }
 
 
@@ -657,10 +660,13 @@ int GUISlider::GetMinimum(void)
 
 void GUISlider::SetMaximum(int Maximum)
 {
-    m_Maximum = Maximum;
+	if (Maximum != m_Maximum) {
+		m_Maximum = Maximum;
+		m_Value = std::min(m_Value, m_Maximum);
 
-    // Re-Calculate the knob info
-    CalculateKnob();
+		// Re-Calculate the knob info
+		CalculateKnob();
+	}
 }
 
 

Managers/MetaMan.cpp

@@ -90,11 +90,11 @@ int MetaMan::Create()
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Wipes any current and sets up a new game based on a size parameter.
 
-int MetaMan::NewGame(float gameSize)
+int MetaMan::NewGame(int gameSize)
 {
     // Grab a random selection of Scene presets from all available
     list<Scene *> scenePresets;
-    SelectScenePresets(gameSize, m_Players.size(), &scenePresets);
+    SelectScenePresets(gameSize, &scenePresets);
 
     // Destroy and clear any pre-existing scenes from previous games
     for (vector<Scene *>::iterator sItr = m_Scenes.begin(); sItr != m_Scenes.end(); ++sItr)
@@ -1035,29 +1035,19 @@ int MetaMan::TotalScenePresets(std::list<Scene *> *pScenes)
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Yields a set of randomly selected Scene presets for a new game.
 
-int MetaMan::SelectScenePresets(float gameSize, int playerCount, list<Scene *> *pSelected)
+int MetaMan::SelectScenePresets(int gameSize, list<Scene *> *pSelected)
 {
     // Get the list of ALL eligible read-in Scene presets
     list<Scene *> scenePresets;
     TotalScenePresets(&scenePresets);
 
-    // How many scenes the game should end up with, according to the specified game size.
-    // Note that it will never be all or none of all the available scenes!
-// TODO: Hook these constants up to settings!!
-    int minCount = MAX(3, MIN(floorf(playerCount * 1.5), scenePresets.size()));
-    int maxCount = MAX(floorf(scenePresets.size() * 0.7), minCount);
-    // Determine the actual game size
-    int gameSceneCount = minCount + floorf((maxCount - minCount) * gameSize);
-    // Clamp
-    gameSceneCount = MIN(gameSceneCount, maxCount);
-    gameSceneCount = MAX(gameSceneCount, minCount);
-
     // If we need to actually fill the list, do so
     if (pSelected)
     {
         // Go through the list and randomly knock out as many presets as necessary to reach the number we need for this game
-        int randomIndex, currentIndex;
-        while (scenePresets.size() > gameSceneCount)
+		int randomIndex;
+		int currentIndex;
+        while (scenePresets.size() > gameSize)
         {
             // Randomly select one of the scenes and remove it
             currentIndex = 0;
@@ -1075,11 +1065,12 @@ int MetaMan::SelectScenePresets(float gameSize, int playerCount, list<Scene *> *
 
         // Cast and copy (not deep!) to fill the provided list
         pSelected->clear();
-        for (list<Scene *>::iterator pItr = scenePresets.begin(); pItr != scenePresets.end(); ++pItr)
-            pSelected->push_back(dynamic_cast<Scene *>(*pItr));
+		for (Scene *scenePointer : scenePresets) {
+			pSelected->push_back(scenePointer);
+		}
     }
 
-    return gameSceneCount;
+    return gameSize;
 }
 
 

Managers/MetaMan.h

@@ -120,12 +120,12 @@ friend class MetaSave;
 // Method:  NewGame
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Wipes any current and sets up a new game based on a size parameter.
-// Arguments:       The size of the new Metagame, from 0 to 1.0, which will affect how
+// Arguments:       The size of the new Metagame, which will affect how
 //                  many Scenes/Sites will ultimately be used.
 // Return value:    An error return value signaling success or any particular failure.
 //                  Anything below 0 is an error signal.
 
-	int NewGame(float gameSize = 0.5);
+	int NewGame(int gameSize = 3);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -535,14 +535,13 @@ friend class MetaSave;
 // Method:          SelectScenePresets
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Yields a set of randomly selected Scene presets for a new game.
-// Arguments:       The normalized scalar from 0 to 1.0 that controls the size of the set.
-//                  The number of players that will be playing this new game.
+// Arguments:       The size of the set.
 //                  The list to fill with the selected presets, depending on currently
 //                  set player numbers and loaded eligible scenes. If no list is passed
 //                  it will be ignored. Presets returned in list are NOT OWNED there.
 // Return value:    The count of selected preset scenes.
 
-    int SelectScenePresets(float gameSize, int playerCount, std::list<Scene *> *pSelected = 0);
+    int SelectScenePresets(int gameSize, std::list<Scene *> *pSelected = 0);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Menus/MetagameGUI.cpp

@@ -1227,7 +1227,7 @@ bool MetagameGUI::StartNewGame()
 
 
     // Start game of specified size!
-    g_MetaMan.NewGame((float)m_pSizeSlider->GetValue() / 100.0);
+    g_MetaMan.NewGame(m_pSizeSlider->GetValue());
 
     return true;
 }
@@ -6244,12 +6244,19 @@ void MetagameGUI::UpdateGameSizeLabels()
         if (m_apPlayerControlButton[player]->GetText() != "None")
             ++playerCount;
 
-    // How many scenes does the current slider setting yield
-    int selectedCount = g_MetaMan.SelectScenePresets((float)m_pSizeSlider->GetValue() / 100.0, playerCount);
-    // How many scenes are there total
-    int totalCount = g_MetaMan.TotalScenePresets();
+	// How many scenes the game should end up with, according to the specified game size.
+	// Note that it will never be all or none of all the available scenes!
+// TODO: Hook these constants up to settings!!
+	// How many scenes are there total
+	int totalCount = g_MetaMan.TotalScenePresets();
+	int minCount = std::clamp((playerCount * 3 / 2), 3, totalCount);
+	int maxCount = std::max(totalCount * 7 / 10, minCount);
+	m_pSizeSlider->SetMinimum(minCount);
+	m_pSizeSlider->SetMaximum(maxCount);
+	m_pSizeSlider->SetValueResolution(1);
+
     char str[256];
-    sprintf_s(str, sizeof(str), "Game Size: %d/%d sites", selectedCount, totalCount);
+    sprintf_s(str, sizeof(str), "Game Size: %d/%d sites", m_pSizeSlider->GetValue(), totalCount);
     m_pSizeLabel->SetText(str);
 
     // How much starting gold does the slider yield