Casting water walking doesn't move the player out of the water

When casting water walking while swimming the player keeps swimming. In the original the player was moved on top of the water.

Also, when water walking the wrong sounds play for walking and jumping. Though I guess that's a part of https://bugs.openmw.org/issues/451

(RM-1138 from redmine: created on 2014-01-27 by Evil Eye, , closed on 2016-11-10 by Evil Eye, duplicates #2232 (closed), duplicates #2403 (closed), duplicates #2690 (closed))

Attachments: potential_fix.diff