ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BootManager: Cosmetic changes 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1917 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-18 09:49:28 +00:00
parent 113a6a9dee
commit f9ffbd8c32
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -38,7 +38,9 @@
///////////////////////////////////////////////////////////////////////////////////
// Includes
// ----------------
#include <string> #include <string>
#include <vector> #include <vector>
@ -60,7 +62,12 @@
#include "../../../Branches/MusicMod/Main/Src/Main.h" // MusicMod #include "../../../Branches/MusicMod/Main/Src/Main.h" // MusicMod
#endif #endif
#endif #endif
/////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
// Declarations and definitions
// ----------------
static std::string s_DataBasePath_EUR = "Data_EUR"; static std::string s_DataBasePath_EUR = "Data_EUR";
static std::string s_DataBasePath_USA = "Data_USA"; static std::string s_DataBasePath_USA = "Data_USA";
static std::string s_DataBasePath_JAP = "Data_JAP"; static std::string s_DataBasePath_JAP = "Data_JAP";
@ -73,9 +80,14 @@ extern CCodeWindow* g_pCodeWindow;
namespace BootManager namespace BootManager
{ {
#ifdef _WIN32 #ifdef _WIN32
extern "C" HINSTANCE wxGetInstance(); extern "C" HINSTANCE wxGetInstance();
#endif #endif
/////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
// Boot the ISO or file
// ----------------
bool BootCore(const std::string& _rFilename) bool BootCore(const std::string& _rFilename)
{ {
SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
@ -111,12 +123,10 @@ bool BootCore(const std::string& _rFilename)
#endif #endif
#endif #endif
if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT)) // If for example the ISO file is bad we return here
{ if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT)) return false;
return false;
}
// ------------------------------------------------ // ====================================================
// Load game specific settings // Load game specific settings
// ---------------- // ----------------
IniFile ini; IniFile ini;
@ -180,11 +190,12 @@ bool BootCore(const std::string& _rFilename)
} }
// --------- // ---------
} }
// --------- // ==============
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
if(main_frame) if(main_frame)
{ {
// Save the window handle of the eventual parent to the rendering window
StartUp.hMainWindow = main_frame->GetRenderHandle(); StartUp.hMainWindow = main_frame->GetRenderHandle();
// Now that we know if we have a Wii game we can run this // Now that we know if we have a Wii game we can run this
@ -222,5 +233,7 @@ void Stop()
{ {
Core::Stop(); Core::Stop();
} }
/////////////////////////////////
} // namespace } // namespace