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

projects/mtg/include/GameStateShop.h

@@ -73,7 +73,7 @@ class GameStateShop: public GameState, public JGuiListener
   
   void load();
   void save(bool force=false);
-  
+
   void assembleBooster(int controlId);
   void beginPurchase(int controlId);
   void purchaseCard(int controlId);

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++;
+      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,26 +872,32 @@ bool WGuiMenu::nextItem(){
 bool WGuiMenu::prevItem(){
  int potential = currentItem;
  WGuiBase * now = NULL;
- if(currentItem < (int)items.size() && currentItem > -1)
+ int nbitems = (int) items.size();
-   now = items[currentItem];
+ if(nbitems < 2)
+    return false;
 
- if (potential > 0){
+ if(currentItem < (int)items.size() && currentItem > -1)
-    potential--;
+  now = items[currentItem];
-    while(potential > 0 && items[potential]->Selectable() == false)
+
-      potential--;
+ if (potential > 0)
-    if(potential < 0 || !items[potential]->Selectable())
+   potential--;
-      potential = -1;
+ else
-    else if(potential != currentItem && (!now || now->Leaving(buttonNext))){
+   potential = nbitems-1;
-        currentItem = potential;
+
-        items[currentItem]->Entering(buttonPrev);
+ while(potential > 0 && items[potential]->Selectable() == false)
-        if(sync)
+   potential--;
-          syncMove();
+ if(potential < 0 || !items[potential]->Selectable())
-        return true;
+   potential = -1;
-    }
+ else if(potential != currentItem && (!now || now->Leaving(buttonNext))){
- }
+   currentItem = potential;
- if(sync)
+   items[currentItem]->Entering(buttonPrev);
-   syncMove();
+   if(sync)
- return false;
+     syncMove();
+   return true;
+  }
+  if(sync)
+    syncMove();
+  return false;
 }
 
 void WGuiMenu::setModal(bool val){