[Scummvm-cvs-logs] SF.net SVN: scummvm: [29562] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sun Nov 18 22:32:23 CET 2007
Revision: 29562
http://scummvm.svn.sourceforge.net/scummvm/?rev=29562&view=rev
Author: peres001
Date: 2007-11-18 13:32:22 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/exec_ns.cpp
scummvm/trunk/engines/parallaction/inventory.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp 2007-11-18 21:16:27 UTC (rev 29561)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp 2007-11-18 21:32:22 UTC (rev 29562)
@@ -323,7 +323,7 @@
}
-void Parallaction_ns::jobDisplayAnimations(void *parm, Job *j) {
+void Parallaction_ns::drawAnimations() {
Graphics::Surface v14;
@@ -367,7 +367,7 @@
}
-void Parallaction_ns::jobEraseAnimations(void *arg_0, Job *j) {
+void Parallaction_ns::eraseAnimations() {
debugC(9, kDebugExec, "jobEraseAnimations");
for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); it++) {
@@ -380,11 +380,8 @@
r.moveTo(a->_oldPos);
_gfx->restoreBackground(r);
- if (arg_0) {
- a->_oldPos.x = a->_left;
- a->_oldPos.y = a->_top;
- }
-
+ a->_oldPos.x = a->_left;
+ a->_oldPos.y = a->_top;
}
return;
@@ -542,7 +539,6 @@
_gfx->flatBlitCnv(_char._head, 100, 152, Gfx::kBitFront);
_gfx->displayWrappedString(data->_description, 0, 90, 0, 130);
- jobEraseAnimations((void*)1, NULL);
_gfx->updateScreen();
waitUntilLeftClick();
@@ -845,7 +841,7 @@
-void Parallaction_ns::jobDisplayLabel(void *parm, Job *j) {
+void Parallaction_ns::drawLabel() {
if (!_label)
return;
@@ -860,7 +856,7 @@
return;
}
-void Parallaction_ns::jobEraseLabel(void *parm, Job *j) {
+void Parallaction_ns::eraseLabel() {
static uint16 count = 0;
Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp 2007-11-18 21:16:27 UTC (rev 29561)
+++ scummvm/trunk/engines/parallaction/inventory.cpp 2007-11-18 21:32:22 UTC (rev 29562)
@@ -109,7 +109,7 @@
-void Parallaction_ns::jobShowInventory(void *parm, Job *j) {
+void Parallaction_ns::showInventory() {
Common::Rect r;
_re->getRect(r);
_gfx->copyRect(Gfx::kBitBack, r, _re->getData(), INVENTORY_WIDTH);
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2007-11-18 21:16:27 UTC (rev 29561)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2007-11-18 21:32:22 UTC (rev 29562)
@@ -176,8 +176,6 @@
initInventory(); // needs to be pushed into subclass
- _jDrawLabel = NULL;
- _jEraseLabel = NULL;
_hoverZone = NULL;
_animations.push_front(&_char._ani);
@@ -287,16 +285,16 @@
changeLocation(_location._name);
}
- jobEraseLabel(0, 0);
- jobEraseAnimations((void*)1, 0);
+ eraseLabel();
+ eraseAnimations();
runJobs();
- jobDisplayAnimations(0, 0);
- jobDisplayLabel(0, 0);
+ drawAnimations();
+ drawLabel();
if (_engineFlags & kEngineInventory) {
- jobShowInventory(0, 0);
+ showInventory();
}
updateView();
@@ -893,8 +891,7 @@
_gfx->setPalette(pal);
jobRunScripts(NULL, NULL);
- jobEraseAnimations(NULL, NULL);
- jobDisplayAnimations(NULL, NULL);
+ drawAnimations();
_gfx->swapBuffers();
_gfx->copyScreen(Gfx::kBitFront, Gfx::kBitBack);
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2007-11-18 21:16:27 UTC (rev 29561)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2007-11-18 21:32:22 UTC (rev 29562)
@@ -488,7 +488,7 @@
Common::RandomSource _rnd;
- virtual void jobShowInventory(void*, Job*) = 0;
+ virtual void showInventory() = 0;
virtual void jobHideInventory(void*, Job*) = 0;
@@ -527,11 +527,7 @@
BackgroundInfo *_backgroundInfo;
- Job *_jDrawLabel;
- Job *_jEraseLabel;
Zone *_hoverZone;
-
- Job *_jDrawInventory;
Job *_jRunScripts;
@@ -583,16 +579,18 @@
virtual void parseLocation(const char* name) = 0;
- virtual void jobDisplayAnimations(void*, Job *j) = 0;
- virtual void jobEraseAnimations(void *arg_0, Job *j) = 0;
virtual void jobRunScripts(void*, Job *j) = 0;
virtual void jobDisplayDroppedItem(void*, Job *j) = 0;
virtual void jobRemovePickedItem(void*, Job *j) = 0;
virtual void jobToggleDoor(void*, Job *j) = 0;
virtual void jobWalk(void*, Job *j) = 0;
- virtual void jobDisplayLabel(void *parm, Job *j) = 0;
- virtual void jobEraseLabel(void *parm, Job *j) = 0;
+
+ virtual void drawAnimations() = 0;
+ virtual void eraseAnimations() = 0;
+ virtual void drawLabel() = 0;
+ virtual void eraseLabel() = 0;
+
void beep();
public:
@@ -737,18 +735,20 @@
const Callable *_callables;
protected:
- void jobDisplayAnimations(void*, Job *j);
- void jobEraseAnimations(void *arg_0, Job *j);
void jobRunScripts(void*, Job *j);
void jobDisplayDroppedItem(void*, Job *j);
void jobRemovePickedItem(void*, Job *j);
void jobToggleDoor(void*, Job *j);
void jobWalk(void*, Job *j);
- void jobDisplayLabel(void *parm, Job *j);
- void jobEraseLabel(void *parm, Job *j);
- void jobShowInventory(void *parm, Job *j);
void jobHideInventory(void *parm, Job *j);
+ void drawAnimations();
+ void eraseAnimations();
+ void drawLabel();
+ void eraseLabel();
+ void showInventory();
+
+
// location parser
OpcodeSet _locationParsers;
OpcodeSet _locationZoneParsers;
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2007-11-18 21:16:27 UTC (rev 29561)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2007-11-18 21:32:22 UTC (rev 29562)
@@ -358,14 +358,14 @@
void Parallaction_br::initJobs() {
static const JobFn jobs[] = {
- &Parallaction_br::jobDisplayAnimations,
- &Parallaction_br::jobEraseAnimations,
+ 0,
+ 0,
&Parallaction_br::jobDisplayDroppedItem,
&Parallaction_br::jobRemovePickedItem,
&Parallaction_br::jobRunScripts,
&Parallaction_br::jobWalk,
- &Parallaction_br::jobDisplayLabel,
- &Parallaction_br::jobEraseLabel,
+ 0,
+ 0,
&Parallaction_br::jobWaitRemoveLabelJob,
&Parallaction_br::jobToggleDoor,
&Parallaction_br::jobEraseSubtitle,
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2007-11-18 21:16:27 UTC (rev 29561)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2007-11-18 21:32:22 UTC (rev 29562)
@@ -256,9 +256,7 @@
changeLocation(_location._name);
-// addJob(kJobEraseAnimations, (void*)1, kPriority20);
_jRunScripts = addJob(kJobRunScripts, 0, kPriority15);
-// addJob(kJobDisplayAnimations, 0, kPriority3);
runGame();
@@ -460,7 +458,6 @@
_jobsFn = jobs;
- _jDrawInventory = 0;
_jRunScripts = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list