games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #4532 from IvanSavenko/bugfixing

Browse Source 
Fixes for recent regressions
This commit is contained in:
Ivan Savenko 2024-08-29 17:16:31 +03:00 committed by GitHub
commit 9a5bee1eaf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/eventsSDL/InputSourceMouse.cpp
View File

@ -23,6 +23,7 @@
#include <SDL_events.h>
#include <SDL_hints.h>
#include <SDL_version.h>
InputSourceMouse::InputSourceMouse()
:mouseToleranceDistance(settings["input"]["mouseToleranceDistance"].Integer())
@ -69,7 +70,11 @@ void InputSourceMouse::handleEventMouseButtonDown(const SDL_MouseButtonEvent & b
void InputSourceMouse::handleEventMouseWheel(const SDL_MouseWheelEvent & wheel)
{
GH.events().dispatchMouseScrolled(Point(wheel.x, wheel.y) / GH.screenHandler().getScalingFactor(), GH.getCursorPosition());
#if SDL_VERSION_ATLEAST(2,26,0)
GH.events().dispatchMouseScrolled(Point(wheel.x, wheel.y), Point(wheel.mouseX, wheel.mouseY) / GH.screenHandler().getScalingFactor());
#else
GH.events().dispatchMouseScrolled(Point(wheel.x, wheel.y), GH.getCursorPosition());
#endif
}
void InputSourceMouse::handleEventMouseButtonUp(const SDL_MouseButtonEvent & button)

13
client/mainmenu/CMainMenu.cpp
View File

@ -80,6 +80,12 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
pos = background->center();
if(!config["video"].isNull())
{
Point videoPosition(config["video"]["x"].Integer(), config["video"]["y"].Integer());
videoPlayer = std::make_shared<VideoWidget>(videoPosition, VideoPath::fromJson(config["video"]["name"]), false);
}
for(const JsonNode & node : config["items"].Vector())
menuNameToEntry.push_back(node["name"].String());
@ -90,12 +96,7 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
menuNameToEntry.push_back("credits");
tabs = std::make_shared<CTabbedInt>(std::bind(&CMenuScreen::createTab, this, _1));
if(!config["video"].isNull())
{
Point videoPosition(config["video"]["x"].Integer(), config["video"]["y"].Integer());
videoPlayer = std::make_shared<VideoWidget>(videoPosition, VideoPath::fromJson(config["video"]["name"]), false);
}
else
if(config["video"].isNull())
tabs->setRedrawParent(true);
}

9
lib/gameState/CGameState.cpp
View File

@ -194,6 +194,7 @@ void CGameState::init(const IMapService * mapService, StartInfo * si, Load::Prog
initRandomFactionsForPlayers();
randomizeMapObjects();
placeStartingHeroes();
initOwnedObjects();
initDifficulty();
initHeroes();
initStartingBonus();
@ -492,8 +493,14 @@ void CGameState::randomizeMapObjects()
}
}
}
}
}
if (object->getOwner().isValidPlayer())
void CGameState::initOwnedObjects()
{
for(CGObjectInstance *object : map->objects)
{
if (object && object->getOwner().isValidPlayer())
getPlayerState(object->getOwner())->addOwnedObject(object);
}
}

1
lib/gameState/CGameState.h
View File

@ -181,6 +181,7 @@ private:
void initGlobalBonuses();
void initGrailPosition();
void initRandomFactionsForPlayers();
void initOwnedObjects();
void randomizeMapObjects();
void initPlayerStates();
void placeStartingHeroes();