Implement query methods in terms of static methods

Reduce code duplication. Ensure functions with similar names behave in the same manner. Previously the `shift` and `query_shift` functions treated Caps Lock differently.
lairworks · Jan 28, 2024 · d6346ab · d6346ab
1 parent fdb7db8
commit d6346ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/NAS2D/EventHandler.cpp b/NAS2D/EventHandler.cpp
@@ -792,7 +792,7 @@ bool EventHandler::control(KeyModifier mod)
  */
 bool EventHandler::query_shift() const
 {
-	return KeyModifier::None != (static_cast<KeyModifier>(SDL_GetModState()) & KeyModifier::Shift);
+	return shift(static_cast<KeyModifier>(SDL_GetModState()));
 }
 
 
@@ -801,7 +801,7 @@ bool EventHandler::query_shift() const
  */
 bool EventHandler::query_numlock() const
 {
-	return KeyModifier::None != (static_cast<KeyModifier>(SDL_GetModState()) & KeyModifier::Num);
+	return numlock(static_cast<KeyModifier>(SDL_GetModState()));
 }
 
 
@@ -810,7 +810,7 @@ bool EventHandler::query_numlock() const
  */
 bool EventHandler::query_control() const
 {
-	return KeyModifier::None != (static_cast<KeyModifier>(SDL_GetModState()) & KeyModifier::Ctrl);
+	return control(static_cast<KeyModifier>(SDL_GetModState()));
 }