Breaking this off from the 0.19.1 topic.... This post is about addressing the AP "hibernation" problems. Occasionally, the AP votes will stop coming for long stretches of time. One such occurrence is when a non-AP-owner Pope switches to Free Religion after a recent Pope vote. DanF did a good job explaining this situation in a post I shall be quoting below with some spoilerized code and reference blocks. The original test saves for this posted by LegionSteve awhile ago weren't optimal; the first was a well-after-the-fact illustration and the second was pretty significantly WorldBuildered. I wanted something a little closer to true game conditions so I've attached a less-severly modified save based on the ungy-04 SG. In that game originally Wang Kon had built the AP and switched to Free Religion a few turns before teching Mass Media and obsoleting the thing. In this modification, the AP has been magically transported to Paris so when Wang goes FR he will become ineligible to be the Pope, causing CvGame::clearSecretaryGeneral() to be triggered. Additionally, the human player was given a tiny Hindu city so that we can get in on the voting and better see what's happening. With the original 3.17 logic, a pope vote is almost 40 turns away for the reasons Dan outlined above. With Dan's proposed change, the pope vote comes up after just 8 turns. And this leads us into problem #2. If the pope vote actually fails (e.g. if the only eligible candidate doesn't have enough votes on his own and everyone else abstains) we are pushed back into the same situation. In the second attached save, after our 8 turn waiting period, the pope vote has come up but Napolean doesn't have enough votes to win. (I WBed away Hinduism from all but one of his and Tokugawa's cities and abstained on our vote too.) However, the Pope timer gets reset back to 4 and so we're once again forced into a long waiting period; this one approximately 50 turns. In this case, I think we need to look at CvGame::doVoteResults(), check for a secgen/pope vote that had no winner, and reset the secgen/pope timer if necessary which should give us the standard 9-turn delay. Testing on that will happen in the next couple days. But wait, there's more! There are also other reports of AP weirdness such as the following quote from r_rolo1 in a BUG topic where this issue came up. Hopefully he'll come up with some saves so we can see what's happening there as this sounds like a somewhat different issue. And finally there's the old issue of the disappearing hammer bonus that I am trying very hard to ignore until somebody forces a save upon me.