fix errors and warnings that clang reports.
Merge branch 'master' of github.com:badgerman/eressea