[Balder-cvs] SF.net SVN: balder: [113]

[<hol...@us...>]

Revision: 113
          http://balder.svn.sourceforge.net/balder/?rev=113&view=rev
Author:   holomorph
Date:     2008-06-06 18:35:05 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
fixed out of bounds on map dropdown

Modified Paths:
--------------
    bin/config.xml
    src/menu/widgets/maplistmodel.cpp
    src/menu/widgets/skinneddropdown.cpp

Modified: bin/config.xml
===================================================================
--- bin/config.xml	2008-06-07 01:16:48 UTC (rev 112)
+++ bin/config.xml	2008-06-07 01:35:05 UTC (rev 113)
@@ -2,7 +2,7 @@
 <!-- Balder2d Configuration data -->
 <Balder>
     <!-- The following is meant to be modified by the user -->
-    <Map name="ellipse" />
+    <Map name="alpha quadrant" />
     <NumberOfPlayers value="4" />
     <GameSetup>
         <!-- negative values indicate disabled modes -->

Modified: src/menu/widgets/maplistmodel.cpp
===================================================================
--- src/menu/widgets/maplistmodel.cpp	2008-06-07 01:16:48 UTC (rev 112)
+++ src/menu/widgets/maplistmodel.cpp	2008-06-07 01:35:05 UTC (rev 113)
@@ -73,6 +73,8 @@
   if (i > numMaps - 1)
   {
     Log::output("tried to get map at index higher than number of maps");
+    Log::output("numMaps: "+numMaps);
+//    Log::output("i :" +i);
     return "--Map Not Found--";
   }
   return mapnames[i];

Modified: src/menu/widgets/skinneddropdown.cpp
===================================================================
--- src/menu/widgets/skinneddropdown.cpp	2008-06-07 01:16:48 UTC (rev 112)
+++ src/menu/widgets/skinneddropdown.cpp	2008-06-07 01:35:05 UTC (rev 113)
@@ -73,11 +73,12 @@
         startRow = 0;
     }
 
-    int i;
+    // end row should not exceed list size
+    int endRow = std::min(startRow+numberOfRows, mListModel->getNumberOfElements());
     // The y coordinate where we start to draw the text is
     // simply the y coordinate multiplied with the font height.
     int y = rowHeight * startRow;
-    for (i = startRow; i < startRow + numberOfRows; ++i)
+    for (int i = startRow; i < endRow; ++i)
     {
         if (i == mSelected)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.