Archid
Warlord
Looking further into this the code that allows vote pledge trading has been commented out in the CvPlayer::canTradeItem method so doing what I suggested above won't actually enable anything as the call to see if they can be traded will always return false as that is the default.
I'll remove the commented out code and see if it breaks anything...but that will need to wait until tomorrow now.
Code:
case TRADE_SECRETARY_GENERAL_VOTE:
/*
if (GC.getGameINLINE().isOption(GAMEOPTION_ADVANCED_DIPLOMACY))
{
if (!(GET_TEAM(getTeam()).isHuman()))
{
if (GC.getGameINLINE().isDiploVote((VoteSourceTypes)item.m_iData))
{
if (GC.getGameINLINE().isTeamVoteEligible(GET_PLAYER(eWhoTo).getTeam(), ((VoteSourceTypes)item.m_iData)))
{
if (isVotingMember((VoteSourceTypes)item.m_iData) && (getPledgedSecretaryGeneralVote() == NO_TEAM))
{
return true;
}
}
}
}
} */
break;
case TRADE_PLEDGE_VOTE:
/* if (GC.getGameINLINE().isOption(GAMEOPTION_ADVANCED_DIPLOMACY))
{
iVoteID = GC.getGameINLINE().getCurrentVoteID();
if (iVoteID > 0)
{
VoteTriggeredData* pVoteTriggered = GC.getGameINLINE().getVoteTriggered(iVoteID);
if (pVoteTriggered != NULL)
{
if (GC.getGameINLINE().getSecretaryGeneral(pVoteTriggered->eVoteSource) != getTeam())
{
CvVoteInfo& kVote = GC.getVoteInfo(pVoteTriggered->kVoteOption.eVote);
if (!GC.getGameINLINE().isTeamVote(pVoteTriggered->kVoteOption.eVote))
{
if (isVotingMember(pVoteTriggered->eVoteSource) && GET_PLAYER(eWhoTo).isVotingMember(pVoteTriggered->eVoteSource))
{
if (getPledgedVote() == NO_PLAYER_VOTE)
{
return true;
}
}
}
}
}
}
} */
break;
I'll remove the commented out code and see if it breaks anything...but that will need to wait until tomorrow now.