The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-23 10:21:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix issue 694

Browse Source
This commit is contained in:
giantpune 2009-07-15 05:18:33 +00:00
parent 6c8953531a
commit 5945ca4fc9
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/libwiigui/gui_gamegrid.cpp
View File

@ -96,24 +96,15 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int count, const char
btnSoundClick = new GuiSound(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, Settings.sfxvolume); btnSoundClick = new GuiSound(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, Settings.sfxvolume);
btnSoundOver = new GuiSound(button_over_pcm, button_over_pcm_size, SOUND_PCM, Settings.sfxvolume); btnSoundOver = new GuiSound(button_over_pcm, button_over_pcm_size, SOUND_PCM, Settings.sfxvolume);
snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_left.png", CFG.theme_path);
imgLeft = new GuiImageData(imgPath, startgame_arrow_left_png);
snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path);
imgRight = new GuiImageData(imgPath, startgame_arrow_right_png);
int btnHeight = (int) lround(sqrt(RADIUS*RADIUS - 90000)-RADIUS-50); int btnHeight = (int) lround(sqrt(RADIUS*RADIUS - 90000)-RADIUS-50);
btnLeftImg = new GuiImage(imgLeft);
btnLeft = new GuiButton(0,0); btnLeft = new GuiButton(0,0);
btnLeft->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); btnLeft->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
btnLeft->SetPosition(20, btnHeight); btnLeft->SetPosition(20, btnHeight);
btnLeft->SetParent(this); btnLeft->SetParent(this);
//btnLeft->SetImage(btnLeftImg);
btnLeft->SetSoundOver(btnSoundOver); btnLeft->SetSoundOver(btnSoundOver);
btnLeft->SetTrigger(trigA);
btnLeft->SetTrigger(trigL); btnLeft->SetTrigger(trigL);
btnLeft->SetTrigger(trigMinus); btnLeft->SetTrigger(trigMinus);
btnLeft->SetEffectGrow();
/*debugTxt = new GuiText("fag", 14, (GXColor){0,0,0, 255}); /*debugTxt = new GuiText("fag", 14, (GXColor){0,0,0, 255});
debugTxt->SetParent(this); debugTxt->SetParent(this);
@ -121,17 +112,13 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int count, const char
debugTxt->SetPosition(0,180);*/ debugTxt->SetPosition(0,180);*/
btnRightImg = new GuiImage(imgRight);
btnRight = new GuiButton(0,0); btnRight = new GuiButton(0,0);
btnRight->SetParent(this); btnRight->SetParent(this);
btnRight->SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE); btnRight->SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
btnRight->SetPosition(-20, btnHeight); btnRight->SetPosition(-20, btnHeight);
//btnRight->SetImage(btnRightImg);
btnRight->SetSoundOver(btnSoundOver); btnRight->SetSoundOver(btnSoundOver);
btnRight->SetTrigger(trigA);
btnRight->SetTrigger(trigR); btnRight->SetTrigger(trigR);
btnRight->SetTrigger(trigPlus); btnRight->SetTrigger(trigPlus);
btnRight->SetEffectGrow();
btnRowUp = new GuiButton(0,0); btnRowUp = new GuiButton(0,0);
btnRowUp->SetParent(this); btnRowUp->SetParent(this);
@ -495,10 +482,6 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int count, const char
GuiGameGrid::~GuiGameGrid() GuiGameGrid::~GuiGameGrid()
{ {
delete imgRight;
delete imgLeft;
delete btnLeftImg;
delete btnRightImg;
delete btnRight; delete btnRight;
delete btnLeft; delete btnLeft;
delete btnRowUp; delete btnRowUp;
@ -1014,7 +997,7 @@ void GuiGameGrid::Update(GuiTrigger * t)
if(!focus || gameCnt < pagesize || (c==0)||(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 (btnLeft->GetState() == STATE_CLICKED) {
WPAD_ScanPads(); WPAD_ScanPads();
u16 buttons = 0; u16 buttons = 0;
for(int i=0; i<4; i++) for(int i=0; i<4; i++)
@ -1023,7 +1006,12 @@ void GuiGameGrid::Update(GuiTrigger * t)
btnLeft->ResetState(); btnLeft->ResetState();
speed = SHIFT_SPEED; speed = SHIFT_SPEED;
return; return;
}goLeft=12; }
if (Settings.xflip==sysmenu ||Settings.xflip==yes)
goRight=12;
else
goLeft=12;
wait=0;wait1=0; wait=0;wait1=0;
@ -1347,17 +1335,20 @@ void GuiGameGrid::Update(GuiTrigger * t)
} }
} }
else if(t->Right() || btnRight->GetState() == STATE_CLICKED) { else if(btnRight->GetState() == STATE_CLICKED) {
WPAD_ScanPads(); WPAD_ScanPads();
u16 buttons = 0; u16 buttons = 0;
for(int i=0; i<4; i++) for(int i=0; i<4; i++)
buttons |= WPAD_ButtonsHeld(i); buttons |= WPAD_ButtonsHeld(i);
if(!((buttons & WPAD_BUTTON_A) || (buttons & WPAD_BUTTON_PLUS) || t->Right())) { if(!((buttons & WPAD_BUTTON_A) || (buttons & WPAD_BUTTON_PLUS) || t->Right()|| t->Left()|| (buttons & WPAD_BUTTON_MINUS))) {
btnRight->ResetState(); btnRight->ResetState();
speed=SHIFT_SPEED; speed=SHIFT_SPEED;
return; return;
} }
goRight=12; if (Settings.xflip==sysmenu ||Settings.xflip==yes)
goLeft=12;
else
goRight=12;
wait=0;wait1=0; wait=0;wait1=0;