aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2007-03-18 08:15:54 +0000
committerNicola Mettifogo2007-03-18 08:15:54 +0000
commit5ffd410e309171f139f9d71f47bd4309baac8af4 (patch)
treec851111d1f257e41f900c2c7be9ee5bb04f4b8d1
parent08d82864109807b5d5a2896bc261564b698731e7 (diff)
downloadscummvm-rg350-5ffd410e309171f139f9d71f47bd4309baac8af4.tar.gz
scummvm-rg350-5ffd410e309171f139f9d71f47bd4309baac8af4.tar.bz2
scummvm-rg350-5ffd410e309171f139f9d71f47bd4309baac8af4.zip
fixed usage of reference operator
svn-id: r26189
-rw-r--r--engines/parallaction/animation.cpp2
-rw-r--r--engines/parallaction/inventory.cpp2
-rw-r--r--engines/parallaction/parallaction.cpp8
-rw-r--r--engines/parallaction/zone.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/parallaction/animation.cpp b/engines/parallaction/animation.cpp
index a3256e6b12..b0e199bc8a 100644
--- a/engines/parallaction/animation.cpp
+++ b/engines/parallaction/animation.cpp
@@ -566,7 +566,7 @@ void jobRunScripts(void *parm, Job *j) {
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;
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp
index ab9a458c57..aed5ce2a18 100644
--- a/engines/parallaction/inventory.cpp
+++ b/engines/parallaction/inventory.cpp
@@ -125,7 +125,7 @@ int16 pickupItem(Zone *z) {
_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;
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 084300e37d..5781c226ba 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -360,9 +360,9 @@ void waitUntilLeftClick() {
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 @@ void Parallaction::processInput(InputData *data) {
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;
diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp
index dbc4d1dab1..a42f29e06a 100644
--- a/engines/parallaction/zone.cpp
+++ b/engines/parallaction/zone.cpp
@@ -456,7 +456,7 @@ uint16 runZone(Zone *z) {
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: