diff options
Diffstat (limited to 'Source/Core/InputCommon')
8 files changed, 19 insertions, 18 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index 8de2b6ef56..daa654e48c 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -130,11 +130,11 @@ Lexer::Lexer(std::string expr_) : expr(std::move(expr_)) it = expr.begin(); } -Token Lexer::GetDelimitedToken(TokenType type, char delimeter) +Token Lexer::GetDelimitedToken(TokenType type, char delimiter) { - const std::string value = FetchCharsWhile([&](char c) { return c != delimeter && c != '\n'; }); + const std::string value = FetchCharsWhile([&](char c) { return c != delimiter && c != '\n'; }); - if (it == expr.end() || *it != delimeter) + if (it == expr.end() || *it != delimiter) return Token(TOK_INVALID); ++it; @@ -639,7 +639,8 @@ private: // right-hand child. Its intended use is for supporting old-style barewords expressions. // Note that if you have a keyboard device as default device and the expression is a single digit // number, this will usually resolve in a numerical key instead of a numerical value. -// Though if this expression belongs to NumericSetting, it will likely be simplifed back to a value. +// Though if this expression belongs to NumericSetting, it will likely be simplified back to a +// value. class CoalesceExpression : public Expression { public: diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h index 2bb9709063..b36fef1daf 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h @@ -96,7 +96,7 @@ private: } std::string FetchWordChars(); - Token GetDelimitedToken(TokenType type, char delimeter); + Token GetDelimitedToken(TokenType type, char delimiter); Token GetDelimitedLiteral(); Token GetVariable(); Token GetFullyQualifiedControl(); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp index 8ff82e2b33..0f720d3add 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp @@ -28,7 +28,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType {_trans("Distance"), // i18n: The symbol/abbreviation for centimeters. _trans("cm"), - // i18n: Refering to emulated wii remote swing movement. + // i18n: Referring to emulated wii remote swing movement. _trans("Distance of travel from neutral position.")}, 50, 1, 100); @@ -42,7 +42,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType {_trans("Speed"), // i18n: The symbol/abbreviation for meters per second. _trans("m/s"), - // i18n: Refering to emulated wii remote swing movement. + // i18n: Referring to emulated wii remote swing movement. _trans("Peak velocity of outward swing movements.")}, 16, 1, 40); @@ -51,7 +51,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType {_trans("Return Speed"), // i18n: The symbol/abbreviation for meters per second. _trans("m/s"), - // i18n: Refering to emulated wii remote swing movement. + // i18n: Referring to emulated wii remote swing movement. _trans("Peak velocity of movements to neutral position.")}, 2, 1, 40); @@ -59,7 +59,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType {_trans("Angle"), // i18n: The symbol/abbreviation for degrees (unit of angular measure). _trans("°"), - // i18n: Refering to emulated wii remote swing movement. + // i18n: Referring to emulated wii remote swing movement. _trans("Rotation applied at extremities of swing.")}, 90, 1, 180); } @@ -141,7 +141,7 @@ Shake::Shake(const std::string& name_, ControlState default_intensity_scale) {_trans("Intensity"), // i18n: The symbol/abbreviation for centimeters. _trans("cm"), - // i18n: Refering to emulated wii remote movement. + // i18n: Referring to emulated wii remote movement. _trans("Total travel distance.")}, 10 * default_intensity_scale, -50, 50); @@ -151,7 +151,7 @@ Shake::Shake(const std::string& name_, ControlState default_intensity_scale) {_trans("Frequency"), // i18n: The symbol/abbreviation for hertz (cycles per second). _trans("Hz"), - // i18n: Refering to emulated wii remote movement. + // i18n: Referring to emulated wii remote movement. _trans("Number of shakes per second.")}, 6, 1, 20); } diff --git a/Source/Core/InputCommon/ControllerEmu/StickGate.cpp b/Source/Core/InputCommon/ControllerEmu/StickGate.cpp index c1e8a29b2d..660ee939be 100644 --- a/Source/Core/InputCommon/ControllerEmu/StickGate.cpp +++ b/Source/Core/InputCommon/ControllerEmu/StickGate.cpp @@ -34,7 +34,7 @@ std::optional<double> GetRayLineIntersection(Common::DVec2 ray, Common::DVec2 po const auto dot = diff.Dot({-ray.y, ray.x}); if (std::abs(dot) < 0.00001) { - // Both points are on top of eachother. + // Both points are on top of each other. return std::nullopt; } @@ -169,7 +169,7 @@ ControlState ReshapableInput::GetCalibrationDataRadiusAtAngle(const CalibrationD GetPointFromAngleAndLength(sample1_angle, data[sample1_index]), GetPointFromAngleAndLength(sample2_angle, data[sample2_index])); - // Intersection has no value when points are on top of eachother. + // Intersection has no value when points are on top of each other. return intersection.value_or(data[sample1_index]); } diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h index aca2176e6d..6d0559ca52 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h @@ -240,7 +240,7 @@ struct Message std::optional<ToMsgType> CheckAndCastTo() { const u32 crc32_in_header = m_message.header.crc32; - // zero out the crc32 in the packet once we got it since that's whats needed for calculation + // zero out the crc32 in the packet once we got it since that's what's needed for calculation m_message.header.crc32 = 0; const u32 crc32_calculated = Common::ComputeCRC32(reinterpret_cast<const u8*>(&m_message), sizeof(ToMsgType)); diff --git a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp index 428a7ed6a3..567090ee7b 100644 --- a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp @@ -328,7 +328,7 @@ private: if (m_switch == WGI::GameControllerSwitchPosition::Center) return 0.0; - // All of the "inbetween" states (e.g. Up-Right) are one-off from the four cardinal + // All of the "in between" states (e.g. Up-Right) are one-off from the four cardinal // directions. This tests that the current switch state value is within 1 of the desired // state. const auto direction_diff = std::abs(static_cast<int32_t>(m_switch) - m_direction); diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp index 9b5fe3c1e9..b062684100 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp @@ -737,7 +737,7 @@ void Device::ProcessExtensionID(u8 id_0, u8 id_4, u8 id_5) } else { - // This is a normal occurance before extension initialization. + // This is a normal occurrence before extension initialization. DEBUG_LOG_FMT(WIIMOTE, "WiiRemote: Unknown extension: {} {} {}.", id_0, id_4, id_5); m_extension_id = ExtensionID::Unsupported; } @@ -1328,7 +1328,7 @@ void Device::IRState::ProcessData(const DataReportManipulator& manipulator) if (points.Count() >= 2) { const auto variance = points.PopulationVariance(); - // Adjusts Y coorinate to match horizontal FOV. + // Adjusts Y coordinate to match horizontal FOV. const auto separation = Common::Vec2(std::sqrt(variance.x), std::sqrt(variance.y)) / Common::Vec2(WiimoteEmu::CameraLogic::CAMERA_RES_X, diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 5ec245a56d..8181b196ee 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -634,7 +634,7 @@ static bool CheckDeviceAccess(libusb_device* device) } else if (ret != 0) // 0: kernel driver is not active, but otherwise no error. { - // Neither 0 nor 1 means an error occured. + // Neither 0 nor 1 means an error occurred. ERROR_LOG_FMT(CONTROLLERINTERFACE, "libusb_kernel_driver_active failed: {}", LibusbUtils::ErrorWrap(ret)); } |