Changeset 10102 for ps

Timestamp:

08/27/11 00:58:55 (13 years ago)

Author:

ben

Message:

Fixes bug in Atlas player panel (AtIter definition must be checked before incrementing).

File:

• ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp (modified) (4 diffs)

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -528 +528 @@
 
     // Create player pages
-    AtIter player = m_PlayerDefaults["item"];
-    ++player;   // Skip gaia
-    for (size_t i = 0; i < MAX_NUM_PLAYERS; ++i, ++player)
+    AtIter playerDefs = m_PlayerDefaults["item"];
+    if (playerDefs.defined())
+        ++playerDefs;   // Skip gaia
+    
+    for (size_t i = 0; i < MAX_NUM_PLAYERS; ++i)
     {
         // Create new player tab and get controls
-        PlayerPageControls controls = m_Players->AddPlayer(wxString(player["Name"]), i);
+        wxString name(_("Unknown"));
+        if (playerDefs["Name"].defined())
+            name = playerDefs["Name"];
+        
+        PlayerPageControls controls = m_Players->AddPlayer(name, i);
         m_PlayerControls.push_back(controls);
 
@@ -548 +554 @@
             aiChoice->Append(ais[j]->GetName(), new wxStringClientData(ais[j]->GetID()));
         aiChoice->SetSelection(0);
+
+        // Only increment AtIters if they are defined
+        if (playerDefs.defined())
+            ++playerDefs;
     }
 
@@ -591 +601 @@
     // To prevent recursion, don't handle GUI events right now
     m_InGUIUpdate = true;
-    
+
+    wxDynamicCast(FindWindow(ID_NumPlayers), wxSpinCtrl)->SetValue(m_NumPlayers);
+
+    // Remove / add extra player pages as needed
+    m_Players->ResizePlayers(m_NumPlayers);
+
     // Update player controls with player data
     AtIter playerDefs = m_PlayerDefaults["item"];
-    ++playerDefs;   // skip gaia
-
-    wxDynamicCast(FindWindow(ID_NumPlayers), wxSpinCtrl)->SetValue(m_NumPlayers);
-
-    // Remove / add extra player pages as needed
-    m_Players->ResizePlayers(m_NumPlayers);
-
-    for (size_t i = 0; i < MAX_NUM_PLAYERS; ++i, ++player, ++playerDefs)
+    if (playerDefs.defined())
+        ++playerDefs;   // skip gaia
+
+    for (size_t i = 0; i < MAX_NUM_PLAYERS; ++i)
     {
         PlayerPageControls controls = m_PlayerControls[i];
 
         // name
-        wxString name;
+        wxString name(_("Unknown"));
         if (player["Name"].defined())
             name = wxString(player["Name"]);
-        else
+        else if (playerDefs["Name"].defined())
             name = wxString(playerDefs["Name"]);
 
@@ -726 +737 @@
             controls.page->SetCamera(sCameraInfo(), false);
 
+        // Only increment AtIters if they are defined
+        if (player.defined())
+            ++player;
+        if (playerDefs.defined())
+            ++playerDefs;
     }