Merge an [if] into a [while] conditional so we don't loop more often than is useful.


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