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

[peres001 at users.sourceforge.net]

Revision: 28525
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28525&view=rev
Author:   peres001
Date:     2007-08-11 06:13:56 -0700 (Sat, 11 Aug 2007)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/location.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/walk.cpp

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-08-11 13:07:21 UTC (rev 28524)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-08-11 13:13:56 UTC (rev 28525)
@@ -246,6 +246,7 @@
 	delete _backgroundInfo;
 
 	_backgroundInfo = 0;
+	_pathBuffer = 0;
 
 }
 
@@ -263,7 +264,7 @@
 		_gfx->setMask(&_backgroundInfo->mask);
 
 	if (_backgroundInfo->path.data)
-		setPath(&_backgroundInfo->path);
+		_pathBuffer = &_backgroundInfo->path;
 
 	return;
 }

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-08-11 13:07:21 UTC (rev 28524)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-08-11 13:13:56 UTC (rev 28525)
@@ -167,17 +167,16 @@
 	_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);

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-08-11 13:07:21 UTC (rev 28524)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-08-11 13:13:56 UTC (rev 28525)
@@ -325,7 +325,6 @@
 	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 @@
 	int32 			_screenHeight;
 	int32 			_screenSize;
 
-	int32 			_screenPathWidth;
-	int32 			_screenPathSize;
 	PathBuffer		*_pathBuffer;
 
 	SoundMan		*_soundMan;

Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp	2007-08-11 13:07:21 UTC (rev 28524)
+++ scummvm/trunk/engines/parallaction/walk.cpp	2007-08-11 13:13:56 UTC (rev 28525)
@@ -421,11 +421,6 @@
 }
 
 
-void Parallaction::setPath(PathBuffer *buffer) {
-	_pathBuffer = buffer;
-}
-
-
 WalkNode::WalkNode() : _x(0), _y(0) {
 }
 


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