More merging of codepaths for recalls.

There were some discrepancies regarding screen invalidation, but the merged version
appears to work for all cases.


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