BLADERUNNER: Group shapes loading

1 files changed, 28 insertions, 5 deletions

diff --git a/engines/bladerunner/shape.h b/engines/bladerunner/shape.h
index 79037b7173..04a214c233 100644
--- a/engines/bladerunner/shape.h
+++ b/engines/bladerunner/shape.h
@@ -23,8 +23,14 @@
 #ifndef BLADERUNNER_SHAPE_H
 #define BLADERUNNER_SHAPE_H
 
+#include "common/array.h"
 #include "common/str.h"
 
+
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace Graphics {
 struct Surface;
 }
@@ -34,24 +40,41 @@ namespace BladeRunner {
 class BladeRunnerEngine;
 
 class Shape {
-	BladeRunnerEngine *_vm;
+	friend class Shapes;
 
 	int   _width;
 	int   _height;
 	byte *_data;
 
+	bool load(Common::SeekableReadStream *stream);
+
 public:
-	Shape(BladeRunnerEngine *vm);
 	~Shape();
 
-	bool open(const Common::String &container, int index);
-
 	void draw(Graphics::Surface &surface, int x, int y) const;
 
-	int getWidth()  const { return _width;  }
+	int getWidth() const { return _width; }
 	int getHeight() const { return _height; }
 };
 
+class Shapes {
+	BladeRunnerEngine *_vm;
+
+	Common::Array<Shape> _shapes;
+
+public:
+	Shapes(BladeRunnerEngine *vm);
+	~Shapes();
+
+	bool load(const Common::String &container);
+	void unload();
+
+	const Shape *get(uint32 index) const {
+		assert(index < _shapes.size());
+		return &_shapes[index];
+	}
+};
+
 } // End of namespace BladeRunner
 
 #endif