diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/parallaction/inventory.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/parallaction.cpp | 23 | ||||
-rw-r--r-- | engines/parallaction/parallaction.h | 26 | ||||
-rw-r--r-- | engines/parallaction/zone.h | 2 |
4 files changed, 28 insertions, 25 deletions
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index c82ae19fb8..ab9a458c57 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -357,7 +357,7 @@ void redrawInventory() { 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() { diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 62268aa3c1..fa0bc345e6 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -214,30 +214,7 @@ int Parallaction::init() { 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); diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 5d46d4ec11..0295f3e646 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -241,6 +241,32 @@ struct Character { 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 { diff --git a/engines/parallaction/zone.h b/engines/parallaction/zone.h index b4b4bf969c..f9d9ce6a0b 100644 --- a/engines/parallaction/zone.h +++ b/engines/parallaction/zone.h @@ -216,7 +216,7 @@ uint16 checkDoor(); Animation *findAnimation(const char *name); void loadProgram(Animation *, char *filename); -int16 queryBackgroundLayer(int16 v); + } // namespace Parallaction |