[Core] Initialize all members of Emulator.

This commit is contained in:
gibbed 2019-07-29 13:22:45 -05:00
parent bc2eaf9b64
commit a4d2f5e4ed
2 changed files with 22 additions and 5 deletions

View File

@ -50,7 +50,24 @@ namespace xe {
Emulator::Emulator(const std::wstring& command_line,
const std::wstring& content_root)
: command_line_(command_line), content_root_(content_root) {}
: on_launch(),
on_exit(),
command_line_(command_line),
content_root_(content_root),
game_title_(),
display_window_(nullptr),
memory_(),
audio_system_(),
graphics_system_(),
input_system_(),
export_resolver_(),
file_system_(),
kernel_state_(),
main_thread_(nullptr),
title_id_(0),
paused_(false),
restoring_(false),
restore_fence_() {}
Emulator::~Emulator() {
// Note that we delete things in the reverse order they were initialized.

View File

@ -175,11 +175,11 @@ class Emulator {
std::unique_ptr<vfs::VirtualFileSystem> file_system_;
std::unique_ptr<kernel::KernelState> kernel_state_;
threading::Thread* main_thread_ = nullptr;
uint32_t title_id_ = 0; // Currently running title ID
threading::Thread* main_thread_;
uint32_t title_id_; // Currently running title ID
bool paused_ = false;
bool restoring_ = false;
bool paused_;
bool restoring_;
threading::Fence restore_fence_; // Fired on restore finish.
};