games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Integrated CClientState into GameEngine class

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-10 22:08:50 +00:00
parent cacceda950
commit f657e85305
51 changed files with 240 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/eventsSDL/InputSourceGameController.cpp
View File

@@ -195,14 +195,12 @@ void InputSourceGameController::handleEventAxisMotion(const SDL_ControllerAxisEv
void InputSourceGameController::tryToConvertCursor()
{
assert(CCS);
assert(CCS->curh);
if(CCS->curh->getShowType() == Cursor::ShowType::HARDWARE)
if(ENGINE->cursor().getShowType() == Cursor::ShowType::HARDWARE)
{
int scalingFactor = ENGINE->screenHandler().getScalingFactor();
const Point & cursorPosition = ENGINE->getCursorPosition();
CCS->curh->changeCursor(Cursor::ShowType::SOFTWARE);
CCS->curh->cursorMove(cursorPosition.x * scalingFactor, cursorPosition.y * scalingFactor);
ENGINE->cursor().changeCursor(Cursor::ShowType::SOFTWARE);
ENGINE->cursor().cursorMove(cursorPosition.x * scalingFactor, cursorPosition.y * scalingFactor);
ENGINE->input().setCursorPosition(cursorPosition);
}
}
@@ -232,8 +230,7 @@ void InputSourceGameController::doCursorMove(int deltaX, int deltaY)
int newY = std::min(std::max(cursorPosition.y + deltaY, 0), screenSize.y);
Point targetPosition{newX, newY};
ENGINE->input().setCursorPosition(targetPosition);
if(CCS && CCS->curh)
CCS->curh->cursorMove(ENGINE->getCursorPosition().x * scalingFactor, ENGINE->getCursorPosition().y * scalingFactor);
ENGINE->cursor().cursorMove(ENGINE->getCursorPosition().x * scalingFactor, ENGINE->getCursorPosition().y * scalingFactor);
}
int InputSourceGameController::getMoveDis(float planDis)