diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index a3c2985c8a..09245beb98 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -347,7 +347,7 @@ THREAD_RETURN EmuThread(void *pArg) PADInitialize.pLog = Callback_PADLog; PADInitialize.padNumber = i; // Check if we should init the plugin - if(Plugins.OkayToInitPlugin(i)) Plugins.GetPAD(i)->Initialize((void *)&PADInitialize); + Plugins.GetPAD(i)->Initialize((void *)&PADInitialize); } // Load and Init WiimotePlugin - only if we are booting in wii mode diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index a45a286c4d..611c05a5eb 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -170,8 +170,8 @@ bool IBannerLoader::CopyUnicodeToString( std::string& _rDestination, const u16* } } #else - // not implement other than windows - _rDestination = _src; + // FIXME completly broken on not windows!!!!! + // _rDestination = _src; returnCode = true; #endif return returnCode; diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 1cd8b9ff24..1357ef3d9a 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -126,6 +126,8 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag // find Banner type SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; +#ifdef _WIN32 // FIXME this should NOT be windows specific!!! + if (DiscIO::IVolume::COUNTRY_JAP == language) { return CopyUnicodeToString(_rName, pBanner->m_Comment[0]); @@ -136,6 +138,9 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag _rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE); return true; } +#else + _rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE); +#endif return true; } diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp index b50dd2b8db..89215a0484 100644 --- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp @@ -51,7 +51,10 @@ HWND m_hWnd; #ifdef USE_RUMBLE_DINPUT_HACK bool g_rumbleEnable = FALSE; #endif - +// Declare config window so that we can write debugging info to it from functions in this file +#if defined(HAVE_WX) && HAVE_WX + ConfigBox* m_frame; +#endif // Rumble in windows #ifdef _WIN32 HINSTANCE nJoy_hInst = NULL;