Simplify how some variables receive their values, and remove some unused and redundant variables.


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