mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-26 03:52:01 +02:00
fix warning
This commit is contained in:
parent
d4b2ec5b0b
commit
e6cd3630e0
@ -49,7 +49,8 @@ void ButtonBase::update()
|
|||||||
// hero movement speed buttons: only three frames: normal, pressed and blocked/highlighted
|
// hero movement speed buttons: only three frames: normal, pressed and blocked/highlighted
|
||||||
if (state == EButtonState::HIGHLIGHTED && image->size() < 4)
|
if (state == EButtonState::HIGHLIGHTED && image->size() < 4)
|
||||||
image->setFrame(image->size()-1);
|
image->setFrame(image->size()-1);
|
||||||
image->setFrame(stateToIndex[vstd::to_underlying(state)]);
|
else
|
||||||
|
image->setFrame(stateToIndex[vstd::to_underlying(state)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isActive())
|
if (isActive())
|
||||||
|
@ -422,7 +422,7 @@ static std::string requiredCheck(JsonValidator & validator, const JsonNode & bas
|
|||||||
std::string errors;
|
std::string errors;
|
||||||
for(const auto & required : schema.Vector())
|
for(const auto & required : schema.Vector())
|
||||||
{
|
{
|
||||||
if (data[required.String()].isNull())
|
if (data[required.String()].isNull() && data.getModScope() != "core")
|
||||||
errors += validator.makeErrorMessage("Required entry " + required.String() + " is missing");
|
errors += validator.makeErrorMessage("Required entry " + required.String() + " is missing");
|
||||||
}
|
}
|
||||||
return errors;
|
return errors;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user