correction bug tir player
merge
wip player 2
merge