mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-17 01:32:21 +02:00
Renamed LibClasses * VLC
to GameLibrary * LIBRARY
This commit is contained in:
@ -15,7 +15,7 @@
|
||||
#include "modding/IdentifierStorage.h"
|
||||
#include "texts/CGeneralTextHandler.h"
|
||||
#include "texts/CLegacyConfigParser.h"
|
||||
#include "VCMI_Lib.h"
|
||||
#include "GameLibrary.h"
|
||||
|
||||
VCMI_LIB_NAMESPACE_BEGIN
|
||||
|
||||
@ -45,7 +45,7 @@ std::shared_ptr<TerrainType> TerrainTypeHandler::loadFromJson( const std::string
|
||||
info->transitionRequired = json["transitionRequired"].Bool();
|
||||
info->terrainViewPatterns = json["terrainViewPatterns"].String();
|
||||
|
||||
VLC->generaltexth->registerString(scope, info->getNameTextID(), json["text"]);
|
||||
LIBRARY->generaltexth->registerString(scope, info->getNameTextID(), json["text"]);
|
||||
|
||||
const JsonVector & unblockedVec = json["minimapUnblocked"].Vector();
|
||||
info->minimapUnblocked =
|
||||
@ -78,7 +78,7 @@ std::shared_ptr<TerrainType> TerrainTypeHandler::loadFromJson( const std::string
|
||||
info->river = River::NO_RIVER;
|
||||
if(!json["river"].isNull())
|
||||
{
|
||||
VLC->identifiers()->requestIdentifier("river", json["river"], [info](int32_t identifier)
|
||||
LIBRARY->identifiers()->requestIdentifier("river", json["river"], [info](int32_t identifier)
|
||||
{
|
||||
info->river = RiverId(identifier);
|
||||
});
|
||||
@ -98,7 +98,7 @@ std::shared_ptr<TerrainType> TerrainTypeHandler::loadFromJson( const std::string
|
||||
|
||||
for(const auto & t : json["battleFields"].Vector())
|
||||
{
|
||||
VLC->identifiers()->requestIdentifier("battlefield", t, [info](int32_t identifier)
|
||||
LIBRARY->identifiers()->requestIdentifier("battlefield", t, [info](int32_t identifier)
|
||||
{
|
||||
info->battleFields.emplace_back(identifier);
|
||||
});
|
||||
@ -106,7 +106,7 @@ std::shared_ptr<TerrainType> TerrainTypeHandler::loadFromJson( const std::string
|
||||
|
||||
for(const auto & t : json["prohibitTransitions"].Vector())
|
||||
{
|
||||
VLC->identifiers()->requestIdentifier("terrain", t, [info](int32_t identifier)
|
||||
LIBRARY->identifiers()->requestIdentifier("terrain", t, [info](int32_t identifier)
|
||||
{
|
||||
info->prohibitTransitions.emplace_back(identifier);
|
||||
});
|
||||
@ -116,7 +116,7 @@ std::shared_ptr<TerrainType> TerrainTypeHandler::loadFromJson( const std::string
|
||||
|
||||
if(!json["rockTerrain"].isNull())
|
||||
{
|
||||
VLC->identifiers()->requestIdentifier("terrain", json["rockTerrain"], [info](int32_t identifier)
|
||||
LIBRARY->identifiers()->requestIdentifier("terrain", json["rockTerrain"], [info](int32_t identifier)
|
||||
{
|
||||
info->rockTerrain = TerrainId(identifier);
|
||||
});
|
||||
@ -133,7 +133,7 @@ const std::vector<std::string> & TerrainTypeHandler::getTypeNames() const
|
||||
|
||||
std::vector<JsonNode> TerrainTypeHandler::loadLegacyData()
|
||||
{
|
||||
size_t dataSize = VLC->engineSettings()->getInteger(EGameSettings::TEXTS_TERRAIN);
|
||||
size_t dataSize = LIBRARY->engineSettings()->getInteger(EGameSettings::TEXTS_TERRAIN);
|
||||
|
||||
objects.resize(dataSize);
|
||||
|
||||
@ -173,7 +173,7 @@ std::string TerrainType::getNameTextID() const
|
||||
|
||||
std::string TerrainType::getNameTranslated() const
|
||||
{
|
||||
return VLC->generaltexth->translate(getNameTextID());
|
||||
return LIBRARY->generaltexth->translate(getNameTextID());
|
||||
}
|
||||
|
||||
VCMI_LIB_NAMESPACE_END
|
||||
|
Reference in New Issue
Block a user