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

- removed access to one wog file

Browse Source 
- removed way to avoid dependency checking in identifiers resolution
- minor fixes
This commit is contained in:
Ivan Savenko
2013-05-21 22:11:44 +00:00
parent 56534bc3fb
commit dca8e9fa6f
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CModHandler.cpp
View File

@@ -130,8 +130,11 @@ bool CIdentifierStorage::resolveIdentifier(const ObjectCallback & request)
}
else
{
// //...unless destination mod was specified explicitly
allowedScopes.insert(request.remoteScope);
//...unless destination mod was specified explicitly
auto myDeps = VLC->modh->getModData(request.localScope).dependencies;
if (request.remoteScope == "core" || // allow only available to all core mod
myDeps.count(request.remoteScope)) // or dependencies
allowedScopes.insert(request.remoteScope);
}
std::string fullID = request.type + '.' + request.name;
@@ -159,6 +162,7 @@ bool CIdentifierStorage::resolveIdentifier(const ObjectCallback & request)
request.callback(entries.first->second.id);
return true;
}
logGlobal->errorStream() << "Unknown identifier " << request.type << "." << request.name << " from mod " << request.localScope;
return false;
}