* refactoring, a few intriguing problems remain

git-svn-id: https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk@3200 4dfc6b2a-8b31-0410-aa91-d6c70e3ac834