From ba6a55d50c55fc0e8749ff5371077c80d67b6158 Mon Sep 17 00:00:00 2001 From: dborth Date: Sat, 30 May 2009 06:47:05 +0000 Subject: [PATCH] correction for home menu popping up on game load --- source/ngc/gameinput.cpp | 1 - source/ngc/menu.cpp | 2 -- source/ngc/vba.cpp | 2 +- source/ngc/video.cpp | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/ngc/gameinput.cpp b/source/ngc/gameinput.cpp index 71cd2ab..1660b1c 100644 --- a/source/ngc/gameinput.cpp +++ b/source/ngc/gameinput.cpp @@ -526,7 +526,6 @@ u32 TMNTGBA2Input(unsigned short pad) { #endif u32 gc = PAD_ButtonsHeld(pad); - u32 released = PAD_ButtonsUp(pad); // DPad moves if (gc & PAD_BUTTON_UP) J |= VBA_UP; diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp index e6d9fbe..63826d5 100644 --- a/source/ngc/menu.cpp +++ b/source/ngc/menu.cpp @@ -2652,7 +2652,6 @@ static int MenuSettingsVideo() int ret; int i = 0; OptionList options; - char Buffer[1024]; sprintf(options.name[i++], "Rendering"); sprintf(options.name[i++], "Scaling"); @@ -3803,7 +3802,6 @@ GXColor GetCol(int i) { static int MenuPalette() { int menu = MENU_NONE; - char s[4]; GuiText titleTxt("Palette", 28, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); diff --git a/source/ngc/vba.cpp b/source/ngc/vba.cpp index 329a4ef..7f02c89 100644 --- a/source/ngc/vba.cpp +++ b/source/ngc/vba.cpp @@ -265,7 +265,6 @@ int main(int argc, char *argv[]) // since we're entering the menu ResumeDeviceThread(); - ConfigRequested = 1; SwitchAudioMode(1); if(!ROMLoaded) @@ -274,6 +273,7 @@ int main(int argc, char *argv[]) MainMenu(MENU_GAME); ConfigRequested = 0; + ScreenshotRequested = 0; SwitchAudioMode(0); // stop checking if devices were removed/inserted diff --git a/source/ngc/video.cpp b/source/ngc/video.cpp index a4c84f6..75ef535 100644 --- a/source/ngc/video.cpp +++ b/source/ngc/video.cpp @@ -143,8 +143,8 @@ copy_to_xfb (u32 arg) { if(ScreenshotRequested) { - TakeScreenshot(); ScreenshotRequested = 0; + TakeScreenshot(); ConfigRequested = 1; }