Merging of three Super-Mods

[imporator]

Hello Community,

at the moment i'm trying to merge the Mod's of Putmalk whoward and Gedemon.
But im a bit rusty with C++ (didn't wrote a program in over 10 years).

In CvTeam.cpp and CvTeam.h the Code from whoward and Putmalk "colide" with each other.

Here is what i think what the problem is:
The functions "DoDeclareWar" and "DoMakePeace" are using different sets of Parameters.

First, i don't want to change any code without the permission of the author's.
And second, even with permission i'm not sure how to acomplish this without try and error for a couple of days


BTW
I would have send a PN to whoward and Putmalk but it seems i cannot do that anymore. (long time ago i could, not sure what changed)

greetings
imporator

 

[Putmalk]

You have my permission to change my code as you please, as long as you acknowledge I'm the original creator of that code, and that if you make changes it may not work - and I am not responsible for any issues that arise because of those code changes.

 

[whoward69]

Given that BNW is due out in a few weeks and that it's almost certainly going to impact the game core for Vanilla and G&K (if the G&K release is anything to go by), probably meaning that the mod changes will no longer work until they are ported into the new code base, I have to question the timing of this attempted merge.

On the question of permission, read the link in my sig.

 

[imporator]

You have my permission to change my code as you please, as long as you acknowledge I'm the original creator of that code, and that if you make changes it may not work - and I am not responsible for any issues that arise because of those code changes.

Given that BNW is due out in a few weeks and that it's almost certainly going to impact the game core for Vanilla and G&K (if the G&K release is anything to go by), probably meaning that the mod changes will no longer work until they are ported into the new code base, I have to question the timing of this attempted merge.

On the question of permission, read the link in my sig.

Thanks to both of you.
@whoward
Of Course you're right, BNW is not far away, but i do this for multiple reasons:

1. I want to play Civ 5 with all 3 of your Mod's (and share it with the community)
2. I'd buy'd my copy of civ 5 only a couple of days ago, and i don't want to wait for BNW (besides, as i pointed out in my first Post my C++ days are long behind me and this is training )
3. Perhaps there are some People who won't buy BNW.

And last but not least, i don't want to be a 'Creator'. The Code im working here with is your's (and Firaxis).I have to much respect of your work to put my name under it. Not even for only merging it, and a line code from me here and there.

i can't promise that i'l be finished soon because my job left me not much time, and my programing-skills are far worse than yours.

greetings
imporator

 

[whoward69]

Going on past experience (from G&K) there will be updates from Steam to Vanilla and G&K for features added in BNW - even if you don't buy BNW.

I'm fully expecting those updates (which for most people will download and install automatically) to break the current G&K DLL mods

 

[Gedemon]

Going on past experience (from G&K) there will be updates from Steam to Vanilla and G&K for features added in BNW - even if you don't buy BNW.

I'm fully expecting those updates (which for most people will download and install automatically) to break the current G&K DLL mods

This.

And while we are on the subject on merging, Putmalk, do you know (or plan to use) Git ?

 

[Putmalk]

This.

And while we are on the subject on merging, Putmalk, do you know (or plan to use) Git ?

Nay and nay. What is it useful for?

 

[Gedemon]

merging

and updating.

 

[Putmalk]

merging

and updating.

I'll check it out eventually, but keep in mind I may release one or two more updates to Civ IV Diplomacy before I stop entirely. I'm planning something else, some much bigger and more grandiose, and that is going to require time and care. Won't be able to dedicate many resources.

So I may just put my files up on Git but not be involved directly on the merging.

 

[Gedemon]

I'm fully expecting those updates (which for most people will download and install automatically) to break the current G&K DLL mods

confirmed with the patch released today, we'll have to wait for the source now.

So I may just put my files up on Git but not be involved directly on the merging.

That's the point, others do the merging.

Also, it can be useful when the game is patched: you have the main branch, your mod derived from that branch, a patch added to the main branch, and you just need to merge the patched main branch to your mod, with only the conflicts to resolve.

If you don't wan't to get involved at all but allow the code to be uploaded, I can also simply do it.

 

[Putmalk]

That's the point, others do the merging.

Also, it can be useful when the game is patched: you have the main branch, your mod derived from that branch, a patch added to the main branch, and you just need to merge the patched main branch to your mod, with only the conflicts to resolve.

If you don't wan't to get involved at all but allow the code to be uploaded, I can also simply do it.

Okay I'll check it out!