                   height)
 
       :zakano
-      (draw-image canvas-element
-                  (get-zakano contents meta)
-                  x
-                  y
-                  width
-                  height)
+      (draw-zakano canvas-element contents meta x y width height)
 
       :wombat
-      (draw-image canvas-element
-                  (get-wombat contents meta)
-                  x
-                  y
-                  width
-                  height)
+      (draw-wombat canvas-element contents meta x y width height)
 
       :open
-      (draw-open canvas-element
-                 contents
-                 meta
-                 x
-                 y
-                 width
-                 height)
+      (draw-open canvas-element contents meta x y width height)
 
       (js/console.log "Unhandled: " cell-type))))
 

                    :n "back"
                    :w "left"
                    :e "right")]
    (str "images/wombats/wombat_" color "_" direction ".png")))

(defn- draw-open
  "Draws whatever belongs on an open cell"

  [contents meta]
  "images/poison/poison_vial.png")

(defn- draw-zakano
  [canvas-element contents meta x y width height]
  (let [{orientation :orientation} contents
        direction (case orientation
                    :s "front"
                    :n "back"
                    :w "left"
                    :e "right")]

    ;; Always draw the base zakano
    (draw-image canvas-element
                (str "images/zakano/zakano_" direction ".png")
                x
                y
                width
                height)

    ;; See if we need to add any meta to the zakano
    (doseq [{type :type} meta]
      
      (case type
        :shot
        (draw-image canvas-element
                    (str "images/zakano/zakano_" direction "_fire.png")
                    x
                    y
                    width
                    height)
        
        nil))))

(defn- draw-wombat
  [canvas-element contents meta x y width height]
  (let [{color :color
         orientation :orientation
         hp :hp} contents
