From fbce0553240118b77e9bfa00b22e71981f8fa985 Mon Sep 17 00:00:00 2001 From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com> Date: Sun, 24 Apr 2022 18:19:32 -0700 Subject: [PATCH] Const some stuff --- libultraship/libultraship/Controller.h | 5 +++-- libultraship/libultraship/KeyboardController.h | 4 ++-- libultraship/libultraship/SDLController.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libultraship/libultraship/Controller.h b/libultraship/libultraship/Controller.h index a993dc681..256b31fee 100644 --- a/libultraship/libultraship/Controller.h +++ b/libultraship/libultraship/Controller.h @@ -20,14 +20,15 @@ namespace Ship { void Read(OSContPad* pad); virtual void ReadFromSource() = 0; virtual void WriteToSource(ControllerCallback* controller) = 0; + virtual bool Connected() const = 0; virtual bool CanRumble() const = 0; - virtual bool Connected() = 0; bool isRumbling; void SetButtonMapping(const std::string& szButtonName, int32_t dwScancode); std::shared_ptr GetAttachment() { return Attachment; } int32_t GetControllerNumber() { return dwControllerNumber; } - virtual bool HasPadConf() = 0; + + virtual bool HasPadConf() const = 0; virtual std::optional GetPadConfSection() = 0; protected: diff --git a/libultraship/libultraship/KeyboardController.h b/libultraship/libultraship/KeyboardController.h index a955bab96..f6c109ca7 100644 --- a/libultraship/libultraship/KeyboardController.h +++ b/libultraship/libultraship/KeyboardController.h @@ -10,15 +10,15 @@ namespace Ship { void ReadFromSource(); void WriteToSource(ControllerCallback* controller); + bool Connected() const { return true; } bool CanRumble() const { return false; } - bool Connected() { return true; } bool PressButton(int32_t dwScancode); bool ReleaseButton(int32_t dwScancode); void ReleaseAllButtons(); + bool HasPadConf() const { return false; } std::optional GetPadConfSection() { return {}; } - bool HasPadConf() { return false; }; protected: std::string GetControllerType(); diff --git a/libultraship/libultraship/SDLController.h b/libultraship/libultraship/SDLController.h index 788abdcb8..138466a89 100644 --- a/libultraship/libultraship/SDLController.h +++ b/libultraship/libultraship/SDLController.h @@ -12,13 +12,13 @@ namespace Ship { void ReadFromSource(); void WriteToSource(ControllerCallback* controller); + bool Connected() const { return Cont != nullptr; } bool CanRumble() const { return SDL_GameControllerHasRumble(Cont); } - bool Connected() { return Cont != nullptr; } std::string GetGuid() { return guid; }; + bool HasPadConf() const { return true; } std::optional GetPadConfSection(); - bool HasPadConf() { return true; }; protected: std::string GetControllerType();