Quote Originally Posted by Skyline Pete
Thanks mate.

Good thing I've kept a log of what I've changed so re-modding any untouched aspects from CA will be easier than my first time through.

I'll just revert the game to vanilla and then re-mod what I need to.
Actually if you want to make your life easier, try Winmerge. http://winmerge.org/

It's a freeware open source tool that a number of devs use for code versioning and comparison. What you can do is back up all your sources and changed files, then after you patch, use that tool to compare the 1.2 original files side by side with your modded ones, then make changes as needed. Good luck!