From 5c537fdbe3bb434f86cc79572dac941be6ba122a Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Tue, 11 Apr 2017 19:02:31 +0200 Subject: [PATCH] onepad: properly indent comments Clang-format doesn't like the double * --- plugins/onepad/GamePad.h | 33 +++++++++++++++++---------------- plugins/onepad/SDL/joystick.cpp | 14 +++++++------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/plugins/onepad/GamePad.h b/plugins/onepad/GamePad.h index 9cb19137fc..1d974c0eda 100644 --- a/plugins/onepad/GamePad.h +++ b/plugins/onepad/GamePad.h @@ -35,31 +35,32 @@ public: GamePad(const GamePad &); // copy constructor GamePad &operator=(const GamePad &); // assignment - /** - * Find every interesting devices and create right structure for them(depend on backend) - **/ + /* + * Find every interesting devices and create right structure for them(depend on backend) + */ static void EnumerateGamePads(std::vector> &vgamePad); static void UpdateReleaseState(); - /** - * Update state of every attached devices - **/ + + /* + * Update state of every attached devices + */ static void UpdateGamePadState(); - /** - * Causes devices to rumble - * Rumble will differ according to type which is either 0(small motor) or 1(big motor) - **/ + /* + * Causes devices to rumble + * Rumble will differ according to type which is either 0(small motor) or 1(big motor) + */ virtual void Rumble(int type, int pad) { return; } - /** - * Safely dispatch to the Rumble method above - **/ + /* + * Safely dispatch to the Rumble method above + */ static void DoRumble(int type, int pad); virtual bool Init(int id) { return false; } // opens a handle and gets information - /** - * Used for GUI checkbox to give feedback to the user - **/ + /* + * Used for GUI checkbox to give feedback to the user + */ virtual bool TestForce(float strength = 0.6) { return false; } virtual bool PollButtons(u32 &pkey) { return false; } diff --git a/plugins/onepad/SDL/joystick.cpp b/plugins/onepad/SDL/joystick.cpp index 789c68853c..e50b33653c 100644 --- a/plugins/onepad/SDL/joystick.cpp +++ b/plugins/onepad/SDL/joystick.cpp @@ -96,13 +96,13 @@ void JoystickInfo::Rumble(int type, int pad) if (first) { // If done multiple times, device memory will be filled first = 0; GenerateDefaultEffect(); - /** Sine and triangle are quite probably the best, don't change that lightly and if you do - * keep effects ordered by type - **/ - /** Effect for small motor **/ - /** Sine seems to be the only effect making little motor from DS3/4 react - * Intensity has pretty much no effect either(which is coherent with what is explain in hid_sony driver - **/ + /* Sine and triangle are quite probably the best, don't change that lightly and if you do + * keep effects ordered by type + */ + /* Effect for small motor */ + /* Sine seems to be the only effect making little motor from DS3/4 react + * Intensity has pretty much no effect either(which is coherent with what is explain in hid_sony driver + */ effects[0].type = SDL_HAPTIC_SINE; effects_id[0] = SDL_HapticNewEffect(haptic, &effects[0]); if (effects_id[0] < 0) {