Add installedObject to block

Along with the associated block.objectCapacity for container objects.
windmillium · Dec 31, 2011 · 58dc2bc · 58dc2bc
1 parent 52340a9
commit 58dc2bc
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/scala/Block.scala b/src/main/scala/Block.scala
@@ -24,6 +24,7 @@ extends Attackable
   var plant: Plant = _
   var mobiles = new ListBuffer[Mobile]
   var selected = false
+  var installedObject:Object = _
   var objects = new ListBuffer[Object]
   import scala.collection.mutable.Set
 
@@ -67,6 +68,14 @@ extends Attackable
 
 
     tclasses
+
+  }
+
+  def objectCapacity = {
+    installedObject match {
+      case null => 0
+      case _ => installedObject.capacity
+    }
   }
 
   def cost:Int = 1