Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1304: Checks in the mission compiler if the do_mission objective is correct (for a guild mission) when we add a number (the number of members from the guild needed to complete the mission) after a mission name

Browse source
This commit is contained in:
Fabien_HENON 2011-07-23 18:14:31 +02:00
parent c56fb0762d
commit 6f34bec144
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
View file

@ -3153,9 +3153,12 @@ class CContentMission: public CContentObjective
} }
public: public:
CContentMission(): _Prim(0) {}
void init(CMissionData &md, IPrimitive *prim) void init(CMissionData &md, IPrimitive *prim)
{ {
_Missions = md.getPropertyArray(prim, "mission_names", true, false); _Missions = md.getPropertyArray(prim, "mission_names", true, false);
_Prim = prim;
CContentObjective::init(md, prim); CContentObjective::init(md, prim);
} }
@ -3172,6 +3175,14 @@ public:
ret += _Missions[i]; ret += _Missions[i];
if (i < _Missions.size()-1) if (i < _Missions.size()-1)
ret += "; "; ret += "; ";
// We check to see if we specified a number after the mission name. If so, we check if it's a guild mission
std::size_t pos = _Missions[i].find_first_of(" \t");
if (pos != std::string::npos && !md.isGuildMission())
{
string err = toString("primitive(%s): CContentMission: Number of members needed to complete the mission specified but the mission is not a guild mission.", _Prim->getName().c_str());
throw EParseException(_Prim, err.c_str());
}
} }
// Add the 'nb_guild_members_needed' parameter if needed // Add the 'nb_guild_members_needed' parameter if needed
//ret += CContentObjective::genNbGuildMembersNeededOption(md); //ret += CContentObjective::genNbGuildMembersNeededOption(md);
@ -3179,6 +3190,8 @@ public:
return ret; return ret;
} }
IPrimitive *_Prim;
}; };
REGISTER_STEP_CONTENT(CContentMission, "do_mission"); REGISTER_STEP_CONTENT(CContentMission, "do_mission");