SUPERNOVA: Renames MSNImageDecoder to MSNImage

5 files changed, 13 insertions, 13 deletions

diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp
index 3a29bacacc..e27c7c9d8f 100644
--- a/engines/supernova/graphics.cpp
+++ b/engines/supernova/graphics.cpp
@@ -34,7 +34,7 @@
 
 namespace Supernova {
 
-MSNImageDecoder::MSNImageDecoder() {
+MSNImage::MSNImage() {
 	_palette = nullptr;
 	_encodedImage = nullptr;
 	_filenumber = -1;
@@ -43,11 +43,11 @@ MSNImageDecoder::MSNImageDecoder() {
 	_numClickFields = 0;
 }
 
-MSNImageDecoder::~MSNImageDecoder() {
+MSNImage::~MSNImage() {
 	destroy();
 }
 
-bool MSNImageDecoder::init(int filenumber) {
+bool MSNImage::init(int filenumber) {
 	Common::File file;
 	if (!file.open(Common::String::format("msn_data.%03d", filenumber))) {
 		warning("Image data file msn_data.%03d could not be read!", filenumber);
@@ -60,7 +60,7 @@ bool MSNImageDecoder::init(int filenumber) {
 	return true;
 }
 
-bool MSNImageDecoder::loadFromEngineDataFile() {
+bool MSNImage::loadFromEngineDataFile() {
 	Common::String name;
 	if (_filenumber == 1)
 		name = "IMG1";
@@ -102,7 +102,7 @@ bool MSNImageDecoder::loadFromEngineDataFile() {
 	return false;
 }
 
-bool MSNImageDecoder::loadStream(Common::SeekableReadStream &stream) {
+bool MSNImage::loadStream(Common::SeekableReadStream &stream) {
 	destroy();
 
 	uint size = 0;
@@ -199,7 +199,7 @@ bool MSNImageDecoder::loadStream(Common::SeekableReadStream &stream) {
 	return true;
 }
 
-bool MSNImageDecoder::loadSections() {
+bool MSNImage::loadSections() {
 	bool isNewspaper = _filenumber == 1 || _filenumber == 2;
 	int imageWidth = isNewspaper ? 640 : 320;
 	int imageHeight = isNewspaper ? 480 : 200;
@@ -238,7 +238,7 @@ bool MSNImageDecoder::loadSections() {
 	return true;
 }
 
-void MSNImageDecoder::destroy() {
+void MSNImage::destroy() {
 	if (_palette) {
 		delete[] _palette;
 		_palette = NULL;
diff --git a/engines/supernova/graphics.h b/engines/supernova/graphics.h
index 2a820c9432..058da45ba8 100644
--- a/engines/supernova/graphics.h
+++ b/engines/supernova/graphics.h
@@ -36,10 +36,10 @@ struct Surface;
 
 namespace Supernova {
 
-class MSNImageDecoder : public Image::ImageDecoder {
+class MSNImage : public Image::ImageDecoder {
 public:
-	MSNImageDecoder();
-	virtual ~MSNImageDecoder();
+	MSNImage();
+	virtual ~MSNImage();
 
 	virtual void destroy();
 	virtual bool loadStream(Common::SeekableReadStream &stream);
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index 2e887660ed..5933c5fdf9 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -741,7 +741,7 @@ void GameManager::processInput() {
 							(field == -1) && i < kMaxObject; i++) {
 				click = _currentRoom->getObject(i)->_click;
 				if (click != 255 && _vm->_currentImage) {
-					MSNImageDecoder::ClickField *clickField = _vm->_currentImage->_clickField;
+					MSNImage::ClickField *clickField = _vm->_currentImage->_clickField;
 					do {
 						if ((_mouseX >= clickField[click].x1) && (_mouseX <= clickField[click].x2) &&
 							(_mouseY >= clickField[click].y1) && (_mouseY <= clickField[click].y2))
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 9410ce1f4d..f109d010c6 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -312,7 +312,7 @@ bool SupernovaEngine::setCurrentImage(int filenumber) {
 		return true;
 
 	delete _currentImage;
-	_currentImage = new MSNImageDecoder();
+	_currentImage = new MSNImage();
 	if (!_currentImage->init(filenumber)) {
 		delete _currentImage;
 		_currentImage = NULL;
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index 589d3f5a06..3b24076095 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -94,7 +94,7 @@ public:
 	Sound *_sound;
 	ResourceManager *_resMan;
 	ScreenBufferStack _screenBuffer;
-	MSNImageDecoder *_currentImage;
+	MSNImage *_currentImage;
 	int _screenWidth;
 	int _screenHeight;
 	bool _allowLoadGame;