fix some bugs
Merge branch 'master' of d:/forest-kid-gaiden
bug fixes