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

Changed: #1304: Update of CMissionStepDoMissions to support missions done several times (by different guild members)

Browse source
This commit is contained in:
Fabien_HENON 2011-07-25 12:27:19 +02:00
parent 6f34bec144
commit 12f624a7a5
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
code/ryzom/server/src/entities_game_service/mission_manager/mission_step_misc.cpp
View file

@ -1141,7 +1141,13 @@ MISSION_REGISTER_STEP(CMissionStepCast,"cast")
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class CMissionStepDoMissions : public IMissionStepTemplate class CMissionStepDoMissions : public IMissionStepTemplate
{ {
std::vector< std::string > _Missions; struct MissionNb
{
std::string Mission;
uint32 NbNeedCompletion;
};
std::vector< MissionNb > _Missions;
virtual bool buildStep( uint32 line, const std::vector< std::string > & script, CMissionGlobalParsingData & globalData, CMissionSpecificParsingData & missionData ) virtual bool buildStep( uint32 line, const std::vector< std::string > & script, CMissionGlobalParsingData & globalData, CMissionSpecificParsingData & missionData )
{ {
@ -1158,7 +1164,13 @@ class CMissionStepDoMissions : public IMissionStepTemplate
_Missions.resize(subs.size()); _Missions.resize(subs.size());
for ( uint i = 0; i < subs.size(); i++ ) for ( uint i = 0; i < subs.size(); i++ )
{ {
_Missions[i] = CMissionParser::getNoBlankString( subs[i] ); std::vector< std::string > params;
NLMISC::splitString( subs[i]," \t", params );
_Missions[i].Mission = CMissionParser::getNoBlankString( params[0] );
if (params.size() > 1)
NLMISC::fromString(params[1], _Missions[i].NbNeedCompletion);
else
_Missions[i].NbNeedCompletion = 1;
} }
return true; return true;
} }
@ -1168,7 +1180,7 @@ class CMissionStepDoMissions : public IMissionStepTemplate
if ( event.Type == CMissionEvent::MissionDone ) if ( event.Type == CMissionEvent::MissionDone )
{ {
CMissionEventMissionDone & eventSpe = (CMissionEventMissionDone&)event; CMissionEventMissionDone & eventSpe = (CMissionEventMissionDone&)event;
TAIAlias alias = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName( _Missions[subStepIndex] ); TAIAlias alias = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName( _Missions[subStepIndex].Mission );
if ( eventSpe.Mission == alias ) if ( eventSpe.Mission == alias )
{ {
LOGMISSIONSTEPSUCCESS("mission"); LOGMISSIONSTEPSUCCESS("mission");
@ -1181,6 +1193,12 @@ class CMissionStepDoMissions : public IMissionStepTemplate
void getInitState( std::vector<uint32>& ret ) void getInitState( std::vector<uint32>& ret )
{ {
ret.resize( _Missions.size(), 1 ); ret.resize( _Missions.size(), 1 );
uint32 i = 0;
for (std::vector<MissionNb>::const_iterator it = _Missions.begin(); it != _Missions.end(); ++it)
{
ret[i] = it->NbNeedCompletion;
i++;
}
} }
virtual void getTextParams( uint & nbSubSteps,const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates) virtual void getTextParams( uint & nbSubSteps,const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)