reset weapon indication when scene is reset
Merge branch 'master' of https://github.com/chooper9/cs354r-assignment4
seg fault fix