phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 17:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent jump spamming, disable face-target while mounted, remove auto-attack on right-click target

Browse source
This commit is contained in:
Kelsi 2026-02-07 18:57:27 -08:00
parent 2fb01abcaa
commit c156f3d390
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rendering/camera_controller.cpp
View file

@ -91,7 +91,7 @@ void CameraController::update(float deltaTime) {
bool keyE = !uiWantsKeyboard && !sitting && input.isKeyPressed(SDL_SCANCODE_E); bool keyE = !uiWantsKeyboard && !sitting && input.isKeyPressed(SDL_SCANCODE_E);
bool shiftDown = !uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_LSHIFT) || input.isKeyPressed(SDL_SCANCODE_RSHIFT)); bool shiftDown = !uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_LSHIFT) || input.isKeyPressed(SDL_SCANCODE_RSHIFT));
bool ctrlDown = !uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_LCTRL) || input.isKeyPressed(SDL_SCANCODE_RCTRL)); bool ctrlDown = !uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_LCTRL) || input.isKeyPressed(SDL_SCANCODE_RCTRL));
bool nowJump = !uiWantsKeyboard && !sitting && input.isKeyPressed(SDL_SCANCODE_SPACE); bool nowJump = !uiWantsKeyboard && !sitting && input.isKeyJustPressed(SDL_SCANCODE_SPACE);
// Idle camera: any input resets the timer; timeout triggers a slow orbit pan // Idle camera: any input resets the timer; timeout triggers a slow orbit pan
bool anyInput = leftMouseDown || rightMouseDown || keyW || keyS || keyA || keyD || keyQ || keyE || nowJump; bool anyInput = leftMouseDown || rightMouseDown || keyW || keyS || keyA || keyD || keyQ || keyE || nowJump;

2
src/rendering/renderer.cpp
View file

@ -935,7 +935,7 @@ void Renderer::update(float deltaTime) {
// Movement-facing comes from camera controller and is decoupled from LMB orbit. // Movement-facing comes from camera controller and is decoupled from LMB orbit.
if (cameraController->isMoving() || cameraController->isRightMouseHeld()) { if (cameraController->isMoving() || cameraController->isRightMouseHeld()) {
characterYaw = cameraController->getFacingYaw(); characterYaw = cameraController->getFacingYaw();
} else if (inCombat_ && targetPosition && !emoteActive) { } else if (inCombat_ && targetPosition && !emoteActive && !isMounted()) {
// Face target when in combat and idle // Face target when in combat and idle
glm::vec3 toTarget = *targetPosition - characterPosition; glm::vec3 toTarget = *targetPosition - characterPosition;
if (glm::length(glm::vec2(toTarget.x, toTarget.y)) > 0.1f) { if (glm::length(glm::vec2(toTarget.x, toTarget.y)) > 0.1f) {

4
src/ui/game_screen.cpp
View file

@ -712,11 +712,9 @@ void GameScreen::processTargetInput(game::GameHandler& gameHandler) {
if (unit->getHealth() == 0 && unit->getMaxHealth() > 0) { if (unit->getHealth() == 0 && unit->getMaxHealth() > 0) {
gameHandler.lootTarget(target->getGuid()); gameHandler.lootTarget(target->getGuid());
} else { } else {
// Interact with friendly NPCs, otherwise attack // Interact with friendly NPCs; hostile units just get targeted
if (!unit->isHostile() && unit->isInteractable()) { if (!unit->isHostile() && unit->isInteractable()) {
gameHandler.interactWithNpc(target->getGuid()); gameHandler.interactWithNpc(target->getGuid());
} else {
gameHandler.startAutoAttack(target->getGuid());
} }
} }
} else if (target->getType() == game::ObjectType::PLAYER) { } else if (target->getType() == game::ObjectType::PLAYER) {