Merged the "palette manager" into the cursor manager. It was only used to

manage *cursor* palettes, so the name was misleading.

svn-id: r25500

5 files changed, 7 insertions, 10 deletions

diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index be2ddeebab..9ca53b3a74 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -25,7 +25,6 @@
 #include "common/stdafx.h"
 
 #include "graphics/cursorman.h"
-#include "graphics/paletteman.h"
 
 #include "agi/agi.h"
 #include "agi/graphics.h"
@@ -441,7 +440,7 @@ int GfxMgr::initVideo() {
 		255, 255, 255, 0
 	};
 
-	PaletteMan.replaceCursorPalette(cursorPalette, 0, 3);
+	CursorMan.replaceCursorPalette(cursorPalette, 0, 3);
 	CursorMan.replaceCursor(mouseCursor, 16, 16, 1, 1);
 
 	return errOK;
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 46a7eb26d0..b5cdecd7de 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -28,7 +28,6 @@
 #include "common/system.h"
 
 #include "graphics/cursorman.h"
-#include "graphics/paletteman.h"
 
 namespace Cine {
 
@@ -125,7 +124,7 @@ void setMouseCursor(int cursor) {
 			++src;
 		}
 		CursorMan.replaceCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY);
-		PaletteMan.replaceCursorPalette(cursorPalette, 0, 2);
+		CursorMan.replaceCursorPalette(cursorPalette, 0, 2);
 		currentMouseCursor = cursor;
 	}
 }
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 45ed70d8a5..66b3fc8a39 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -24,7 +24,6 @@
 #include "common/system.h"
 #include "common/util.h"
 #include "graphics/cursorman.h"
-#include "graphics/paletteman.h"
 #include "scumm/bomp.h"
 #include "scumm/charset.h"
 #include "scumm/intern.h"
@@ -178,7 +177,7 @@ void ScummEngine_v70he::setDefaultCursor() {
 
 	// Since white color position is not guaranteed
 	// we setup our own palette if supported by backend
-	PaletteMan.replaceCursorPalette(palette, 0xfe, 2);
+	CursorMan.replaceCursorPalette(palette, 0xfe, 2);
 
 	updateCursor();
 }
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);
 }