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

Merge pull request #3160 from Tilka/style 

Misc. style fixes
This commit is contained in:
flacs 2015-10-11 15:36:06 +02:00
parent f3c88137e7 0f1b287402
commit a7b6ae8f2c
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/ChunkFile.h
View File

@ -235,7 +235,7 @@ public:
while (true) while (true)
{ {
u8 shouldExist = (list_cur ? 1 : 0); u8 shouldExist = !!list_cur;
Do(shouldExist); Do(shouldExist);
if (shouldExist == 1) if (shouldExist == 1)
{ {

2
Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
View File

@ -181,7 +181,7 @@ void Wiimote::SendAck(u8 _reportID)
ack->reportID = _reportID; ack->reportID = _reportID;
ack->errorID = 0; ack->errorID = 0;
Core::Callback_WiimoteInterruptChannel( m_index, m_reporting_channel, data, sizeof(data)); Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, sizeof(data));
} }
void Wiimote::HandleExtensionSwap() void Wiimote::HandleExtensionSwap()

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

@ -91,7 +91,7 @@ void EmulateShake(AccelData* const accel
// shake is a bitfield of X,Y,Z shake button states // shake is a bitfield of X,Y,Z shake button states
static const unsigned int btns[] = { 0x01, 0x02, 0x04 }; static const unsigned int btns[] = { 0x01, 0x02, 0x04 };
unsigned int shake = 0; unsigned int shake = 0;
buttons_group->GetState( &shake, btns ); buttons_group->GetState(&shake, btns);
for (int i = 0; i != 3; ++i) for (int i = 0; i != 3; ++i)
{ {
@ -248,7 +248,7 @@ void Wiimote::Reset()
m_adpcm_state.step = 127; m_adpcm_state.step = 127;
} }
Wiimote::Wiimote( const unsigned int index ) Wiimote::Wiimote(const unsigned int index)
: m_index(index) : m_index(index)
, ir_sin(0) , ir_sin(0)
, ir_cos(1) , ir_cos(1)
@ -259,7 +259,7 @@ Wiimote::Wiimote( const unsigned int index )
// buttons // buttons
groups.emplace_back(m_buttons = new Buttons("Buttons")); groups.emplace_back(m_buttons = new Buttons("Buttons"));
for (auto& named_button : named_buttons) for (auto& named_button : named_buttons)
m_buttons->controls.emplace_back(new ControlGroup::Input( named_button)); m_buttons->controls.emplace_back(new ControlGroup::Input(named_button));
// ir // ir
groups.emplace_back(m_ir = new Cursor(_trans("IR"))); groups.emplace_back(m_ir = new Cursor(_trans("IR")));
@ -297,7 +297,7 @@ Wiimote::Wiimote( const unsigned int index )
m_dpad->controls.emplace_back(new ControlGroup::Input(named_direction)); m_dpad->controls.emplace_back(new ControlGroup::Input(named_direction));
// options // options
groups.emplace_back( m_options = new ControlGroup(_trans("Options"))); groups.emplace_back(m_options = new ControlGroup(_trans("Options")));
m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input"))); m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input")));
m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Sideways Wiimote"), false)); m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Sideways Wiimote"), false));
m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false)); m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false));
@ -770,8 +770,6 @@ void Wiimote::ControlChannel(const u16 _channelID, const void* _pData, u32 _Size
if (99 == _channelID) if (99 == _channelID)
{ {
// Wiimote disconnected // Wiimote disconnected
//PanicAlert( "Wiimote Disconnected" );
// reset eeprom/register/reporting mode // reset eeprom/register/reporting mode
Reset(); Reset();
return; return;

2
Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
View File

@ -58,7 +58,7 @@ void DoState(PointerWrap &p)
p.Do(interruptWaiting); p.Do(interruptWaiting);
// Is this right? // Is this right?
p.DoArray(g_video_buffer_read_ptr,writePos); p.DoArray(g_video_buffer_read_ptr, writePos);
} }
static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate) static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)

2
Source/Core/VideoCommon/MainBase.cpp
View File

@ -36,7 +36,7 @@ static volatile struct
void VideoBackendHardware::EmuStateChange(EMUSTATE_CHANGE newState) void VideoBackendHardware::EmuStateChange(EMUSTATE_CHANGE newState)
{ {
EmulatorState((newState == EMUSTATE_CHANGE_PLAY) ? true : false); EmulatorState(newState == EMUSTATE_CHANGE_PLAY);
} }
// Enter and exit the video loop // Enter and exit the video loop