Fix a small bug that was preventing access to the next available level

src/ap_maps.cpp

@@ -101,9 +101,9 @@ MapPack::MapPack(string const & _name) : filemgr(_name) {
   // load saved data
   load_save();
 
-  if (save.lastlevel >= properties.number_maps)
+  if (save.lastlevel >= get_number_maps())
     // final level
-    set_currentlevel(properties.number_maps);
+    set_currentlevel(get_number_maps());
   else
     set_currentlevel(save.lastlevel);
 }
@@ -161,7 +161,7 @@ void MapPack::load_save() {
   }
 
 #ifdef GODMODE
-  save.maxlevel = properties.number_maps;
+  save.maxlevel = get_number_maps();
   cout << "Godmode activated! maxlevel set to " << save.maxlevel << endl;
 #endif
 
@@ -187,14 +187,22 @@ void MapPack::set_lastlevel(int last) {
   write_save();
 }
 
+int MapPack::get_lastlevel() const {
+  return save.lastlevel;
+}
+
+int MapPack::get_number_maps() const {
+  return properties.number_maps;
+}
+
 int MapPack::set_currentlevel(int newlvl) {
-  if (newlvl <= 0 || newlvl > properties.number_maps + 1)
+  if (newlvl <= 0 || newlvl > get_number_maps() + 1)
     return -1;
 
   lvl.id = newlvl;
   set_lastlevel(newlvl);
 
-  if (lvl.id == properties.number_maps + 1)
+  if (lvl.id == get_number_maps() + 1)
     return -1; // the map pack is over, we don't load any map
 
   load_map();

src/ap_maps.h

@@ -171,6 +171,9 @@ class MapPack {
 
   // this causes save data to be flushed to disk
   void set_lastlevel(int);
+  int get_lastlevel() const;
+
+  int get_number_maps() const;
 
   // This loads the required level as appropriate.
   int set_currentlevel(int);

src/ap_play.cpp

@@ -956,7 +956,7 @@ int play(MapPack &mappack) {
         // next level
         mappack.set_lastlevel(mappack.get_currentlevel() + 1);
         if (displaystats(lvl)) {
-          if (mappack.get_currentlevel() == mappack.properties.number_maps)
+          if (mappack.get_currentlevel() == mappack.get_number_maps())
             finished = true;
           ++mappack;
         }

src/menu.cpp

@@ -430,9 +430,12 @@ int pause_menu(MapPack & mappack) {
 int select_level (MapPack const & mappack) {
   int input;
   int level = mappack.get_currentlevel();
-  int maxlevel = mappack.get_maxlevel();
+  int maxlevel = mappack.get_maxlevel() + 1;
 
-  if (level == 0) level = maxlevel;
+  if (maxlevel > mappack.get_number_maps())
+    maxlevel = mappack.get_number_maps();
+  if (level == 0)
+    level = mappack.get_lastlevel();
 
   pauserun(1);
   fillsquare(LINES / 2 - 2, (COLS - 16) / 2, 4, 16);
@@ -712,7 +715,7 @@ MapPack select_mappack (MapPack const & current) {
         _name = mappacks[i+top_map_displayed].properties.name;
       namestream << _name;
       tmpstream << "(" << mappacks[i+top_map_displayed].get_maxlevel() << "/";
-      tmpstream << mappacks[i+top_map_displayed].properties.number_maps << ")";
+      tmpstream << mappacks[i+top_map_displayed].get_number_maps() << ")";
       levelstream << tmpstream.str();
       mvprintw (LINES / 2 + i, (COLS - width) / 2, (" " + namestream.str() + levelstream.str()).c_str());
     }