AVALANCHE: Remove GraphicManager::fleshColors(), move everything from it to GraphicManager::init().

3 files changed, 4 insertions, 9 deletions

diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index fdc2ddda6f..b1c6f96f8b 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -501,8 +501,6 @@ void AvalancheEngine::loadAlso(byte num) {
 void AvalancheEngine::loadRoom(byte num) {
 	CursorMan.showMouse(false);
 
-	_graphics->fleshColors();
-
 	Common::String filename = Common::String::format("place%d.avd", num);
 	Common::File file;
 	if (!file.open(filename))
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 0414bf5333..bedb7f5506 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -77,6 +77,10 @@ void GraphicManager::init() {
 	for (int i = 0; i < 16; i++)
 		g_system->getPaletteManager()->setPalette(_egaPalette[kEgaPaletteIndex[i]], i, 1);
 
+	// Set the "flesh colors":
+	g_system->getPaletteManager()->setPalette(_egaPalette[39], 13, 1);
+	g_system->getPaletteManager()->setPalette(_egaPalette[28], 5, 1);
+
 	_surface.create(kScreenWidth, kScreenHeight, Graphics::PixelFormat::createFormatCLUT8());
 	_magics.create(kScreenWidth, kScreenHeight, Graphics::PixelFormat::createFormatCLUT8());
 	_screen.create(kScreenWidth, kScreenHeight * 2, Graphics::PixelFormat::createFormatCLUT8());
@@ -192,11 +196,6 @@ void GraphicManager::drawToolbar() {
 	file.close();
 }
 
-void GraphicManager::fleshColors() {
-	g_system->getPaletteManager()->setPalette(_egaPalette[39], 13, 1);
-	g_system->getPaletteManager()->setPalette(_egaPalette[28], 5, 1);
-}
-
 Common::Point GraphicManager::drawArc(Graphics::Surface &surface, int16 x, int16 y, int16 stAngle, int16 endAngle, uint16 radius, Color color) {
 	Common::Point endPoint;
 	const float convfac = M_PI / 180.0;
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index a6be3af283..b45d37e186 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -66,8 +66,6 @@ public:
 	void loadDigits();
 	void loadMouse(byte which);
 
-	void fleshColors();
-
 	Common::Point drawScreenArc(int16 x, int16 y, int16 stAngle, int16 endAngle, uint16 radius, Color color);
 	void drawPieSlice(int16 x, int16 y, int16 stAngle, int16 endAngle, uint16 radius, Color color);
 	void drawTriangle(Common::Point *p, Color color);