Cleanup

src/Dodge/Item/Equipment.hs

@@ -174,7 +174,7 @@ createShieldWall cr invid w = case _itEffectID $ _itEffect it of
     rad = _crRad cr + 2
     a = crpos +.+ rad *.* crdirv -.- 10 *.* therot crdirv
     b = crpos +.+ rad *.* crdirv +.+ 10 *.* therot crdirv
-    therot  | crIsAiming' cr = vNormal
+    therot  | crIsAiming cr = vNormal
             | otherwise = rotateV (twoFlatHRot cr) . vNormal
 removeShieldWall :: Creature -> Int -> World -> World
 removeShieldWall cr invid w = case _itEffectID $ _itEffect it of

src/Dodge/Item/Weapon/TriggerType.hs

@@ -66,6 +66,7 @@ import Dodge.WorldEvent
 import Dodge.RandomHelp
 import Dodge.Inventory.Lock
 import Dodge.Creature.HandPos
+import Dodge.Creature.Stance
 --import Dodge.Default
 import Dodge.Base
 import Sound.Data
@@ -395,7 +396,7 @@ muzzleOffset cr it = V3 (holdOffset + 5 + _muzPos dimPort - _handlePos dimPort)
   where
     dimPort = _dimPortage $ _itDimension it
     holdOffset
-        | crInStance OneHand cr = 10
+        | crInAimStance OneHand cr = 10
         | otherwise = 0
 
 withMuzPos :: (Point3 -> World -> World) -> ChainEffect