I'm currently fixing as many compile errors as I can get to in the code right now, because I want to work on something.
I think some of these are from LiteralKa's description changes, however... specifically, it looks like you're using a lot of undeclared variables, strings mainly. Are you used to another language besides C/C++?
Edit: 40 minutes later, it compiles, at least...
Edit 2: I'm doing a hand-merge of a large number of changes (features and bug fixes) that I added earlier, but have vanished from the current build.
I've noticed a lot of areas where the indentation has been somewhat mauled, making it difficult to track some errors. For reference, I use three space soft tabs (the editor inserts spaces instead of tabs when I hit tab) when editing LCS code. While it's not absolutely required, matching these settings in your editor when working on LCS will help the code's readability substantially.
There are several places where assignment and equality operators are conflated.
In C++, this is an assignment:
a=b; // a takes the value of b; the value of the statement is the value of b
This is a comparison:
a==b; // a is unmodified; the value of the statement is 1 (true) if a is equal to b, else the value of the statement is 0 (false)
This is particularly dangerous if you're not careful:
if(a=b) // assignment, not comparison -- instead of testing equality,
// you're changing the value of the thing you're trying to test!
Edit 3: Merge mostly completed. I ran into some newline conflicts between my old changes and the latest version, but all cases where this conflicted with compile have been fixed. Fixed a few non-compile-error bugs (the compile errors should already be gone). Added the Stalinist Comrade Squad to the initial setup prompt, but haven't finished implementing that option. Enabling it should run the full the Stalinist Comrade Squad mod, but disabling it won't yet work fully.