From 3bc06610659079e9320e4a0835af103a2fab11a5 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 12 Feb 2007 00:04:56 +0000
Subject: Merged the "palette manager" into the cursor manager. It was only
 used to manage *cursor* palettes, so the name was misleading.

svn-id: r25500
---
 engines/scumm/he/resource_he.cpp | 4 ++--
 engines/scumm/he/wiz_he.cpp      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/scumm/he')

diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index d20a03f255..3e67eb2e8f 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -33,7 +33,7 @@
 #include "scumm/he/sound_he.h"
 
 #include "sound/wave.h"
-#include "graphics/paletteman.h"
+#include "graphics/cursorman.h"
 
 #include "common/stream.h"
 #include "common/system.h"
@@ -112,7 +112,7 @@ void ResExtractor::setCursor(int id) {
 	}
 
 	if (cc->palette)
-		PaletteMan.replaceCursorPalette(cc->palette, 0, cc->palSize);
+		CursorMan.replaceCursorPalette(cc->palette, 0, cc->palSize);
 
 	_vm->setCursorHotspot(cc->hotspot_x, cc->hotspot_y);
 	_vm->setCursorFromBuffer(cc->bitmap, cc->w, cc->h, cc->w);
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 244d8821a7..b555dfeb65 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -24,7 +24,7 @@
 #include "common/stdafx.h"
 
 #include "common/system.h"
-#include "graphics/paletteman.h"
+#include "graphics/cursorman.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
@@ -1539,7 +1539,7 @@ void Wiz::loadWizCursor(int resId) {
 	_vm->setCursorFromBuffer(cursor, cw, ch, cw);
 
 	// Since we set up cursor palette for default cursor, disable it now
-	PaletteMan.disableCursorPalette(true);
+	CursorMan.disableCursorPalette(true);
 
 	free(cursor);
 }
-- 
cgit v1.2.3