PRINCE: Animation classes fix.

8 files changed, 133 insertions, 188 deletions

diff --git a/engines/prince/animation.cpp b/engines/prince/animation.cpp
index f4db81ec4d..f595e7af68 100644
--- a/engines/prince/animation.cpp
+++ b/engines/prince/animation.cpp
@@ -21,36 +21,24 @@
  */
 
 #include "prince/animation.h"
-#include "prince/detail/animation.h"
+#include "prince/decompress.h"
 
+#include "common/debug.h"
+#include "common/endian.h"
 
 namespace Prince {
 
-Animation::Animation() : _helper(NULL) {
-}
-
-Animation::~Animation() {
-	delete _helper;
-}
-
 bool Animation::loadFromStream(Common::SeekableReadStream &stream) {
-
 	uint32 dataSize = stream.size();
+	_data = (byte*) malloc(dataSize);
 
-	byte *data = (byte*)malloc(dataSize);
-
-	if(stream.read(data, dataSize) != dataSize) {
-		free(data);
+	if(stream.read(_data, dataSize) != dataSize) {
+		free(_data);
 		return false;
 	}
-
-	delete _helper;
-
-	_helper = new Detail::Animation(data, dataSize);
-
 	return true;
 }
-
+/*
 const Graphics::Surface * Animation::getSurface(uint16 frameIndex) {
 	// bida kaszing
 	if (frameIndex >= _frameList.size()) {
@@ -60,8 +48,82 @@ const Graphics::Surface * Animation::getSurface(uint16 frameIndex) {
 	}
 	return _frameList[frameIndex];	
 }
+*/
+Animation::Animation() {
+
+}
+
+Animation::Animation(byte *data, uint32 dataSize)
+	: _data(data), _dataSize(dataSize) {
+}
+
+Animation::~Animation() {
+	free(_data);
+}
+
+int16 Animation::getLoopCount() const {
+	return READ_LE_UINT16(_data + 2);
+}
+
+int16 Animation::getBaseX() const {
+	return READ_LE_UINT16(_data + 8);
+}
+
+int16 Animation::getBaseY() const {
+	return READ_LE_UINT16(_data + 10);
+}
 
+uint Animation::getPhaseCount() const {
+	return READ_LE_UINT16(_data + 4);
 }
 
+uint Animation::getFrameCount() const {
+	return READ_LE_UINT16(_data + 6);
+}
+
+int16 Animation::getPhaseOffsetX(uint phaseIndex) const {
+	return READ_LE_UINT16(getPhaseEntry(phaseIndex) + 0);
+}
+
+int16 Animation::getPhaseOffsetY(uint phaseIndex) const {
+	return READ_LE_UINT16(getPhaseEntry(phaseIndex) + 2);
+}
+
+int16 Animation::getPhaseFrameIndex(uint phaseIndex) const {
+	return READ_LE_UINT16(getPhaseEntry(phaseIndex) + 4);
+}
+
+Graphics::Surface *Animation::getFrame(uint frameIndex) {
+	byte *frameData = _data + READ_LE_UINT32(_data + 16 + frameIndex * 4);
+	int16 width = READ_LE_UINT16(frameData + 0);
+	int16 height = READ_LE_UINT16(frameData + 2);
+	debug("width = %d; height = %d", width, height);
+	Graphics::Surface *surf = new Graphics::Surface();
+	surf->create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+    debug("frameData %p", frameData);
+	if (READ_BE_UINT32(frameData + 4) == 0x6D61736D) {
+		// Compressed
+		Decompressor dec;
+        uint32 ddataSize = READ_LE_UINT32(frameData + 8);
+        byte *ddata = new byte[ddataSize];
+		dec.decompress(frameData + 12, ddata, ddataSize);
+        for (uint16 i = 0; i < height; ++i) {
+            memcpy(surf->getBasePtr(0, i), ddata + width * i, width);
+        }
+        delete[] ddata;
+	} else {
+		// Uncompressed
+        for (uint16 i = 0; i < height; ++i) {
+            memcpy(surf->getBasePtr(0, i), frameData + 4 + width * i, width);
+        }
+	}
+	return surf;
+}
+
+byte *Animation::getPhaseEntry(uint phaseIndex) const {
+	return _data + READ_LE_UINT32(_data + 12) + phaseIndex * 8;
+}
+
+}
 
 /* vim: set tabstop=4 noexpandtab: */
diff --git a/engines/prince/animation.h b/engines/prince/animation.h
index b0ef25d493..9eb7a703e2 100644
--- a/engines/prince/animation.h
+++ b/engines/prince/animation.h
@@ -30,22 +30,29 @@
 
 namespace Prince {
 
-// FIXME: temp hack !!!
-namespace Detail {
-	class Animation;
-}
-
 class Animation {
 public:
-	Animation();
-	~Animation();
     bool loadFromStream(Common::SeekableReadStream &stream);
+    //const Graphics::Surface *getSurface(uint16 frameIndex);
 
-    const Graphics::Surface *getSurface(uint16 frameIndex);
+	Animation();
+	Animation(byte *data, uint32 dataSize);
+	~Animation();
+	int16 getLoopCount() const;
+	int16 getBaseX() const;
+	int16 getBaseY() const;
+	uint getPhaseCount() const;
+	uint getFrameCount() const;
+	int16 getPhaseOffsetX(uint phaseIndex) const;
+	int16 getPhaseOffsetY(uint phaseIndex) const;
+	int16 getPhaseFrameIndex(uint phaseIndex) const;
+	Graphics::Surface *getFrame(uint frameIndex);
 
 private:
 	Common::Array<Graphics::Surface *> _frameList;
-	Detail::Animation *_helper;
+	byte *_data;
+	uint32 _dataSize;
+	byte *getPhaseEntry(uint phaseIndex) const;
 };
 
 }
diff --git a/engines/prince/detail/animation.cpp b/engines/prince/detail/animation.cpp
deleted file mode 100644
index 8b4a72b2f8..0000000000
--- a/engines/prince/detail/animation.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ScummVM - Graphic Adventure Engine

- *

- * ScummVM is the legal property of its developers, whose names

- * are too numerous to list here. Please refer to the COPYRIGHT

- * file distributed with this source distribution.

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

-

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- *

- */

-

-#include "prince/detail/animation.h"

-#include "prince/decompress.h"

-

-#include "common/debug.h"

-#include "common/endian.h"

-

-namespace Prince { namespace Detail {

-

-Animation::Animation(byte *data, uint32 dataSize)

-	: _data(data), _dataSize(dataSize) {

-}

-

-Animation::~Animation() {

-	free(_data);

-}

-

-int16 Animation::getLoopCount() const {

-	return READ_LE_UINT16(_data + 2);

-}

-

-int16 Animation::getBaseX() const {

-	return READ_LE_UINT16(_data + 8);

-}

-

-int16 Animation::getBaseY() const {

-	return READ_LE_UINT16(_data + 10);

-}

-

-uint Animation::getPhaseCount() const {

-	return READ_LE_UINT16(_data + 4);

-}

-

-uint Animation::getFrameCount() const {

-	return READ_LE_UINT16(_data + 6);

-}

-

-int16 Animation::getPhaseOffsetX(uint phaseIndex) const {

-	return READ_LE_UINT16(getPhaseEntry(phaseIndex) + 0);

-}

-

-int16 Animation::getPhaseOffsetY(uint phaseIndex) const {

-	return READ_LE_UINT16(getPhaseEntry(phaseIndex) + 2);

-}

-

-int16 Animation::getPhaseFrameIndex(uint phaseIndex) const {

-	return READ_LE_UINT16(getPhaseEntry(phaseIndex) + 4);

-}

-

-Graphics::Surface *Animation::getFrame(uint frameIndex) {

-	byte *frameData = _data + READ_LE_UINT32(_data + 16 + frameIndex * 4);

-	int16 width = READ_LE_UINT16(frameData + 0);

-	int16 height = READ_LE_UINT16(frameData + 2);

-	debug("width = %d; height = %d", width, height);

-	Graphics::Surface *surf = new Graphics::Surface();

-	surf->create(width, height, Graphics::PixelFormat::createFormatCLUT8());

-    debug("frameData %p", frameData);

-	if (READ_BE_UINT32(frameData + 4) == 0x6D61736D) {

-		// Compressed

-		Decompressor dec;

-        uint32 ddataSize = READ_LE_UINT32(frameData + 8);

-        byte *ddata = new byte[ddataSize];

-		dec.decompress(frameData + 12, ddata, ddataSize);

-        for (uint16 i = 0; i < height; ++i) {

-            memcpy(surf->getBasePtr(0, i), ddata + width * i, width);

-        }

-        delete[] ddata;

-	} else {

-		// Uncompressed

-        for (uint16 i = 0; i < height; ++i) {

-            memcpy(surf->getBasePtr(0, i), frameData + 4 + width * i, width);

-        }

-	}

-	return surf;

-}

-

-byte *Animation::getPhaseEntry(uint phaseIndex) const {

-	return _data + READ_LE_UINT32(_data + 12) + phaseIndex * 8;

-}

-

-} }

diff --git a/engines/prince/detail/animation.h b/engines/prince/detail/animation.h
deleted file mode 100644
index f9f289dc71..0000000000
--- a/engines/prince/detail/animation.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ScummVM - Graphic Adventure Engine

- *

- * ScummVM is the legal property of its developers, whose names

- * are too numerous to list here. Please refer to the COPYRIGHT

- * file distributed with this source distribution.

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

-

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- *

- */

-

-#ifndef PRINCE_DETAIL_ANIMATION_H

-#define PRINCE_DETAIL_ANIMATION_H

-

-#include "graphics/surface.h"

-

-namespace Prince { namespace Detail {

-

-class Animation {

-public:

-	Animation(byte *data, uint32 dataSize);

-	~Animation();

-	int16 getLoopCount() const;

-	int16 getBaseX() const;

-	int16 getBaseY() const;

-	uint getPhaseCount() const;

-	uint getFrameCount() const;

-	int16 getPhaseOffsetX(uint phaseIndex) const;

-	int16 getPhaseOffsetY(uint phaseIndex) const;

-	int16 getPhaseFrameIndex(uint phaseIndex) const;

-	Graphics::Surface *getFrame(uint frameIndex);

-protected:

-	byte *_data;

-	uint32 _dataSize;

-	byte *getPhaseEntry(uint phaseIndex) const;

-};

-

-} } 

-

-#endif

diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp
index 621a9b8ee1..3e3c5d6929 100644
--- a/engines/prince/hero.cpp
+++ b/engines/prince/hero.cpp
@@ -32,11 +32,10 @@ namespace Prince {
 static const uint32 kMoveSetSize = 26;
 
 Hero::Hero() : _number(0), _visible(false), _state(STAY), _middleX(0), _middleY(0)
-    , _boreNum(0), _currHeight(0), _moveDelay(0), _shadMinus(1) {
+    , _boreNum(0), _currHeight(0), _moveDelay(0), _shadMinus(1), _moveSetType(0), _frame(0) {
 } 
 
 bool Hero::loadAnimSet(uint32 animSetNr) {
-	animSetNr = 6;
 	if (animSetNr > sizeof(heroSetTable)) {
 		return false;
 	}
@@ -63,8 +62,9 @@ bool Hero::loadAnimSet(uint32 animSetNr) {
 }
 
 const Graphics::Surface * Hero::getSurface() {
-	if (_moveSet[3]) {
-		return _moveSet[3]->getSurface(0);
+	if (_moveSet[_moveSetType]) {
+		int16 phaseFrameIndex = _moveSet[_moveSetType]->getPhaseFrameIndex(_frame);
+		return _moveSet[_moveSetType]->getFrame(phaseFrameIndex);
 	}
 	return NULL;
 }
diff --git a/engines/prince/hero.h b/engines/prince/hero.h
index 77333d3643..45c0d700e3 100644
--- a/engines/prince/hero.h
+++ b/engines/prince/hero.h
@@ -54,6 +54,35 @@ public:
 		DOWN = 4
 	};
 
+	enum MoveSet {
+		Move_SL,
+		Move_SR,
+		Move_SU,
+		Move_SD,
+		Move_ML,
+		Move_MR,
+		Move_MU,
+		Move_MD,
+		Move_TL,
+		Move_TR,
+		Move_TU,
+		Move_TD,
+		Move_MLU,
+		Move_MLD,
+		Move_MLR,
+		Move_MRU,
+		Move_MRD,
+		Move_MRL,
+		Move_MUL,
+		Move_MUR,
+		Move_MUD,
+		Move_MDL,
+		Move_MDR,
+		Move_MDU,
+		Move_BORED1,
+		Move_BORED2
+	};
+
 	Hero();
 
 	bool loadAnimSet(uint32 heroAnimNumber);
@@ -69,6 +98,8 @@ public:
 	State _state;
 	int16 _middleX;
 	int16 _middleY;
+	int16 _moveSetType;
+	int16 _frame;
 
 	// Coords array of coordinates
 	// DirTab array of directions
diff --git a/engines/prince/module.mk b/engines/prince/module.mk
index e5319f8fe8..228e5990e2 100644
--- a/engines/prince/module.mk
+++ b/engines/prince/module.mk
@@ -18,7 +18,6 @@ MODULE_OBJS = \
 	decompress.o \
 	hero.o \
 	hero_set.o \
-	detail/animation.o \
 	cursor.o 
 
 # This module can be built as a plugin
diff --git a/engines/prince/sound.cpp b/engines/prince/sound.cpp
index 425a710aa1..af139f708e 100644
--- a/engines/prince/sound.cpp
+++ b/engines/prince/sound.cpp
@@ -157,8 +157,7 @@ void MusicPlayer::killMidi() {
 
 void MusicPlayer::loadMidi(const char * name) {
 	Common::SeekableReadStream * stream = SearchMan.createReadStreamForMember(name);
-	if (!stream)
-	{
+	if (!stream) {
 		debug("Can't load midi stream %s", name);
 		return;
 	}