From 2b633d1cb3214f1debe2d6ce213006b3cb5a496e Mon Sep 17 00:00:00 2001 From: rogerman Date: Mon, 30 Dec 2013 06:38:54 +0000 Subject: [PATCH] Windows Port: - Fix compiling for Windows port. (Regression from r4952.) --- desmume/src/addons/slot2_auto.cpp | 10 +--------- desmume/src/windows/main.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/desmume/src/addons/slot2_auto.cpp b/desmume/src/addons/slot2_auto.cpp index c4bbae51d..2054a8a7d 100644 --- a/desmume/src/addons/slot2_auto.cpp +++ b/desmume/src/addons/slot2_auto.cpp @@ -18,9 +18,7 @@ #include "../slot2.h" #include "../registers.h" #include "../MMU.h" -#ifdef HOST_WINDOWS -#include "../windows/inputdx.h" -#endif + class Slot2_Auto : public ISlot2Interface { @@ -45,12 +43,6 @@ public: mSelectedImplementation = slot2_List[slot2_selected_type]; mSelectedImplementation->connect(); printf("Slot2 auto-selected device type: %s (0x%02X)\n", mSelectedImplementation->info()->name(), mSelectedImplementation->info()->id()); - -#ifdef HOST_WINDOWS - Guitar.Enabled = (selection == NDS_SLOT2_GUITARGRIP)?true:false; - Piano.Enabled = (selection == NDS_SLOT2_EASYPIANO)?true:false; - Paddle.Enabled = (selection == NDS_SLOT2_PADDLE)?true:false; -#endif } virtual void disconnect() diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index c70315de5..75766615a 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -2419,6 +2419,12 @@ static BOOL LoadROM(const char * filename, const char * physicalName, const char if (NDS_LoadROM(filename, physicalName, logicalName) > 0) { INFO("Loading %s was successful\n",logicalName); + + NDS_SLOT2_TYPE selectedSlot2Type = slot2_GetSelectedType(); + Guitar.Enabled = (selectedSlot2Type == NDS_SLOT2_GUITARGRIP)?true:false; + Piano.Enabled = (selectedSlot2Type == NDS_SLOT2_EASYPIANO)?true:false; + Paddle.Enabled = (selectedSlot2Type == NDS_SLOT2_PADDLE)?true:false; + LoadSaveStateInfo(); lagframecounter=0; UpdateRecentRoms(logicalName);