SDK Source Code Update for 1.0.2.21 - 19th Dec 2012

[whoward69]

The long awaited SDK source code update for 1.0.2.21 seems to have arrived - despite the fact that Steam kept telling me that the SDK was 100% up-to-date - so you may want to manually check the dates on the files on your system!

The following files have changed (or been added)

CvGameCoreDLL\AI_Defines.h	0.00 KB
CvGameCoreDLL\CvAStar.cpp	96.00 KB
CvGameCoreDLL\CvCity.cpp	371.00 KB
CvGameCoreDLL\CvColor.h	0.00 KB
CvGameCoreDLL\CvDLLEventReporterIFaceBase.h	0.00 KB
CvGameCoreDLL\CvDLLInterfaceIFaceBase.h	0.00 KB
CvGameCoreDLL\CvDllPreGame.cpp	40.00 KB
CvGameCoreDLL\CvDLLScriptSystemIFaceBase.h	0.00 KB
CvGameCoreDLL\CvDLLUtilityIFaceBase.h	0.00 KB
CvGameCoreDLL\CvDLLXmlLoadUtil.h	0.00 KB
CvGameCoreDLL\CvEconomicAI.cpp	107.00 KB
CvGameCoreDLL\CvGame.cpp	279.00 KB
CvGameCoreDLL\CvGameCoreDLLDefines.h	0.00 KB
CvGameCoreDLL\CvHomelandAI.cpp	119.00 KB
CvGameCoreDLL\CvMinorCivAI.cpp	157.00 KB
CvGameCoreDLL\CvPlayer.cpp	585.00 KB
CvGameCoreDLL\CvPlot.cpp	267.00 KB
CvGameCoreDLL\CvPlot.h	27.00 KB
CvGameCoreDLL\CvPopupInfo.cpp	0.00 KB
CvGameCoreDLL\CvPopupInfo.h	0.00 KB
CvGameCoreDLL\CvSelectedUnitGroup.cpp	0.00 KB
CvGameCoreDLL\CvSelectedUnitGroup.h	0.00 KB
CvGameCoreDLL\CvTalkingHeadMessage.cpp	0.00 KB
CvGameCoreDLL\CvTalkingHeadMessage.h	0.00 KB
CvGameCoreDLL\CvTraitClasses.cpp	56.00 KB
CvGameCoreDLL\CvUnit.cpp	449.00 KB
CvGameCoreDLL\CvUnit.h	45.00 KB
CvGameCoreDLL\CvUnitCombat.cpp	121.00 KB
CvGameCoreDLL\CvXMLLoadUtility.cpp	0.00 KB
CvGameCoreDLL\CvXMLLoadUtility.h	0.00 KB
CvGameCoreDLL\Lua\CvLuaArgTemplates.h	0.00 KB
CvGameCoreDLL\Lua\CvLuaMethodWrapper.h	0.00 KB
CvGameCoreDLL\Lua\CvLuaPlayer.cpp	192.00 KB
CvGameCoreDLL\Lua\CvLuaStaticInstance.h	0.00 KB
CvGameCoreDLL\Lua\CvLuaUnit.cpp	124.00 KB
CvGameCoreDLL_Expansion\CvAIOperation.cpp	161.00 KB
CvGameCoreDLL_Expansion\CvAStar.cpp	102.00 KB
CvGameCoreDLL_Expansion\CvAStar.h	17.00 KB
CvGameCoreDLL_Expansion\CvCity.cpp	415.00 KB
CvGameCoreDLL_Expansion\CvCityStrategyAI.cpp	94.00 KB
CvGameCoreDLL_Expansion\CvDiplomacyAI.cpp	929.00 KB
CvGameCoreDLL_Expansion\CvDLLInterfaceIFaceBase.h	0.00 KB
CvGameCoreDLL_Expansion\CvDllPreGame.cpp	40.00 KB
CvGameCoreDLL_Expansion\CvDllScriptSystem.cpp	0.00 KB
CvGameCoreDLL_Expansion\CvDllScriptSystem.h	0.00 KB
CvGameCoreDLL_Expansion\CvEconomicAI.cpp	116.00 KB
CvGameCoreDLL_Expansion\CvGame.cpp	305.00 KB
CvGameCoreDLL_Expansion\CvGameCoreDLLDefines.h	0.00 KB
CvGameCoreDLL_Expansion\CvGrandStrategyAI.cpp	41.00 KB
CvGameCoreDLL_Expansion\CvHomelandAI.cpp	137.00 KB
CvGameCoreDLL_Expansion\CvMinorCivAI.cpp	310.00 KB
CvGameCoreDLL_Expansion\CvNotifications.cpp	40.00 KB
CvGameCoreDLL_Expansion\CvPlayer.cpp	657.00 KB
CvGameCoreDLL_Expansion\CvPlot.cpp	269.00 KB
CvGameCoreDLL_Expansion\CvPlot.h	28.00 KB
CvGameCoreDLL_Expansion\CvSTLContainers.h	0.00 KB
CvGameCoreDLL_Expansion\CvTacticalAI.cpp	322.00 KB
CvGameCoreDLL_Expansion\CvTraitClasses.cpp	82.00 KB
CvGameCoreDLL_Expansion\CvUnit.cpp	497.00 KB
CvGameCoreDLL_Expansion\CvUnit.h	48.00 KB
CvGameCoreDLL_Expansion\CvWonderProductionAI.cpp	18.00 KB
CvGameCoreDLL_Expansion\CvXMLLoadUtility.h	0.00 KB
CvGameCoreDLL_Expansion\Lua\CvLuaArgTemplates.h	0.00 KB
CvGameCoreDLL_Expansion\Lua\CvLuaMethodWrapper.h	0.00 KB
CvGameCoreDLL_Expansion\Lua\CvLuaPlayer.cpp	273.00 KB
CvGameCoreDLL_Expansion\Lua\CvLuaStaticInstance.h	0.00 KB
CvGameCoreDLL_Expansion\Lua\CvLuaUnit.cpp	130.00 KB

Strange that all the new ones are 0Kb in size

 

[Lord Yanaek]

Even though i can't work on the C++ source by myself, the idea of finally being able to use your modular dll was enough to get me eager to see this update.

They sure released it stealthly

0kb files will be very useful, maybe it's steam taking revenge on you for removing your mods from the workshop
(i have those 0kb files as well)

 

[whoward69]

I wouldn't jump for joy too much just yet

========== Build: 0 succeeded, 2 failed, 0 up-to-date, 0 skipped ==========

and a shed load of

1>  CvLuaCity.cpp
1>lua\CvLuaScopedInstance.h(15): error C2143: syntax error : missing ',' before '<'
1>          lua\CvLuaScopedInstance.h(30) : see reference to class template instantiation 'CvLuaScopedInstance<Derived,InstanceType>' being compiled
1>lua\CvLuaScopedInstance.h(15): error C2504: 'CvLuaMethodWrapper' : base class undefined
1>          lua\CvLuaArea.h(16) : see reference to class template instantiation 'CvLuaScopedInstance<Derived,InstanceType>' being compiled
1>          with
1>          [
1>              Derived=CvLuaArea,
1>              InstanceType=CvArea
1>          ]
1>lua\CvLuaScopedInstance.h(15): error C2143: syntax error : missing ',' before '<'
1>lua\CvLuaScopedInstance.h(18): fatal error C1903: unable to recover from previous error(s); stopping compilation

And this is just trying to compile the code as shipped ... no mods

Yet another quality and timely delivery from Firaxis

They truely are a bunch of "Bridget Jones' favourite term for abusing men"

 

[Drawmeus]

This sounds... fun.

How safe is it to ignore it and proceed as I've been going for the time being? I am THOROUGHLY documenting my code changes (both in a separate file list of changes and with a // STRABO before every set of changes) so merging later will be onerous but not impossible.

 

[whoward69]

How safe is it to ignore it

Suicidal. And that's painful experienced gained from many years of having to do these kind of merges. You ignore doing it, or putting off doing it, at your own peril.

 

[whoward69]

Six of the 0Kb files are definately causing problems, which makes me very nervous about the others

To get the updated code to compile

1) Do the .rc and .vcproj etc edits as per the original "How to compile the DLL" notes

2) In Solution Explorer, for both projects, remove the following files (take the Delete option), then "Add Existing File" selecting the same file from the GameCoreDLLUtil/include sub-directory
- Lua\CvLuaArgTemplates.h
- Lua\CvLuaMethodWrapper.h
- Lua\CvLuaStaticInstance.h

3) Take Build -> Clean Solution
4) Then Build -> Build Solution (or just press F7)

And with luck you should get
========== Build: 2 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========

If not, check that three 0Kb .h files really have been deleted from each of the Lua sub-directories. If not delete them manually and re-clean, re-build

 

[whoward69]

How safe is it to ignore it

More info for you. The number at the end is the number of changed sections of code within the file as reported by BeyondCompare - these could be a single addition to an if statement to a large code block change to a complete rewrite of a method (the path finding code) to fixing a bug in the way a class is serialised/deserialised to/from a saved game (yes, they broke saved games last time round - fortunately it wasn't major!)

CvGameCoreDLL_Expansion\CvAIOperation.cpp	2
[COLOR="red"]CvGameCoreDLL_Expansion\CvAStar.cpp	21[/COLOR]
CvGameCoreDLL_Expansion\CvAStar.h	1
CvGameCoreDLL_Expansion\CvCity.cpp	6
CvGameCoreDLL_Expansion\CvCityStrategyAI.cpp	1
[COLOR="red"]CvGameCoreDLL_Expansion\CvDiplomacyAI.cpp	27[/COLOR]
CvGameCoreDLL_Expansion\CvDllPreGame.cpp	1
CvGameCoreDLL_Expansion\CvEconomicAI.cpp	5
CvGameCoreDLL_Expansion\CvGame.cpp	6
CvGameCoreDLL_Expansion\CvGrandStrategyAI.cpp	1
CvGameCoreDLL_Expansion\CvHomelandAI.cpp	6
CvGameCoreDLL_Expansion\CvMinorCivAI.cpp	6
CvGameCoreDLL_Expansion\CvNotifications.cpp	2
[COLOR="red"]CvGameCoreDLL_Expansion\CvPlayer.cpp	23[/COLOR]
CvGameCoreDLL_Expansion\CvPlot.cpp	9
CvGameCoreDLL_Expansion\CvPlot.h	3
CvGameCoreDLL_Expansion\CvTacticalAI.cpp	3
CvGameCoreDLL_Expansion\CvTraitClasses.cpp	2
[COLOR="Red"]CvGameCoreDLL_Expansion\CvUnit.cpp	31[/COLOR]
CvGameCoreDLL_Expansion\CvUnit.h	1
CvGameCoreDLL_Expansion\CvWonderProductionAI.cpp	3
CvGameCoreDLL_Expansion\Lua\CvLuaPlayer.cpp	3
CvGameCoreDLL_Expansion\Lua\CvLuaUnit.cpp	1

 

[Drawmeus]

Interesting. Considering that serialization will be one of my next priorities (I've written a new class and I'm getting it working bit by bit, not being much of an engineer - it works! I can instantiate it in game and see it doing the bits that I have hooked up already!), I guess now's a good time!

EDIT: Ah jeez. Post-merge I have 89 errors. This will be fun.

EDIT2: Between whoward's tips and identifying a merge that I hadn't saved, that cut down to like 3 remaining issues which weren't hard to resolve. I'm good!