Problem merging mods

[Admiral Armada]

IM trying to merge 2 mods for use in my own games (merged mods 0.08 and super spies). So i downloaded the source code for both and the original sdk, replaced all the files in the sdk with the source from merged mods, then merged in the pieces from super spies that were commented as being modified and tried to compile it.
It starts out fine, going through 24 files without a problem, but when it gets to cvplayer.cpp, it pops up with a bunch of errors about local functions being illegal. So i opened up cvplayer.h and all of the functions (or most of them as far as i checked) are declared as dllexport types. I was wondering if anyone had any ideas on how to resolve this. I have tried re-merging super spies changes into a fresh copy, but to no avail.

Here is the build messages from codeblocks

Spoiler :

------------- Build: Final Release Win32 in CvGameCoreDLL ---------------

CvArea.cpp
CvArtFileMgr.cpp
CvCity.cpp
CvCityAI.cpp
CvDLLButtonPopup.cpp
CvDLLEntity.cpp
CvDLLPython.cpp
CvDLLWidgetData.cpp
CvDeal.cpp
CvDiploParameters.cpp
CvFractal.cpp
CvGame.cpp
CvGameAI.cpp
CvGameCoreDLL.cpp
CvGameCoreUtils.cpp
CvGameTextMgr.cpp
CvGlobals.cpp
CvHallOfFameInfo.cpp
CvInfoWater.cpp
CvInfos.cpp
CvInitCore.cpp
CvMap.cpp
CvMapGenerator.cpp
CvPlayer.cpp
CvPlayer.cpp(13247) : error C2181: illegal else without matching if
CvPlayer.cpp(13357) : error C2601: 'CvPlayer::getEspionageMissionCostModifier' : local function definitions are illegal
CvPlayer.cpp(13472) : error C2601: 'CvPlayer::doEspionageMission' : local function definitions are illegal
CvPlayer.cpp(13976) : error C2601: 'CvPlayer::getEspionageSpendingWeightAgainstTeam' : local function definitions are illegal
CvPlayer.cpp(13983) : error C2601: 'CvPlayer::setEspionageSpendingWeightAgainstTeam' : local function definitions are illegal
CvPlayer.cpp(13999) : error C2601: 'CvPlayer::changeEspionageSpendingWeightAgainstTeam' : local function definitions are illegal
CvPlayer.cpp(14007) : error C2601: 'CvPlayer::doAdvancedStartAction' : local function definitions are illegal
CvPlayer.cpp(14548) : error C2601: 'CvPlayer::getAdvancedStartUnitCost' : local function definitions are illegal
CvPlayer.cpp(14721) : error C2601: 'CvPlayer::getAdvancedStartCityCost' : local function definitions are illegal
CvPlayer.cpp(14823) : error C2601: 'CvPlayer::getAdvancedStartPopCost' : local function definitions are illegal
CvPlayer.cpp(14874) : error C2601: 'CvPlayer::getAdvancedStartCultureCost' : local function definitions are illegal
CvPlayer.cpp(14924) : error C2601: 'CvPlayer::getAdvancedStartBuildingCost' : local function definitions are illegal
CvPlayer.cpp(15040) : error C2601: 'CvPlayer::getAdvancedStartRouteCost' : local function definitions are illegal
CvPlayer.cpp(15148) : error C2601: 'CvPlayer::getAdvancedStartImprovementCost' : local function definitions are illegal
CvPlayer.cpp(15278) : error C2601: 'CvPlayer::getAdvancedStartTechCost' : local function definitions are illegal
CvPlayer.cpp(15421) : error C2601: 'CvPlayer::getAdvancedStartVisibilityCost' : local function definitions are illegal
CvPlayer.cpp(15491) : error C2601: 'CvPlayer::doWarnings' : local function definitions are illegal
CvPlayer.cpp(15548) : error C2601: 'CvPlayer::verifyGoldCommercePercent' : local function definitions are illegal
CvPlayer.cpp(15562) : error C2601: 'CvPlayer:rocessCivics' : local function definitions are illegal
CvPlayer.cpp(15658) : error C2601: 'CvPlayer::showMissedMessages' : local function definitions are illegal
CvPlayer.cpp(15673) : error C2601: 'CvPlayer::isPbemNewTurn' : local function definitions are illegal
CvPlayer.cpp(15678) : error C2601: 'CvPlayer::setPbemNewTurn' : local function definitions are illegal
CvPlayer.cpp(15689) : error C2601: 'CvPlayer::read' : local function definitions are illegal
CvPlayer.cpp(16160) : error C2601: 'CvPlayer::write' : local function definitions are illegal
CvPlayer.cpp(16579) : error C2601: 'CvPlayer::createGreatPeople' : local function definitions are illegal
CvPlayer.cpp(16663) : error C2601: 'CvPlayer::getEventOccured' : local function definitions are illegal
CvPlayer.cpp(16677) : error C2601: 'CvPlayer::isTriggerFired' : local function definitions are illegal
CvPlayer.cpp(16682) : error C2601: 'CvPlayer::resetEventOccured' : local function definitions are illegal
CvPlayer.cpp(16695) : error C2601: 'CvPlayer::setEventOccured' : local function definitions are illegal
CvPlayer.cpp(16735) : error C2601: 'CvPlayer::getEventCountdown' : local function definitions are illegal
CvPlayer.cpp(16749) : error C2601: 'CvPlayer::setEventCountdown' : local function definitions are illegal
CvPlayer.cpp(16756) : error C2601: 'CvPlayer::resetEventCountdown' : local function definitions are illegal
CvPlayer.cpp(16769) : error C2601: 'CvPlayer::resetTriggerFired' : local function definitions are illegal
CvPlayer.cpp(16779) : error C2601: 'CvPlayer::setTriggerFired' : local function definitions are illegal
CvPlayer.cpp(16879) : error C2601: 'CvPlayer::initTriggeredData' : local function definitions are illegal
CvPlayer.cpp(17393) : error C2601: 'CvPlayer::canDoEvent' : local function definitions are illegal
CvPlayer.cpp(17715) : error C2601: 'CvPlayer::applyEvent' : local function definitions are illegal
CvPlayer.cpp(18455) : error C2601: 'CvPlayer::isValidEventTech' : local function definitions are illegal
CvPlayer.cpp(18488) : error C2601: 'CvPlayer::getBestEventTech' : local function definitions are illegal
CvPlayer.cpp(18552) : error C2601: 'CvPlayer::getEventCost' : local function definitions are illegal
CvPlayer.cpp(18576) : error C2601: 'CvPlayer::doEvents' : local function definitions are illegal
CvPlayer.cpp(18698) : error C2601: 'CvPlayer::expireEvent' : local function definitions are illegal
CvPlayer.cpp(18726) : error C2601: 'CvPlayer::checkExpireEvent' : local function definitions are illegal
CvPlayer.cpp(18825) : error C2601: 'CvPlayer::trigger' : local function definitions are illegal
CvPlayer.cpp(18830) : error C2601: 'CvPlayer::trigger' : local function definitions are illegal
CvPlayer.cpp(18847) : error C2601: 'CvPlayer::canTrigger' : local function definitions are illegal
CvPlayer.cpp(18948) : error C2601: 'CvPlayer:ickTriggerCity' : local function definitions are illegal
CvPlayer.cpp(18979) : error C2601: 'CvPlayer:ickTriggerUnit' : local function definitions are illegal
CvPlayer.cpp(19010) : error C2601: 'CvPlayer::getEventTriggerWeight' : local function definitions are illegal
CvPlayer.cpp(19207) : error C2601: 'CvPlayer::getSplitEmpirePlayer' : local function definitions are illegal
Process terminated with status 2 (3 minutes, 53 seconds)
50 errors, 0 warnings

 

[Ninja2]

It does look like you made a mistake during the merge of CvPlayer.cpp. Could it be that you missed an 'if' somewhere before the else in line 13247 of the merged file, and that mistake cascades through the rest of the code? I'v never used or seen the Super Spies mod or code, so I don't know for sure.