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

[peres001 at users.sourceforge.net]

Revision: 28290
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28290&view=rev
Author:   peres001
Date:     2007-07-29 07:32:30 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Cleanup and some new comments.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-07-29 14:24:31 UTC (rev 28289)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-07-29 14:32:30 UTC (rev 28290)
@@ -146,51 +146,40 @@
 
 int Parallaction::init() {
 
+	initResources();	// needs to be pushed into subclass
+
+	_engineFlags = 0;
 	_objectsNames = NULL;
 	_globalTable = NULL;
-	_localFlagNames = NULL;
-	initResources();
-
 	_hasLocationSound = false;
-
 	_skipMenu = false;
-
 	_transCurrentHoverItem = 0;
 	_actionAfterWalk = false;  // actived when the character needs to move before taking an action
 	_activeItem._index = 0;
 	_activeItem._id = 0;
 	_procCurrentHoverItem = -1;
-
-//	_musicData1 = 0;
-	strcpy(_characterName1, "null");
-
 	_baseTime = 0;
+	_numLocations = 0;
+	_location._startPosition.x = -1000;
+	_location._startPosition.y = -1000;
+	_location._startFrame = 0;
+	_location._comment = NULL;
+	_location._endComment = NULL;
 
 	_screenMaskWidth = _screenWidth / 4;
 	_screenPathWidth = _screenWidth / 8;
-
 	_screenSize = _screenWidth * _screenHeight;
 	_screenMaskSize = _screenMaskWidth * _screenHeight;
 	_screenPathSize = _screenPathWidth * _screenHeight;
 
-	_engineFlags = 0;
-
+	strcpy(_characterName1, "null");
 	strcpy(_characterName, "dough");
 
 	memset(_locationNames, 0, 120*32);
-	_numLocations = 0;
 
-	_location._startPosition.x = -1000;
-	_location._startPosition.y = -1000;
-	_location._startFrame = 0;
+	initWalk();			// needs to be pushed into subclass
+	initInventory();	// needs to be pushed into subclass
 
-	_location._comment = NULL;
-	_location._endComment = NULL;
-
-	initWalk();
-
-	initInventory();
-
 	_animations.push_front(&_vm->_char._ani);
 	_gfx = new Gfx(this);
 


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