apply patch 3678 by Coffee, more syntax simplification

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@56274 75b3775d-3801-0410-9e12-e2e43121521d