fixed bug with weapon count
fixed bug with pointer after refactoring