New trunk revisions problems

Not only he didn’t but someone populated the same issue elsewhere (I was looking at diffs at sourceforge) so maybe check all files for " WIN32" pattern and modify to " _WIN32" if it’s in #ifdef/#ifndef section
EDIT: i haven’t see you just added the commit, I’ll check how it compiles…

EDIT:
CLIENT COMPILING:

...
1>CMusicHandler.cpp
1>CMT.cpp
1>CMessage.cpp
1>n:\dev\__vcmii\trunk\client\cmt.cpp(136) : error C2512: 'CVideoPlayer' : no appropriate default constructor available
1>Client.cpp
1>CHeroWindow.cpp
1>CGameInterface.cpp
...

It doesn’t compile. I don’t checked why
All but client compiles well.

EDIT
Sdlframerate.h suffers the “win32” issue

EDIT
WIN32/_WIN32 stuff isn’t reason of not compiling, I do some further when issue would be fixed

it doesn’t compile cconsolehandler.cpp

use WORD before definied

typedef WORD TColor;
was before
#include<windows.h>
but should be after

(windows.h defines WORD)

the output from MSVC yelds strange things but those the reason

EDIT: after applying attached fix it compiles properly

EDIT: added link to compiled fixed986 version of vcmi
vcmi 986 fixed build
here it is
986-fix.zip (1.22 KB)

Fixed.