AVALANCHE: Major update in the Engine (include Graph), minor updates in Graph and Lucerna.

4 files changed, 17 insertions, 6 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 94b2b16115..88e6e0edd1 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -38,6 +38,8 @@
 
 #include "engines/util.h"
 
+
+
 namespace Avalanche {
 
 	AvalancheEngine *AvalancheEngine::s_Engine = 0;
@@ -49,6 +51,8 @@ namespace Avalanche {
 		_rnd = new Common::RandomSource("avalanche");
 		_rnd->setSeed(42);     
 
+		_graph.setParent(this);
+
 		_gyro.setParent(this);
 		_enhanced.setParent(this);
 		_logger.setParent(this);
@@ -241,13 +245,17 @@ namespace Avalanche {
 
 	Common::Error AvalancheEngine::run() {
 		s_Engine = this;
-		initGraphics(320, 200, false);
-		_console = new AvalancheConsole(this);
 
+		_console = new AvalancheConsole(this);
+		
 		_scrolls.init();
 		_lucerna.init();
 		_acci.init();
 		_basher.init();
+		_graph.init();
+
+		
+
 
 		// From bootstrp:
 
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 592df701ee..bd8e53285b 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -30,6 +30,8 @@
 
 #include "avalanche/console.h"
 
+#include "avalanche/graph.h"
+
 #include "avalanche/avalot.h"
 #include "avalanche/gyro2.h"
 #include "avalanche/enhanced2.h"
@@ -63,6 +65,8 @@ static const int kSavegameVersion = 1;
 
 class AvalancheEngine : public Engine {
 public:
+	Graph _graph;
+
 	Avalot _avalot;
 	Gyro _gyro;
 	Enhanced _enhanced;
@@ -81,6 +85,8 @@ public:
 	Dropdown _dropdown;
 	Closing _closing;
 
+
+
 	AvalancheEngine(OSystem *syst, const AvalancheGameDescription *gd);
 	~AvalancheEngine();
 
@@ -94,8 +100,6 @@ public:
 	uint32 getFeatures() const;
 	const char *getGameId() const;
 
-	void initGame(const AvalancheGameDescription *gd);
-
 	Common::Platform getPlatform() const;
 
 	bool hasFeature(EngineFeature f) const;
diff --git a/engines/avalanche/graph.cpp b/engines/avalanche/graph.cpp
index 30dd20aa2f..73ea430c4e 100644
--- a/engines/avalanche/graph.cpp
+++ b/engines/avalanche/graph.cpp
@@ -77,7 +77,7 @@ byte *Graph::getPixel(int16 x, int16 y) {
 }
 
 void Graph::setPixel(byte *pixel, byte color) {
-	memset(pixel, color, 1);
+	*pixel = color;
 }
 
 void Graph::drawToScreen() {
diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h
index f9d43f7c2a..94da2dba26 100644
--- a/engines/avalanche/lucerna2.h
+++ b/engines/avalanche/lucerna2.h
@@ -176,5 +176,4 @@ private:
 
 } // End of namespace Avalanche
 
-
 #endif // LUCERNA2_H