- removed access to one wog file

- removed way to avoid dependency checking in identifiers resolution
- minor fixes

AI/VCAI/VCAI.cpp

@@ -411,8 +411,8 @@ bool compareDanger(const CGObjectInstance *lhs, const CGObjectInstance *rhs)
 VCAI::VCAI(void)
 {
 	LOG_TRACE(logAi);
-	myCb = NULL;
-	makingTurn = NULL;
+	myCb = nullptr;
+	makingTurn = nullptr;
 }
 
 VCAI::~VCAI(void)

client/battle/CBattleAnimations.cpp

@@ -604,8 +604,6 @@ CReverseAnimation::CReverseAnimation(CBattleInterface * _owner, const CStack * s
 
 bool CReverseAnimation::init()
 {
-	logGlobal->errorStream() << "Pos at " << myAnim()->pos.x << "x" << myAnim()->pos.y;
-
 	if(myAnim() == NULL || myAnim()->getType() == CCreatureAnim::DEATH)
 	{
 		endAnim();
@@ -651,8 +649,6 @@ void CReverseAnimation::nextFrame()
 
 void CReverseAnimation::endAnim()
 {
-	logGlobal->errorStream() << "Pos on end " << myAnim()->pos.x << "x" << myAnim()->pos.y;
-
 	CBattleAnimation::endAnim();
 	if( stack->alive() )//don't do that if stack is dead
 		myAnim()->setType(CCreatureAnim::HOLDING);
@@ -662,7 +658,6 @@ void CReverseAnimation::endAnim()
 
 void CReverseAnimation::setupSecondPart()
 {
-	logGlobal->errorStream() << "Pos before 2nd " << myAnim()->pos.x << "x" << myAnim()->pos.y;
 	if(!stack)
 	{
 		endAnim();
@@ -687,8 +682,6 @@ void CReverseAnimation::setupSecondPart()
 		}
 	}
 
-	logGlobal->errorStream() << "Pos after 2nd " << myAnim()->pos.x << "x" << myAnim()->pos.y;
-
 	secondPartSetup = true;
 
 	if(myAnim()->framesInGroup(CCreatureAnim::TURN_R))

config/resolutions.json

@@ -16,7 +16,7 @@
 				"Minimap": { "width": 144, "height": 144, "x": 630, "y": 26 },
 				"Overview": { "pics": 4, "size": 4, "graphic": "OvCast.pcx" },
 				"Statusbar": { "x": 7, "y": 556, "graphic": "AdRollvr.bmp" },
-				"ResDataBar": { "x": 3, "y": 575, "graphic": "ZRESBAR.bmp", "offsetX": 32, "offsetY": 2, "resSpace": 85, "resDateSpace": 85 },
+				"ResDataBar": { "x": 3, "y": 575, "graphic": "ARESBAR.bmp", "offsetX": 32, "offsetY": 2, "resSpace": 85, "resDateSpace": 85 },
 				"ButtonKingdomOv": { "x": 679, "y": 196, "graphic": "IAM002.DEF", "playerColoured": 1 },
 				"ButtonUnderground": { "x": 711, "y": 196, "graphic": "IAM010.DEF", "playerColoured": 1, "additionalDefs": [ "IAM003.DEF" ] },
 				"ButtonQuestLog": { "x": 679, "y": 228, "graphic": "IAM004.DEF", "playerColoured": 1 },

lib/CModHandler.cpp

@@ -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;
 }