Fixed a codedump caused by not having any games and playing around in the gamewall.

This commit is contained in:
giantpune 2009-06-13 06:49:09 +00:00
parent 2874d9672c
commit 6d082b7c66

View File

@ -37,6 +37,7 @@ int mover=0, mover2=0;
u8 goback=0; u8 goback=0;
int goLeft = 0, goRight=0; int goLeft = 0, goRight=0;
char debugbuffer[100]; char debugbuffer[100];
int c;
/** /**
* Constructor for the GuiGamegrid class. * Constructor for the GuiGamegrid class.
@ -47,6 +48,7 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int count, const char
height = h; height = h;
gameCnt = (count < SAFETY) ? count : SAFETY; gameCnt = (count < SAFETY) ? count : SAFETY;
gameList = l; gameList = l;
c=count;
listOffset = (offset == 0) ? this->FindMenuItem(-1, 1) : offset; listOffset = (offset == 0) ? this->FindMenuItem(-1, 1) : offset;
selectable = true; selectable = true;
selectedItem = selected - offset; selectedItem = selected - offset;
@ -137,7 +139,7 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int count, const char
btnRowDown->SetTrigger(trig1); btnRowDown->SetTrigger(trig1);
//if (count>0){
gameIndex = new int[pagesize]; gameIndex = new int[pagesize];
game = new GuiButton * [pagesize]; game = new GuiButton * [pagesize];
@ -365,7 +367,7 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int count, const char
else else
WindowPrompt("Oops","Your Wii must be in 16:9 mode to see the gamewall.",0, LANGUAGE.ok, 0,0); WindowPrompt("Oops","Your Wii must be in 16:9 mode to see the gamewall.",0, LANGUAGE.ok, 0,0);
//}
} }
@ -502,6 +504,8 @@ void GuiGameGrid::Draw()
if(!this->IsVisible()) if(!this->IsVisible())
return; return;
if(c>0){
int next = listOffset; int next = listOffset;
for(int i=0; i<pagesize; i++) { for(int i=0; i<pagesize; i++) {
@ -520,7 +524,9 @@ void GuiGameGrid::Draw()
btnRowDown->Draw(); btnRowDown->Draw();
//debugTxt->Draw(); //debugTxt->Draw();
this->UpdateEffects(); this->UpdateEffects();
}
} }
/** /**
@ -792,7 +798,7 @@ void GuiGameGrid::Update(GuiTrigger * t)
// navigation // navigation
if(!focus || gameCnt < pagesize || (game[bob[0]]->GetEffect() && game[bob[pagesize-1]]->GetEffect())) if(!focus || gameCnt < pagesize || (c==0)||(game[bob[0]]->GetEffect() && game[bob[pagesize-1]]->GetEffect()))
return; // skip navigation return; // skip navigation
if (t->Left() || btnLeft->GetState() == STATE_CLICKED) { if (t->Left() || btnLeft->GetState() == STATE_CLICKED) {
@ -1289,14 +1295,14 @@ void GuiGameGrid::Update(GuiTrigger * t)
} }
} }
if (btnRowUp->GetState() == STATE_CLICKED) { if ((btnRowUp->GetState() == STATE_CLICKED)&&(c>0)) {
if ((rows==1)&&(gameCnt>=16))this->ChangeRows(2); if ((rows==1)&&(gameCnt>=16))this->ChangeRows(2);
else if ((rows==2)&&(gameCnt>=42))this->ChangeRows(3); else if ((rows==2)&&(gameCnt>=42))this->ChangeRows(3);
btnRowUp->ResetState(); btnRowUp->ResetState();
return; return;
} }
if (btnRowDown->GetState() == STATE_CLICKED) { if ((btnRowDown->GetState() == STATE_CLICKED)&&(c>0)) {
if (rows==3)this->ChangeRows(2); if (rows==3)this->ChangeRows(2);
else if (rows==2)this->ChangeRows(1); else if (rows==2)this->ChangeRows(1);
btnRowDown->ResetState(); btnRowDown->ResetState();