--- a/src/Weapon.cc	Sun Dec 07 22:48:46 2008 +0000
+++ b/src/Weapon.cc	Sun Dec 07 23:10:30 2008 +0000
@@ -1,18 +1,21 @@
 #include "Weapon.hh"
 
-Weapon::Weapon(TickCount age, float velocity, float recoil, float explosionRadius, float radius, int reloadTime, std::string name) : 
-    age(age), velocity(velocity), recoil(recoil), explosionRadius(explosionRadius), radius(radius), reloadTime(reloadTime), name(name), reloadTimer(0) 
+Weapon::Weapon(WeaponID id, TickCount expire, float velocity, float recoil, float explosionRadius, float radius,
+        TimeMS reloadTime, std::string name) : 
+    id(id), expire(expire), velocity(velocity), recoil(recoil), explosionRadius(explosionRadius), radius(radius),
+    reloadTime(reloadTime), name(name), reloadTimer(0) 
 {
 
 }
 
 void Weapon::tickReload (TimeMS dt) {
     reloadTimer -= dt;
+
     if (reloadTimer < 0)
         reloadTimer = 0;
 }
 
-bool Weapon::canShoot() {
+bool Weapon::canShoot() const {
     return (reloadTimer == 0);
 }