[Scummvm-cvs-logs] SF.net SVN: scummvm: [26179] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 26179
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26179&view=rev
Author:   peres001
Date:     2007-03-17 10:52:30 -0700 (Sat, 17 Mar 2007)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/inventory.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/zone.h

Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp	2007-03-17 17:13:52 UTC (rev 26178)
+++ scummvm/trunk/engines/parallaction/inventory.cpp	2007-03-17 17:52:30 UTC (rev 26179)
@@ -357,7 +357,7 @@
 
 void initInventory() {
 	_buffer = (byte*)malloc(INVENTORY_WIDTH * INVENTORY_HEIGHT);	  // this buffer is also used by menu so it must stay this size
-	_vm->_char._objs._count = 0;
+
 }
 
 void cleanInventory() {

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-17 17:13:52 UTC (rev 26178)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-17 17:52:30 UTC (rev 26179)
@@ -214,31 +214,8 @@
 
 	initWalk();
 
-	_vm->_char._talk._width = 0;
-	_vm->_char._talk._height = 0;
-	_vm->_char._talk._count = 0;
-	_vm->_char._talk._array = NULL;
-
-	_vm->_char._head._width = 0;
-	_vm->_char._head._height = 0;
-	_vm->_char._head._data0 = NULL;
-	_vm->_char._head._data1 = NULL;
-
-	_vm->_char._ani._zone.pos._position._x = 150;
-	_vm->_char._ani._zone.pos._position._y = 100;
 	initInventory();
-	_vm->_char._ani._z = 10;
 
-	_vm->_char._ani._zone.pos._oldposition._x = -1000;
-	_vm->_char._ani._zone.pos._oldposition._y = -1000;
-	_vm->_char._ani._frame = 0;
-
-	_vm->_char._ani._zone._flags = kFlagsActive | kFlagsNoName;
-	_vm->_char._ani._zone._type = kZoneYou;
-
-	_vm->_char._ani._zone._label._cnv._data0 = NULL;
-	_vm->_char._ani._zone._label._text = strdup("yourself");
-
 	addNode(&_animations, &_vm->_char._ani._zone);
 	_gfx = new Gfx(this);
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-03-17 17:13:52 UTC (rev 26178)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-03-17 17:52:30 UTC (rev 26179)
@@ -241,6 +241,32 @@
 	Cnv 			_normalFrames;
 	Cnv				_miniFrames;
 	Cnv 			_objs;
+
+	Character() {
+		_talk._width = 0;
+		_talk._height = 0;
+		_talk._count = 0;
+		_talk._array = NULL;
+
+		_head._width = 0;
+		_head._height = 0;
+		_head._data0 = NULL;
+		_head._data1 = NULL;
+
+		_objs._count = 0;
+
+		_ani._zone.pos._position._x = 150;
+		_ani._zone.pos._position._y = 100;
+		_ani._z = 10;
+		_ani._zone.pos._oldposition._x = -1000;
+		_ani._zone.pos._oldposition._y = -1000;
+		_ani._frame = 0;
+		_ani._zone._flags = kFlagsActive | kFlagsNoName;
+		_ani._zone._type = kZoneYou;
+		_ani._zone._label._cnv._data0 = NULL;
+		_ani._zone._label._text = strdup("yourself");
+	}
+
 };
 
 class Parallaction : public Engine {

Modified: scummvm/trunk/engines/parallaction/zone.h
===================================================================
--- scummvm/trunk/engines/parallaction/zone.h	2007-03-17 17:13:52 UTC (rev 26178)
+++ scummvm/trunk/engines/parallaction/zone.h	2007-03-17 17:52:30 UTC (rev 26179)
@@ -216,9 +216,9 @@
 
 Animation  *findAnimation(const char *name);
 void		loadProgram(Animation *, char *filename);
-int16		queryBackgroundLayer(int16 v);
 
 
+
 } // namespace Parallaction
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.