Jeck - Fix for issue 316 (shop selection not cyclical).

projects/mtg/src/GameStateShop.cpp

@@ -64,7 +64,7 @@ void GameStateShop::Start(){
   mStage = STAGE_FADE_IN;
   mElapsed = 0;
   booster = NULL;
-  srcCards = NEW WSrcUnlockedCards(.25);
+  srcCards = NEW WSrcUnlockedCards(0);
   srcCards->setElapsed(15);
 
   bigSync = 0;

projects/mtg/src/WGui.cpp

@@ -839,12 +839,18 @@ void WGuiMenu::Update(float dt){
 bool WGuiMenu::nextItem(){
  int potential = currentItem;
  int nbitems = (int) items.size();
+ if(nbitems < 2)
+    return false;
+
  WGuiBase * now = NULL;
  if(currentItem < nbitems && currentItem > -1)
    now = items[currentItem];
 
-  if (potential < nbitems-1){
+   if (potential < nbitems-1)
       potential++;
+   else 
+      potential = 0;
+
     while(potential < nbitems-1 && items[potential]->Selectable() == false)
       potential++;
     if(potential == nbitems || !items[potential]->Selectable())
@@ -857,7 +863,7 @@ bool WGuiMenu::nextItem(){
           syncMove();
         return true;
     }
-  }
+  
   if(sync)
     syncMove();
   return false;
@@ -866,11 +872,18 @@ bool WGuiMenu::nextItem(){
 bool WGuiMenu::prevItem(){
  int potential = currentItem;
  WGuiBase * now = NULL;
+ int nbitems = (int) items.size();
+ if(nbitems < 2)
+    return false;
+
  if(currentItem < (int)items.size() && currentItem > -1)
   now = items[currentItem];
 
- if (potential > 0){
+ if (potential > 0)
    potential--;
+ else
+   potential = nbitems-1;
+
  while(potential > 0 && items[potential]->Selectable() == false)
    potential--;
  if(potential < 0 || !items[potential]->Selectable())
@@ -882,7 +895,6 @@ bool WGuiMenu::prevItem(){
      syncMove();
    return true;
   }
- }
   if(sync)
     syncMove();
   return false;