EmperorFool
Deity
Just to clarify, I believe that phungus420 is asking you to comment each related change differently. For example, say you add two traits Populous (+2 pop when founding a city) and Warlike (+1 per rival you are at war with) by putting fields in CvPlayer:
This way if someone wants to merge the Warlike trait into their mod, they can easily spot all the changes that belong to it. Yes, it is a little extra burden when writing your code, but by using copy/paste and getting into the habit, it's really not much work. And if your intention is for others to use your code, it will greatly increase the likelihood that they do it and the amount that it will help. It will also minimize the questions you receive about how to merge your changes.
Everybody wins!
Similarly, in XML you'd use
I put the start/end part at the end of the comment for three reasons. First, it makes it easier for me to copy/paste/edit the end comment. Second, it makes the comments line up better. And third, it makes spotting the start/end part easier.
Code:
int m_iPopRushHurryCount;
int m_iInflationModifier;
// JDHalfrack - Populous - start
int m_iExtraFoundingPopulation;
// JDHalfrack - Populous - end
// JDHalfrack - Warlike - start
int m_iWarHappiness;
// JDHalfrack - Warlike - end
This way if someone wants to merge the Warlike trait into their mod, they can easily spot all the changes that belong to it. Yes, it is a little extra burden when writing your code, but by using copy/paste and getting into the habit, it's really not much work. And if your intention is for others to use your code, it will greatly increase the likelihood that they do it and the amount that it will help. It will also minimize the questions you receive about how to merge your changes.
Everybody wins!
Similarly, in XML you'd use
Code:
<!-- JDHalfrack - Warlike - start -->
...
<!-- JDHalfrack - Warlike - end -->
I put the start/end part at the end of the comment for three reasons. First, it makes it easier for me to copy/paste/edit the end comment. Second, it makes the comments line up better. And third, it makes spotting the start/end part easier.