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

[peres001 at users.sourceforge.net]

Revision: 26189
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26189&view=rev
Author:   peres001
Date:     2007-03-18 01:15:54 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
fixed usage of reference operator

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/animation.cpp
    scummvm/trunk/engines/parallaction/inventory.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/zone.cpp

Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp	2007-03-18 01:45:14 UTC (rev 26188)
+++ scummvm/trunk/engines/parallaction/animation.cpp	2007-03-18 08:15:54 UTC (rev 26189)
@@ -566,7 +566,7 @@
 
 			case INST_MOVE: // move
 				v4 = buildWalkPath(*inst->_opA._pvalue, *inst->_opB._pvalue);
-				_vm->addJob(jobWalk, v4, kPriority19 );
+				_vm->addJob(&jobWalk, v4, kPriority19 );
 				_engineFlags |= kEngineWalking;
 				break;
 

Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp	2007-03-18 01:45:14 UTC (rev 26188)
+++ scummvm/trunk/engines/parallaction/inventory.cpp	2007-03-18 08:15:54 UTC (rev 26189)
@@ -125,7 +125,7 @@
 	_inventory[_si]._id = MAKE_INVENTORY_ID(z->u.get->_icon);
 	_inventory[_si]._index = z->u.get->_icon;
 
-	_vm->addJob(jobRemovePickedItem, z, kPriority17 );
+	_vm->addJob(&jobRemovePickedItem, z, kPriority17 );
 
 	if (_inventory[_si]._id == 0) return 0;
 

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-18 01:45:14 UTC (rev 26188)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-18 08:15:54 UTC (rev 26189)
@@ -360,9 +360,9 @@
 
 void Parallaction::runGame() {
 
-	addJob(jobEraseAnimations, (void*)1, kPriority20);
-	_jRunScripts = addJob(jobRunScripts, 0, kPriority15);
-	addJob(jobDisplayAnimations, 0, kPriority3);
+	addJob(&jobEraseAnimations, (void*)1, kPriority20);
+	_jRunScripts = addJob(&jobRunScripts, 0, kPriority15);
+	addJob(&jobDisplayAnimations, 0, kPriority3);
 
 	_gfx->copyScreen(Gfx::kBitBack, Gfx::kBit2);
 
@@ -508,7 +508,7 @@
 		if (_vm->_char._ani._zone._flags & kFlagsRemove) break;
 		if ((_vm->_char._ani._zone._flags & kFlagsActive) == 0) break;
 		v4 = buildWalkPath(data->_mousePos._x, data->_mousePos._y);
-		addJob(jobWalk, v4, kPriority19);
+		addJob(&jobWalk, v4, kPriority19);
 		_engineFlags |= kEngineWalking; 								   // inhibits processing of input until walking is over
 		break;
 

Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp	2007-03-18 01:45:14 UTC (rev 26188)
+++ scummvm/trunk/engines/parallaction/zone.cpp	2007-03-18 08:15:54 UTC (rev 26189)
@@ -456,7 +456,7 @@
 		if (z->_flags & kFlagsLocked) break;
 		z->_flags ^= kFlagsClosed;
 		if (z->u.door->_cnv._count == 0) break;
-		_vm->addJob(jobToggleDoor, z, kPriority18 );
+		_vm->addJob(&jobToggleDoor, z, kPriority18 );
 		break;
 
 	case kZoneHear:


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