diff options
author | Nicola Mettifogo | 2007-03-18 19:59:56 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-03-18 19:59:56 +0000 |
commit | 2ea44bf1eee6411b9648e72d00e78470a6f71caf (patch) | |
tree | 84af59e2c14629acbf9cbcedf64ddca8e4e42256 /engines | |
parent | f14a5c17f2d153c76995d43de02c2c985186f5c5 (diff) | |
download | scummvm-rg350-2ea44bf1eee6411b9648e72d00e78470a6f71caf.tar.gz scummvm-rg350-2ea44bf1eee6411b9648e72d00e78470a6f71caf.tar.bz2 scummvm-rg350-2ea44bf1eee6411b9648e72d00e78470a6f71caf.zip |
changed code to use WalkNode constructors
svn-id: r26227
Diffstat (limited to 'engines')
-rw-r--r-- | engines/parallaction/defs.h | 3 | ||||
-rw-r--r-- | engines/parallaction/location.cpp | 7 | ||||
-rw-r--r-- | engines/parallaction/walk.cpp | 20 |
3 files changed, 13 insertions, 17 deletions
diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h index 990a32bbbc..8757b2c5f6 100644 --- a/engines/parallaction/defs.h +++ b/engines/parallaction/defs.h @@ -54,6 +54,9 @@ public: WalkNode(int32 x, int32 y) : _x(x), _y(y) { } + WalkNode(const WalkNode& w) : _x(w._x), _y(w._y) { + } + void getPoint(Common::Point &p) const { p.x = _x; p.y = _y; diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp index 67e38c83c1..be8d5902e7 100644 --- a/engines/parallaction/location.cpp +++ b/engines/parallaction/location.cpp @@ -236,9 +236,10 @@ void parseWalkNodes(Script& script, Node *list) { if (!scumm_stricmp(_tokens[0], "COORD")) { - WalkNode *v4 = (WalkNode*)malloc(sizeof(WalkNode)); - v4->_x = atoi(_tokens[1]) - _vm->_char._ani.width()/2; - v4->_y = atoi(_tokens[2]) - _vm->_char._ani.height(); + WalkNode *v4 = new WalkNode( + atoi(_tokens[1]) - _vm->_char._ani.width()/2, + atoi(_tokens[2]) - _vm->_char._ani.height() + ); addNode(list, v4); diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index 710040d184..2c18b85b6b 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -111,19 +111,14 @@ WalkNode *buildWalkPath(uint16 x, uint16 y) { } debugC(1, kDebugWalk, "found closest path point at (%i, %i)", to.x, to.y); - WalkNode *v48 = (WalkNode*)malloc(sizeof(WalkNode)); - WalkNode *v44 = (WalkNode*)malloc(sizeof(WalkNode)); - - v48->_x = to.x - _vm->_char._ani.width() / 2; // target top left coordinates - v48->_y = to.y - _vm->_char._ani.height(); - v48->_next = NULL; - memcpy(v44, v48, sizeof(WalkNode)); + WalkNode *v48 = new WalkNode(to.x - _vm->_char._ani.width() / 2, to.y - _vm->_char._ani.height()); + WalkNode *v44 = new WalkNode(*v48); uint16 v38 = walkFunc1(to.x, to.y, v44); if (v38 == 1) { // destination directly reachable debugC(1, kDebugWalk, "direct move to (%i, %i)", to.x, to.y); - free(v44); + delete v44; return v48; } @@ -131,7 +126,6 @@ WalkNode *buildWalkPath(uint16 x, uint16 y) { debugC(1, kDebugWalk, "trying to build walk path to (%i, %i)", to.x, to.y); WalkNode v58; - memset(&v58, 0, sizeof(WalkNode)); int16 _si = v48->_x; // _si, _di: target top left coordinates int16 _di = v48->_y; @@ -181,10 +175,8 @@ WalkNode *buildWalkPath(uint16 x, uint16 y) { if (_closest_node_found == 0) break; - WalkNode *_newnode = (WalkNode*)malloc(sizeof(WalkNode)); - memcpy( _newnode, _closest_node, sizeof(WalkNode)); - v20.x = _newnode->_x; - v20.y = _newnode->_y; + WalkNode *_newnode = new WalkNode(*_closest_node); + _newnode->getPoint(v20); Common::Point tmp(_si - v20.x, _di - v20.y); @@ -224,7 +216,7 @@ WalkNode *buildWalkPath(uint16 x, uint16 y) { } - free(v44); + delete v44; return (WalkNode*)v58._next; } |