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

4
AI/VCAI/VCAI.cpp
View File

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

7
client/battle/CBattleAnimations.cpp
View File

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

2
config/resolutions.json
View File

@@ -16,7 +16,7 @@
"Minimap": { "width": 144, "height": 144, "x": 630, "y": 26 }, "Minimap": { "width": 144, "height": 144, "x": 630, "y": 26 },
"Overview": { "pics": 4, "size": 4, "graphic": "OvCast.pcx" }, "Overview": { "pics": 4, "size": 4, "graphic": "OvCast.pcx" },
"Statusbar": { "x": 7, "y": 556, "graphic": "AdRollvr.bmp" }, "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 }, "ButtonKingdomOv": { "x": 679, "y": 196, "graphic": "IAM002.DEF", "playerColoured": 1 },
"ButtonUnderground": { "x": 711, "y": 196, "graphic": "IAM010.DEF", "playerColoured": 1, "additionalDefs": [ "IAM003.DEF" ] }, "ButtonUnderground": { "x": 711, "y": 196, "graphic": "IAM010.DEF", "playerColoured": 1, "additionalDefs": [ "IAM003.DEF" ] },
"ButtonQuestLog": { "x": 679, "y": 228, "graphic": "IAM004.DEF", "playerColoured": 1 }, "ButtonQuestLog": { "x": 679, "y": 228, "graphic": "IAM004.DEF", "playerColoured": 1 },

8
lib/CModHandler.cpp
View File

@@ -130,8 +130,11 @@ bool CIdentifierStorage::resolveIdentifier(const ObjectCallback & request)
} }
else else
{ {
// //...unless destination mod was specified explicitly //...unless destination mod was specified explicitly
allowedScopes.insert(request.remoteScope); 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; std::string fullID = request.type + '.' + request.name;
@@ -159,6 +162,7 @@ bool CIdentifierStorage::resolveIdentifier(const ObjectCallback & request)
request.callback(entries.first->second.id); request.callback(entries.first->second.id);
return true; return true;
} }
logGlobal->errorStream() << "Unknown identifier " << request.type << "." << request.name << " from mod " << request.localScope;
return false; return false;
} }