mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-27 22:49:25 +02:00
Merge branch 'vcmi/master' into 'vcmi/develop'
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include "../render/Canvas.h"
|
||||
#include "../render/IImage.h"
|
||||
#include "../render/IRenderHandler.h"
|
||||
#include "../render/Colors.h"
|
||||
|
||||
#include "../../CCallback.h"
|
||||
|
||||
@@ -248,7 +249,6 @@ uint8_t MapRendererRoad::checksum(IMapRendererContext & context, const int3 & co
|
||||
|
||||
MapRendererBorder::MapRendererBorder()
|
||||
{
|
||||
emptyFill = std::make_unique<Canvas>(Point(32,32));
|
||||
animation = GH.renderHandler().loadAnimation(AnimationPath::builtin("EDG"));
|
||||
animation->preload();
|
||||
}
|
||||
@@ -300,7 +300,7 @@ void MapRendererBorder::renderTile(IMapRendererContext & context, Canvas & targe
|
||||
}
|
||||
else
|
||||
{
|
||||
target.draw(*emptyFill, Point(0,0));
|
||||
target.drawColor(Rect(0,0,32,32), Colors::BLACK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user