Problem of merging Puppet Stats & Advanced Diplomacy Mods

[poopaa]

hello everyone
im trying to merge 2 mods
Puppet States v1.6 & Advanced Diplomacy v2.6
i do everything and merge every files but when i was testing it , find out it dosent work correctly
when i use both of these mods ,
when i conquer a city and when i click on ''Form a State in That City'' nothing happens


but when i use just puppet states mod ,

and when i conquer a city and when i click on ''Form a State in That City'' it works correctly


i thing i do something wrong with CvPlayer.cpp file but im not sure
can anyone help me with this?
im playing this game for years and its my favorite game and i thing these mods together can be realy great!
i upload the merged file to see whats really wrong
Thank U!

 

[lfgr]

Just to be sure, did you compile the changed cpp files?

 

[poopaa]

yes i did that
and you can see the changed files and compiled file (CvGameCoreDLL.dll) in attached file
the list below is the source files that i edit to merge them and im sure i do wrong to one of them that make this problem
CvDLLButtonPopup.cpp
CvDLLWidgetData.cpp
CvGameTextMgr.cpp
*CvPlayer.cpp (i think i do something wrong to this file that make this problem but im not sure about it)
CvPlayerAI.cpp
CvEnums.h
CvInfos.cpp
CvInfos.h
CvPlayerAI.h
CvTeam.cpp
CvTeam.h
CyEnumsInterface.cpp
CyInfoInterface1.cpp
CvCity.cpp
CvCity.h
CvDLLWidgetData.h
CvGameTextMgr.h
CvPlayer.h
CyPlayer.cpp
CyPlayer.h
CyTeam.cpp
CyTeam.h
CyTeamInterface.cpp

 

[poopaa]

ok
i solve the problem and i learned a very important lesson in this case
*merging is not copy and pasting