Purely stylistic cleanup of Core/HW/WiimoteEmu/Attachment/* files.

Also cleaned up WiimoteEmu.h as well.
This commit is contained in:
Lioncash
2014-02-01 19:13:38 -05:00
parent c31a623780
commit 3efb0aa5f7
8 changed files with 152 additions and 153 deletions

View File

@ -14,9 +14,9 @@ namespace WiimoteEmu
class Attachment : public ControllerEmu
{
public:
Attachment( const char* const _name, WiimoteEmu::ExtensionReg& _reg );
Attachment(const char* const _name, WiimoteEmu::ExtensionReg& _reg);
virtual void GetState( u8* const data, const bool focus = true ) {}
virtual void GetState(u8* const data, const bool focus = true) {}
void Reset();
std::string GetName() const override;
@ -30,7 +30,7 @@ public:
class None : public Attachment
{
public:
None( WiimoteEmu::ExtensionReg& _reg );
None(WiimoteEmu::ExtensionReg& _reg);
};
}

View File

@ -11,7 +11,7 @@ class Classic : public Attachment
{
public:
Classic(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus );
void GetState(u8* const data, const bool focus) override;
enum
{

View File

@ -11,7 +11,7 @@ class Drums : public Attachment
{
public:
Drums(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus );
void GetState(u8* const data, const bool focus) override;
enum
{

View File

@ -11,7 +11,7 @@ class Guitar : public Attachment
{
public:
Guitar(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus ) override;
void GetState(u8* const data, const bool focus) override;
enum
{

View File

@ -17,7 +17,7 @@ class Nunchuk : public Attachment
public:
Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg);
virtual void GetState( u8* const data, const bool focus ) override;
virtual void GetState(u8* const data, const bool focus) override;
enum
{

View File

@ -32,8 +32,10 @@ public:
private:
Buttons* m_buttons;
AnalogStick* m_stick;
Triggers *m_effect_dial;
Slider *m_left_table, *m_right_table, *m_crossfade;
Triggers* m_effect_dial;
Slider* m_left_table;
Slider* m_right_table;
Slider* m_crossfade;
};

View File

@ -118,7 +118,7 @@ public:
BUTTON_HOME = 0x8000,
};
Wiimote( const unsigned int index );
Wiimote(const unsigned int index);
std::string GetName() const;
void Update();
@ -148,7 +148,7 @@ private:
struct ReadRequest
{
//u16 channel;
unsigned int address, size, position;
u32 address, size, position;
u8* data;
};
@ -202,7 +202,7 @@ private:
// read data request queue
// maybe it isn't actually a queue
// maybe read requests cancel any current requests
std::queue< ReadRequest > m_read_requests;
std::queue<ReadRequest> m_read_requests;
wiimote_key m_ext_key;
@ -219,14 +219,12 @@ private:
// address 0xFA
u8 ext_identifier[6];
} m_reg_motion_plus;
struct IrReg
{
u8 data[0x33];
u8 mode;
} m_reg_ir;
ExtensionReg m_reg_ext;
@ -244,7 +242,6 @@ private:
u8 unk_7;
u8 play;
u8 unk_9;
} m_reg_speaker;
};