mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-15 00:05:02 +02:00
Compile fixes
This commit is contained in:
@ -12,7 +12,7 @@
|
|||||||
#include "ObstacleSetHandler.h"
|
#include "ObstacleSetHandler.h"
|
||||||
|
|
||||||
#include "../modding/IdentifierStorage.h"
|
#include "../modding/IdentifierStorage.h"
|
||||||
#include "../constants/stringConstants.h"
|
#include "../constants/StringConstants.h"
|
||||||
|
|
||||||
VCMI_LIB_NAMESPACE_BEGIN
|
VCMI_LIB_NAMESPACE_BEGIN
|
||||||
|
|
||||||
@ -294,9 +294,14 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
|
|||||||
{
|
{
|
||||||
int alignment = vstd::find_pos(GameConstants::ALIGNMENT_NAMES, str);
|
int alignment = vstd::find_pos(GameConstants::ALIGNMENT_NAMES, str);
|
||||||
if (alignment == -1)
|
if (alignment == -1)
|
||||||
|
{
|
||||||
logGlobal->error("Incorrect alignment: ", str);
|
logGlobal->error("Incorrect alignment: ", str);
|
||||||
|
return EAlignment::ANY;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
return static_cast<EAlignment>(alignment);
|
return static_cast<EAlignment>(alignment);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (json["alignment"].isString())
|
if (json["alignment"].isString())
|
||||||
|
Reference in New Issue
Block a user