Fixed: getMission returns a mission instead of NULL
--HG-- branch : develop
This commit is contained in:
parent
ec6ffe547c
commit
1a338b3462
1 changed files with 16 additions and 15 deletions
|
@ -78,26 +78,27 @@ void CAdminProperties::updateCSRJournal( CCharacter * user, CMission * mission,u
|
|||
///TODO NICO test no list
|
||||
}
|
||||
|
||||
CMission * CAdminProperties::getMission( uint indexInJournal ) const
|
||||
CMission* CAdminProperties::getMission(uint indexInJournal) const
|
||||
{
|
||||
/// todo mission
|
||||
/*
|
||||
if ( !_Data ) return NULL;
|
||||
CCharacter * user = PlayerManager.getChar( _Data->MissionUser );
|
||||
if ( !user )
|
||||
if (!_Data) return NULL;
|
||||
|
||||
CCharacter *user = PlayerManager.getChar(_Data->MissionUser);
|
||||
if (!user)
|
||||
return NULL;
|
||||
|
||||
CMission * mission = NULL;
|
||||
if ( indexInJournal < user->getMissions().size() )
|
||||
return (CMission*) user->getMissions()[indexInJournal];
|
||||
CMission *mission = NULL;
|
||||
if (indexInJournal < user->getMissions().size())
|
||||
return (CMission*)user->getMissions()[indexInJournal];
|
||||
|
||||
indexInJournal-= MaxSoloMissionCount;
|
||||
/*
|
||||
indexInJournal -= MaxSoloMissionCount;
|
||||
CTeam * team = TeamManager.getTeam( user->getTeamId() );
|
||||
if (team )
|
||||
if (team)
|
||||
{
|
||||
if ( indexInJournal < team->getMissions().size() )
|
||||
return (CMission*) team->getMissions()[indexInJournal];
|
||||
}
|
||||
|
||||
indexInJournal-= ( MaxGroupMissionCount);
|
||||
CGuild * guild = user->getGuild();
|
||||
if (guild )
|
||||
|
@ -105,6 +106,6 @@ CMission * CAdminProperties::getMission( uint indexInJournal ) const
|
|||
if ( indexInJournal < guild->getMissions().size() )
|
||||
return(CMission*) guild->getMissions()[indexInJournal];
|
||||
}
|
||||
*/
|
||||
*/
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue