Merge pull request #2123 from RachelBryk/nonmodal-isoprops

Make iso properties non modal.
This commit is contained in:
skidau
2015-02-27 13:25:46 +11:00
13 changed files with 69 additions and 45 deletions

View File

@ -20,6 +20,11 @@
#include "Common/IniFile.h"
#include "Core/ActionReplay.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"
#include "DolphinWX/ARCodeAddEdit.h"
#include "DolphinWX/PatchAddEdit.h"
class GameListItem;
class wxButton;
@ -37,6 +42,13 @@ namespace Gecko { class CodeConfigPanel; }
extern std::vector<ActionReplay::ARCode> arCodes;
struct WiiPartition
{
DiscIO::IVolume *Partition;
DiscIO::IFileSystem *FileSystem;
std::vector<const DiscIO::SFileInfo *> Files;
};
struct PHackData
{
bool PHackSZNear;
@ -68,6 +80,15 @@ public:
private:
DECLARE_EVENT_TABLE();
std::vector<WiiPartition> WiiDisc;
DiscIO::IVolume *OpenISO;
DiscIO::IFileSystem *pFileSystem;
std::vector<PatchEngine::Patch> onFrame;
std::vector<ActionReplay::ARCode> arCodes;
PHackData m_PHack_Data;
// Core
wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *FPRF;
wxCheckBox *SyncGPU, *FastDiscSpeed, *DSPHLE;