aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
authorNicola Mettifogo2007-08-11 13:13:56 +0000
committerNicola Mettifogo2007-08-11 13:13:56 +0000
commit4c89de8fc04cf6f4bfd6f1e7f5d11094cabccfa0 (patch)
tree74addab753b6f915e57d06f79fe0e92d273ff79e /engines/parallaction
parent8c2ae45ab443ac4b9d3d21341fbb74b44858fd8f (diff)
downloadscummvm-rg350-4c89de8fc04cf6f4bfd6f1e7f5d11094cabccfa0.tar.gz
scummvm-rg350-4c89de8fc04cf6f4bfd6f1e7f5d11094cabccfa0.tar.bz2
scummvm-rg350-4c89de8fc04cf6f4bfd6f1e7f5d11094cabccfa0.zip
Cleanup.
svn-id: r28525
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/location.cpp3
-rw-r--r--engines/parallaction/parallaction.cpp7
-rw-r--r--engines/parallaction/parallaction.h3
-rw-r--r--engines/parallaction/walk.cpp5
4 files changed, 5 insertions, 13 deletions
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index a03c948ae8..184a9497ea 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -246,6 +246,7 @@ void Parallaction::freeBackground() {
delete _backgroundInfo;
_backgroundInfo = 0;
+ _pathBuffer = 0;
}
@@ -263,7 +264,7 @@ void Parallaction::setBackground(const char *background, const char *mask, const
_gfx->setMask(&_backgroundInfo->mask);
if (_backgroundInfo->path.data)
- setPath(&_backgroundInfo->path);
+ _pathBuffer = &_backgroundInfo->path;
return;
}
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 51811e3078..813394da01 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -167,17 +167,16 @@ int Parallaction::init() {
_location._endComment = NULL;
_backgroundInfo = 0;
- _screenPathWidth = _screenWidth / 8;
+ _pathBuffer = 0;
+
_screenSize = _screenWidth * _screenHeight;
- _screenPathSize = _screenPathWidth * _screenHeight;
+
strcpy(_characterName1, "null");
strcpy(_characterName, "dough");
memset(_locationNames, 0, 120*32);
- _pathBuffer = 0;
-
initInventory(); // needs to be pushed into subclass
_animations.push_front(&_char._ani);
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 56f3bf1b86..72c7e8d68b 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -325,7 +325,6 @@ public:
void resumeJobs();
void runJobs();
- void setPath(PathBuffer *buffer);
void finalizeWalk(WalkNodeList *list);
int16 selectWalkFrame(const Common::Point& pos, const WalkNode* from);
void clipMove(Common::Point& pos, const WalkNode* from);
@@ -373,8 +372,6 @@ public:
int32 _screenHeight;
int32 _screenSize;
- int32 _screenPathWidth;
- int32 _screenPathSize;
PathBuffer *_pathBuffer;
SoundMan *_soundMan;
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index 872109b48b..5e4dade265 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -421,11 +421,6 @@ void jobWalk(void *parm, Job *j) {
}
-void Parallaction::setPath(PathBuffer *buffer) {
- _pathBuffer = buffer;
-}
-
-
WalkNode::WalkNode() : _x(0), _y(0) {
}