Fixed some variables not being cleared
Merge branch 'master' of https://github.com/wesnoth/wesnoth-old