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

Core: Fix variable naming conventions 

[committer note: squashed two commits]
This commit is contained in:
Filippo Tarpini 2020-12-31 12:50:22 +02:00 committed by Léo Lam
parent ee25f03ff9
commit 3acd1726b9
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -39,7 +39,7 @@ static void TryToConnectBalanceBoard(std::unique_ptr<Wiimote>);
static bool TryToConnectWiimoteToSlot(std::unique_ptr<Wiimote>&, unsigned int); static bool TryToConnectWiimoteToSlot(std::unique_ptr<Wiimote>&, unsigned int);
static void HandleWiimoteDisconnect(int index); static void HandleWiimoteDisconnect(int index);
static bool g_real_wiimotes_initialized = false; static bool s_real_wiimotes_initialized = false;
// This is used to store connected Wiimotes' IDs, so we don't connect // This is used to store connected Wiimotes' IDs, so we don't connect
// more than once to the same device. // more than once to the same device.
@ -807,7 +807,7 @@ void LoadSettings()
// config dialog calls this when some settings change // config dialog calls this when some settings change
void Initialize(::Wiimote::InitializeMode init_mode) void Initialize(::Wiimote::InitializeMode init_mode)
{ {
if (!g_real_wiimotes_initialized) if (!s_real_wiimotes_initialized)
{ {
s_wiimote_scanner.StartThread(); s_wiimote_scanner.StartThread();
} }
@ -829,12 +829,12 @@ void Initialize(::Wiimote::InitializeMode init_mode)
} }
} }
if (g_real_wiimotes_initialized) if (s_real_wiimotes_initialized)
return; return;
NOTICE_LOG_FMT(WIIMOTE, "WiimoteReal::Initialize"); NOTICE_LOG_FMT(WIIMOTE, "WiimoteReal::Initialize");
g_real_wiimotes_initialized = true; s_real_wiimotes_initialized = true;
} }
// called on emulation shutdown // called on emulation shutdown
@ -848,7 +848,7 @@ void Stop()
// called when the Dolphin app exits // called when the Dolphin app exits
void Shutdown() void Shutdown()
{ {
g_real_wiimotes_initialized = false; s_real_wiimotes_initialized = false;
s_wiimote_scanner.StopThread(); s_wiimote_scanner.StopThread();
NOTICE_LOG_FMT(WIIMOTE, "WiimoteReal::Shutdown"); NOTICE_LOG_FMT(WIIMOTE, "WiimoteReal::Shutdown");

6
Source/Core/Core/State.cpp
View File

@ -99,11 +99,11 @@ enum
STATE_LOAD = 2, STATE_LOAD = 2,
}; };
static bool g_use_compression = true; static bool s_use_compression = true;
void EnableCompression(bool compression) void EnableCompression(bool compression)
{ {
g_use_compression = compression; s_use_compression = compression;
} }
// Returns true if state version matches current Dolphin state version, false otherwise. // Returns true if state version matches current Dolphin state version, false otherwise.
@ -358,7 +358,7 @@ static void CompressAndDumpState(CompressAndDumpState_args save_args)
// Setting up the header // Setting up the header
StateHeader header{}; StateHeader header{};
SConfig::GetInstance().GetGameID().copy(header.gameID, std::size(header.gameID)); SConfig::GetInstance().GetGameID().copy(header.gameID, std::size(header.gameID));
header.size = g_use_compression ? (u32)buffer_size : 0; header.size = s_use_compression ? (u32)buffer_size : 0;
header.time = Common::Timer::GetDoubleTime(); header.time = Common::Timer::GetDoubleTime();
f.WriteArray(&header, 1); f.WriteArray(&header, 1);