games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into vcmi-campaign

Browse Source 
# Conflicts:
#	lib/mapping/CCampaignHandler.cpp
This commit is contained in:
nordsoft
2023-04-19 02:45:49 +04:00
parent ecf8b9934b ff5e98e78b
commit f464ca3560
164 changed files with 1947 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CModHandler.h
View File

@ -99,10 +99,10 @@ public:
void tryRequestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback);
/// get identifier immediately. If identifier is not know and not silent call will result in error message
boost::optional<si32> getIdentifier(const std::string & scope, const std::string & type, const std::string & name, bool silent = false);
boost::optional<si32> getIdentifier(const std::string & type, const JsonNode & name, bool silent = false);
boost::optional<si32> getIdentifier(const JsonNode & name, bool silent = false);
boost::optional<si32> getIdentifier(const std::string & scope, const std::string & fullName, bool silent = false);
std::optional<si32> getIdentifier(const std::string & scope, const std::string & type, const std::string & name, bool silent = false);
std::optional<si32> getIdentifier(const std::string & type, const JsonNode & name, bool silent = false);
std::optional<si32> getIdentifier(const JsonNode & name, bool silent = false);
std::optional<si32> getIdentifier(const std::string & scope, const std::string & fullName, bool silent = false);
/// registers new object
void registerObject(const std::string & scope, const std::string & type, const std::string & name, si32 identifier);