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

Merge pull request #1656 from krs0/feature/Rename_showBlocking_to_showBlocked

Browse Source 
Renamed showBlockable to showBlocked
This commit is contained in:
Ivan Savenko 2023-03-08 12:09:59 +02:00 committed by GitHub
commit dc70095333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mapView/IMapRendererContext.h
View File

@ -82,5 +82,5 @@ public:
/// if true, map grid should be visible on map /// if true, map grid should be visible on map
virtual bool showGrid() const = 0; virtual bool showGrid() const = 0;
virtual bool showVisitable() const = 0; virtual bool showVisitable() const = 0;
virtual bool showBlockable() const = 0; virtual bool showBlocked() const = 0;
}; };

14
client/mapView/MapRenderer.cpp
View File

@ -581,7 +581,7 @@ uint8_t MapRendererObjects::checksum(IMapRendererContext & context, const int3 &
MapRendererDebug::MapRendererDebug() MapRendererDebug::MapRendererDebug()
: imageGrid(IImage::createFromFile("debug/grid", EImageBlitMode::ALPHA)) : imageGrid(IImage::createFromFile("debug/grid", EImageBlitMode::ALPHA))
, imageBlockable(IImage::createFromFile("debug/blocked", EImageBlitMode::ALPHA)) , imageBlocked(IImage::createFromFile("debug/blocked", EImageBlitMode::ALPHA))
, imageVisitable(IImage::createFromFile("debug/visitable", EImageBlitMode::ALPHA)) , imageVisitable(IImage::createFromFile("debug/visitable", EImageBlitMode::ALPHA))
{ {
@ -592,9 +592,9 @@ void MapRendererDebug::renderTile(IMapRendererContext & context, Canvas & target
if(context.showGrid()) if(context.showGrid())
target.draw(imageGrid, Point(0,0)); target.draw(imageGrid, Point(0,0));
if(context.showVisitable() || context.showBlockable()) if(context.showVisitable() || context.showBlocked())
{ {
bool blockable = false; bool blocking = false;
bool visitable = false; bool visitable = false;
for(const auto & objectID : context.getObjects(coordinates)) for(const auto & objectID : context.getObjects(coordinates))
@ -604,12 +604,12 @@ void MapRendererDebug::renderTile(IMapRendererContext & context, Canvas & target
if (context.objectTransparency(objectID, coordinates) > 0) if (context.objectTransparency(objectID, coordinates) > 0)
{ {
visitable |= object->visitableAt(coordinates.x, coordinates.y); visitable |= object->visitableAt(coordinates.x, coordinates.y);
blockable |= object->blockingAt(coordinates.x, coordinates.y); blocking |= object->blockingAt(coordinates.x, coordinates.y);
} }
} }
if (context.showBlockable() && blockable) if (context.showBlocked() && blocking)
target.draw(imageBlockable, Point(0,0)); target.draw(imageBlocked, Point(0,0));
if (context.showVisitable() && visitable) if (context.showVisitable() && visitable)
target.draw(imageVisitable, Point(0,0)); target.draw(imageVisitable, Point(0,0));
} }
@ -622,7 +622,7 @@ uint8_t MapRendererDebug::checksum(IMapRendererContext & context, const int3 & c
if (context.showVisitable()) if (context.showVisitable())
result += 1; result += 1;
if (context.showBlockable()) if (context.showBlocked())
result += 2; result += 2;
if (context.showGrid()) if (context.showGrid())

2
client/mapView/MapRenderer.h
View File

@ -133,7 +133,7 @@ class MapRendererDebug
{ {
std::shared_ptr<IImage> imageGrid; std::shared_ptr<IImage> imageGrid;
std::shared_ptr<IImage> imageVisitable; std::shared_ptr<IImage> imageVisitable;
std::shared_ptr<IImage> imageBlockable; std::shared_ptr<IImage> imageBlocked;
public: public:
MapRendererDebug(); MapRendererDebug();

6
client/mapView/MapRendererContext.cpp
View File

@ -179,7 +179,7 @@ bool MapRendererBaseContext::showVisitable() const
return false; return false;
} }
bool MapRendererBaseContext::showBlockable() const bool MapRendererBaseContext::showBlocked() const
{ {
return false; return false;
} }
@ -246,9 +246,9 @@ bool MapRendererAdventureContext::showVisitable() const
return settingShowVisitable; return settingShowVisitable;
} }
bool MapRendererAdventureContext::showBlockable() const bool MapRendererAdventureContext::showBlocked() const
{ {
return settingShowBlockable; return settingShowBlocked;
} }
MapRendererAdventureTransitionContext::MapRendererAdventureTransitionContext(const MapRendererContextState & viewState) MapRendererAdventureTransitionContext::MapRendererAdventureTransitionContext(const MapRendererContextState & viewState)

6
client/mapView/MapRendererContext.h
View File

@ -55,7 +55,7 @@ public:
bool showOverlay() const override; bool showOverlay() const override;
bool showGrid() const override; bool showGrid() const override;
bool showVisitable() const override; bool showVisitable() const override;
bool showBlockable() const override; bool showBlocked() const override;
}; };
class MapRendererAdventureContext : public MapRendererBaseContext class MapRendererAdventureContext : public MapRendererBaseContext
@ -64,7 +64,7 @@ public:
uint32_t animationTime = 0; uint32_t animationTime = 0;
bool settingShowGrid = false; bool settingShowGrid = false;
bool settingShowVisitable = false; bool settingShowVisitable = false;
bool settingShowBlockable = false; bool settingShowBlocked = false;
bool settingsAdventureObjectAnimation = true; bool settingsAdventureObjectAnimation = true;
bool settingsAdventureTerrainAnimation = true; bool settingsAdventureTerrainAnimation = true;
@ -77,7 +77,7 @@ public:
bool showBorder() const override; bool showBorder() const override;
bool showGrid() const override; bool showGrid() const override;
bool showVisitable() const override; bool showVisitable() const override;
bool showBlockable() const override; bool showBlocked() const override;
}; };
class MapRendererAdventureTransitionContext : public MapRendererAdventureContext class MapRendererAdventureTransitionContext : public MapRendererAdventureContext

2
client/mapView/MapViewController.cpp
View File

@ -177,7 +177,7 @@ void MapViewController::update(uint32_t timeDelta)
adventureContext->settingsAdventureTerrainAnimation = settings["adventure"]["terrainAnimation"].Bool(); adventureContext->settingsAdventureTerrainAnimation = settings["adventure"]["terrainAnimation"].Bool();
adventureContext->settingShowGrid = settings["gameTweaks"]["showGrid"].Bool(); adventureContext->settingShowGrid = settings["gameTweaks"]["showGrid"].Bool();
adventureContext->settingShowVisitable = settings["session"]["showVisitable"].Bool(); adventureContext->settingShowVisitable = settings["session"]["showVisitable"].Bool();
adventureContext->settingShowBlockable = settings["session"]["showBlockable"].Bool(); adventureContext->settingShowBlocked = settings["session"]["showBlocked"].Bool();
} }
} }