PRINCE: Resource loading - renaming

scummvm · Oct 7, 2014 · 115340b · 115340b
1 parent f3965bb
commit 115340b
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 24 deletions.
diff --git a/engines/prince/animation.cpp b/engines/prince/animation.cpp
@@ -49,7 +49,7 @@ void Animation::clear() {
 	}
 }
 
-bool Animation::loadFromStream(Common::SeekableReadStream &stream) {
+bool Animation::loadStream(Common::SeekableReadStream &stream) {
 	stream.skip(2); // skip not used x and y coord diff
 	_loopCount = stream.readUint16LE();
 	_phaseCount = stream.readUint16LE();

diff --git a/engines/prince/animation.h b/engines/prince/animation.h
@@ -34,7 +34,7 @@ class Animation {
 public:
 	Animation();
 	~Animation();
-	bool loadFromStream(Common::SeekableReadStream &stream);
+	bool loadStream(Common::SeekableReadStream &stream);
 
 	int16 getLoopCount() const;
 	int32 getPhaseCount() const;

diff --git a/engines/prince/cursor.cpp b/engines/prince/cursor.cpp
@@ -37,7 +37,7 @@ Cursor::~Cursor() {
 	}
 }
 
-bool Cursor::loadFromStream(Common::SeekableReadStream &stream) {
+bool Cursor::loadStream(Common::SeekableReadStream &stream) {
 	stream.skip(4);
 	uint16 width = stream.readUint16LE();
 	uint16 height = stream.readUint16LE();

diff --git a/engines/prince/cursor.h b/engines/prince/cursor.h
@@ -34,7 +34,7 @@ class Cursor {
 	Cursor();
 	~Cursor();
 
-	bool loadFromStream(Common::SeekableReadStream &stream);
+	bool loadStream(Common::SeekableReadStream &stream);
 	const Graphics::Surface *getSurface() const { return _surface; }
 
 private:

diff --git a/engines/prince/font.cpp b/engines/prince/font.cpp
@@ -39,7 +39,7 @@ Font::~Font() {
 	}
 }
 
-bool Font::loadFromStream(Common::SeekableReadStream &stream) {
+bool Font::loadStream(Common::SeekableReadStream &stream) {
 	stream.seek(0);
 	uint32 dataSize = stream.size();
 	_fontData = (byte *)malloc(dataSize);

diff --git a/engines/prince/font.h b/engines/prince/font.h
@@ -35,7 +35,7 @@ class Font : public Graphics::Font {
 	Font();
 	virtual ~Font();
 
-	bool loadFromStream(Common::SeekableReadStream &stream);
+	bool loadStream(Common::SeekableReadStream &stream);
 
 	virtual int getFontHeight() const override;
 

diff --git a/engines/prince/mhwanh.h b/engines/prince/mhwanh.h
@@ -50,18 +50,6 @@ class MhwanhDecoder : public Image::ImageDecoder {
 	byte *_palette;
 };
 
-namespace Resource {
-	template <> inline
-	bool loadFromStream<MhwanhDecoder>(MhwanhDecoder &image, Common::SeekableReadStream &stream) {
-		return image.loadStream(stream);
-	}
-
-	template <> inline
-	bool loadFromStream<Image::BitmapDecoder>(Image::BitmapDecoder &image, Common::SeekableReadStream &stream) {
-		return image.loadStream(stream);
-	}
-}
-
 } // End of namespace Prince
 
 #endif
diff --git a/engines/prince/resource.h b/engines/prince/resource.h
@@ -34,7 +34,7 @@ namespace Resource {
 
 	template <typename T>
 	bool loadFromStream(T &resource, Common::SeekableReadStream &stream) {
-		return resource.loadFromStream(stream);
+		return resource.loadStream(stream);
 	}
 
 	template<typename T>

diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
@@ -96,7 +96,7 @@ Script::~Script() {
 	}
 }
 
-bool Script::loadFromStream(Common::SeekableReadStream &stream) {
+bool Script::loadStream(Common::SeekableReadStream &stream) {
 	_dataSize = stream.size();
 	if (!_dataSize) {
 		return false;

diff --git a/engines/prince/script.h b/engines/prince/script.h
@@ -64,7 +64,7 @@ class Room {
 	int _talk;
 	int _give;
 
-	bool loadFromStream(Common::SeekableReadStream &stream);
+	bool loadStream(Common::SeekableReadStream &stream);
 	bool loadRoom(byte *roomData);
 	int getOptionOffset(int option);
 
@@ -123,7 +123,7 @@ class Script {
 
 	ScriptInfo _scriptInfo;
 
-	bool loadFromStream(Common::SeekableReadStream &stream);
+	bool loadStream(Common::SeekableReadStream &stream);
 
 	template <typename T>
 	T read(uint32 address) {

diff --git a/engines/prince/variatxt.cpp b/engines/prince/variatxt.cpp
@@ -37,7 +37,7 @@ VariaTxt::~VariaTxt() {
 }
 
 
-bool VariaTxt::loadFromStream(Common::SeekableReadStream &stream) {
+bool VariaTxt::loadStream(Common::SeekableReadStream &stream) {
 	_dataSize = stream.size();
 	_data = (byte *)malloc(_dataSize);
 	stream.read(_data, _dataSize);

diff --git a/engines/prince/variatxt.h b/engines/prince/variatxt.h
@@ -29,7 +29,7 @@ class VariaTxt {
 	VariaTxt();
 	~VariaTxt();
 
-	bool loadFromStream(Common::SeekableReadStream &stream);
+	bool loadStream(Common::SeekableReadStream &stream);
 	byte *getString(uint32 stringId);
 
 private: