equal
deleted
inserted
replaced
1 #include "Weapon.hh" |
1 #include "Weapon.hh" |
2 |
2 |
3 Weapon::Weapon(WeaponID id, TickCount expire, float velocity, float recoil, float explosionRadius, float radius, |
3 Weapon::Weapon(WeaponID id, TickCount expire, float velocity, float recoil, float explosionRadius, float radius, |
4 TimeMS reloadTime, std::string name) : |
4 TimeMS reloadTime, std::string name, float bounce) : |
5 id(id), expire(expire), velocity(velocity), recoil(recoil), explosionRadius(explosionRadius), radius(radius), |
5 id(id), expire(expire), velocity(velocity), recoil(recoil), explosionRadius(explosionRadius), radius(radius), |
6 reloadTime(reloadTime), name(name), reloadTimer(0) |
6 reloadTime(reloadTime), name(name), reloadTimer(0), bounce(bounce) |
7 { |
7 { |
8 |
8 |
9 } |
9 } |
10 |
10 |
11 void Weapon::tickReload (TimeMS dt) { |
11 void Weapon::tickReload (TimeMS dt) { |