Cleanup

src/Dodge/Creature/Inanimate.hs

@@ -10,16 +10,11 @@ module Dodge.Creature.Inanimate
 import Dodge.Data
 import Dodge.Creature.Lamp
 import Dodge.WorldEvent.Explosion
-import Dodge.Creature.Picture
 import Dodge.Spark
 import Dodge.Default
 import Dodge.Creature.State
-import Picture
 import qualified IntMapHelp as IM
 import Geometry
---import Geometry.Data
---import Geometry.Vector3D
-import Shape
 import Dodge.SoundLogic
 import LensHelp
 
@@ -30,11 +25,7 @@ barrel :: Creature
 barrel = defaultInanimate
     { _crUpdate = updateBarrel
     , _crHP = 500
-    , _crType = DrawnCreature $ picAtCrPos $ setDepth 20 $ pictures 
-        [ color orange $ circleSolid 10
-        , setDepth 0.049 . color (greyN 0.5) $ circleSolid 8
-        , color (greyN 0.5) $ circleSolid 8
-        ]
+    , _crType = Barreloid
     , _crState = defaultState 
         {_csSpState = Barrel []
         }
@@ -45,10 +36,7 @@ explosiveBarrel :: Creature
 explosiveBarrel = defaultInanimate
     { _crUpdate = updateExpBarrel
     , _crHP = 400
-    , _crType = DrawnCreature $ shapeAtCrPos
-        . colorSH orange
-        . upperPrismPoly 20
-        $ polyCirc 4 10
+    , _crType = Barreloid
     , _crState = defaultState 
         {_csSpState = Barrel []
         }