Fix aiming with no weapon crash

src/Dodge/Particle/Bullet/HitEffect.hs

@@ -52,8 +52,8 @@ bulBounceArmCr' bt p cr w
     reflectVel = magV bulVel *.* newDir
     addBouncer = instantParticles .:~ bouncer
     bouncer = (aGenBulAt Nothing pOut reflectVel (_btDrag bt)
-                                      (_btHitEffect' bt) (_btWidth' bt)
-              ) {_btTimer' = _btTimer' bt - 1}
+                                      (_ptHitEff bt) (_ptWidth bt)
+              ) {_ptTimer = _ptTimer bt - 1}
 {- | Bullet pass through creatures.  -}
 bulPenCr' :: Particle -> Point2 -> Creature -> World -> World
 bulPenCr' bt p cr w = w
@@ -71,8 +71,8 @@ bulPenCr' bt p cr w = w
     sp = head $ _ptTrail bt
     ep = sp +.+ _ptVel bt
     piercer = (aGenBulAt (Just cid) p (_ptVel bt) (_btDrag bt)
-                                      (_btHitEffect' bt) (_btWidth' bt)
-              ) {_btTimer' = _btTimer' bt - 1}
+                                      (_ptHitEff bt) (_ptWidth bt)
+              ) {_ptTimer = _ptTimer bt - 1}
 {- | Heavy bullet effects when hitting creature:
 piercing, blunt, twisting and pushback damage all applied.  -}
 hvBulHitCr :: Particle -> Point2 -> Creature -> World -> World
@@ -92,7 +92,7 @@ hvBulHitCr bt p cr w = w
 {- | Create a flamelet when hitting a creature.  -}
 bulIncCr :: Particle -> Point2 -> Creature -> World -> World
 bulIncCr bt p cr w = w
-    & makeFlameletTimed p 20 v Nothing 3 20
+    & makeFlamelet p 20 v Nothing 3 20
     & bulletHitSound p
     & creatures . ix cid . crState . crDamage .:~ Piercing 60 sp p ep
   where   
@@ -123,8 +123,8 @@ bulBounceWall bt p wl = damageWall (Blunt 50 sp p ep) wl
     ep = sp +.+ _ptVel bt
     sp = head $ _ptTrail bt
     pOut = p +.+ squashNormalizeV (sp -.- p)
-    bouncer = (aGenBulAt Nothing pOut reflectVel (_btDrag bt) (_btHitEffect' bt) (_btWidth' bt)
-              ) {_btTimer' = _btTimer' bt - 1}
+    bouncer = (aGenBulAt Nothing pOut reflectVel (_btDrag bt) (_ptHitEff bt) (_ptWidth bt)
+              ) {_ptTimer = _ptTimer bt - 1}
     reflectVel = reflVelWall wl (_ptVel bt)
 -- the hack is to get around the fact that the particles list gets reset after
 -- all projectiles in it are checked, so we cannot add to it as we accumulate over
@@ -138,7 +138,7 @@ bulIncWall
     -> World 
     -> World
 bulIncWall bt p wl = damageWall (Blunt 50 sp p ep) wl 
-    . makeFlameletTimed pOut 20 reflectVel Nothing 3 20
+    . makeFlamelet pOut 20 reflectVel Nothing 3 20
   where   
     ep = sp +.+ _ptVel bt
     sp = head $ _ptTrail bt