Addec quick combat to system options window.
Compile fixes [I don't know why it has compiled for me before].


git-svn-id: http://svn.code.sf.net/p/vcmi/code/trunk/@3418 4dfc6b2a-8b31-0410-aa91-d6c70e3ac834