- tweaked a bit walking functions to make persons stop walking when a cutaway is canceled

- removed unpack to bob frame 2 (as it is never used)
- changed some error() calls to assert()
- minor cleanups

svn-id: r12385

1 files changed, 1 insertions, 8 deletions

diff --git a/queen/walk.h b/queen/walk.h
index 2f63278afa..1f9244193d 100644
--- a/queen/walk.h
+++ b/queen/walk.h
@@ -27,7 +27,6 @@
 
 namespace Queen {
 
-
 struct MovePersonAnim {
 	int16 firstFrame;
 	int16 lastFrame;
@@ -40,7 +39,6 @@ struct MovePersonAnim {
 	}
 };
 
-
 struct WalkData {
 	int16 dx, dy;
 	const Area *area;
@@ -48,7 +46,6 @@ struct WalkData {
 	MovePersonAnim anim;
 };
 
-
 struct MovePersonData {
 	const char *name;
 	int16 walkLeft1, walkLeft2;
@@ -61,7 +58,6 @@ struct MovePersonData {
 	uint16 moveSpeed;
 };
 
-
 class QueenEngine;
 
 class Walk {
@@ -73,13 +69,12 @@ public:
 	int16 movePerson(const Person *pp, int16 endx, int16 endy, uint16 curImage, int direction);
 
 	void stopJoe();
-
+	void stopPerson(uint16 bobNum);
 
 	enum {
 		MAX_WALK_DATA = 16
 	};
 
-
 private:
 
 	void animateJoePrepare();
@@ -133,11 +128,9 @@ private:
 
 	QueenEngine *_vm;
 
-
 	static const MovePersonData _moveData[];
 };
 
-
 } // End of namespace Queen
 
 #endif