Impaler[WrG] said:
I've looked at the Code and I see you also deactivated the localized Specialist Commerce and Yield Changes. I am again quite peved at your misplaced priorities and disregard for others. Do you seriously think backward savegame compatability is so important that it warents throwing out two major new feature? Secondly why didn't you say something 2 days ago when you made the CVS comitment or *gasp* actualy ask other people what they thought of it. I'm not going to claim my code is infalible or that it must be included but not even asking is just plain rude.
Secondly please refrain from going through and trying to neaten/butify other peoples code to your personal standards. I see you have wraped comments around code that was already perfectly well commented with mod/name/date and someone (I'm not shure if this is intentional or being done unwitingly by you texteditor) is striping off trailing whitespace from hundreds of lines. Finding a bug or vulnerability is fine but totaly non-substantive changes make for endless pages of diffs on WinMerge greatly complicating code merger
I would ask you hold up for a day long so I can get my latest mod it, I need to resolve a conflict on several files and see that the merger compiles well, I hope to have it sometime late tonight if all goes well. I would also ask that the savegame conflict be discussed and we can come to a consensus on what is more important. I think you all know ware I stand on the issue.
You mis-read source in CVS. The version in CVS has all Impaler's features intact including More form of commerce. I haven't touched features.
And I have no intension to throw away any features of Impaler's code except one: "RogerBacon's AirComatMod" (mutiple targetting per turn for air unit)
It is currently active without any switch or XML tag. It changes games behavior without players acknowlegement. So it is currently disabled until we have add switch to enable it with XML (like <MultipleTargetting>3</MultipleTargetting> ) or anything.
I haven't touched localized Specialist Commerce and Yield Changes featrues in CVS version and even in working version. Only More form of commerce is affected currently in working version (Not in CVS version)and it is temporary measure to debug. I said "I have to disable More form of Commerce features
disabled temporarily before modify them all. (working version)" It will be fully restored in finished version.
Some of your code (especailly from Rogerbacons's codes) have serious ambigulity on where the change ends. I have to see original code to know where the mod ends. I added BEGIN/END comment in such case.
And As I pointed out some of your comment hides original line.
Code:
Ex)
ORIGINAL CODE:
a = 1;
YOUR COMMENT:
// Original a = 1;
a = 2;
CHANGED:
/*// Original
a = 1;
*/
a = 2
Keeping original line intact is important for using diff. tools.
It is not my arbitray personal taste. It is universal manner of any developer who work in a team.
Your code is not your personal property once it is commited to team project. It should be public shared property.
About stripping white space : I also object to stripping trailing white space in source.
My rationale : Keep original source line as much as it was before as possible.
I am not sure that it was my fault or not. But if it turns out my fault. I will try to restore it back to original as much as possible.