[Scummvm-cvs-logs] SF.net SVN: scummvm: [28829] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sun Sep 2 21:00:22 CEST 2007
Revision: 28829
http://scummvm.svn.sourceforge.net/scummvm/?rev=28829&view=rev
Author: peres001
Date: 2007-09-02 12:00:22 -0700 (Sun, 02 Sep 2007)
Log Message:
-----------
More support for subtitles in BRA.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/exec_br.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parser_br.cpp
Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp 2007-09-02 18:34:11 UTC (rev 28828)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp 2007-09-02 19:00:22 UTC (rev 28829)
@@ -45,6 +45,7 @@
#define DECLARE_INSTRUCTION_OPCODE(op) void Parallaction_br::instOp_##op()
void Parallaction_br::setupSubtitles(char *s, char *s2, int y) {
+ debugC(5, kDebugLocation, "setupSubtitles(%s, %s, %i)", s, s2, y);
if (!scumm_stricmp("clear", s)) {
@@ -549,4 +550,32 @@
}
+void Parallaction_br::jobWaitRemoveLabelJob(void *parm, Job *job) {
+
+}
+
+
+void Parallaction_br::jobWaitRemoveSubtitleJob(void *parm, Job *job) {
+
+}
+
+
+void Parallaction_br::jobPauseSfx(void *parm, Job *job) {
+
+}
+
+
+void Parallaction_br::jobStopFollower(void *parm, Job *job) {
+
+}
+
+
+void Parallaction_br::jobScroll(void *parm, Job *job) {
+
+}
+
+
+
+
+
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2007-09-02 18:34:11 UTC (rev 28828)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2007-09-02 19:00:22 UTC (rev 28829)
@@ -940,7 +940,7 @@
void initParsers();
void initJobs();
- typedef void (*JobFn)(void*, Job*);
+ typedef void (Parallaction_br::*JobFn)(void*, Job*);
const JobFn *_jobsFn;
JobOpcode* createJobOpcode(uint functionId, Job *job);
@@ -1091,10 +1091,15 @@
Job *_jDisplaySubtitle;
Job *_jEraseSubtitle;
+ void setupSubtitles(char *s, char *s2, int y);
+ void jobWaitRemoveLabelJob(void *parm, Job *job);
void jobDisplaySubtitle(void *parm, Job *job);
void jobEraseSubtitle(void *parm, Job *job);
- void setupSubtitles(char *s, char *s2, int y);
+ void jobWaitRemoveSubtitleJob(void *parm, Job *job);
+ void jobPauseSfx(void *parm, Job *job);
+ void jobStopFollower(void *parm, Job *job);
+ void jobScroll(void *parm, Job *job);
};
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2007-09-02 18:34:11 UTC (rev 28828)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2007-09-02 19:00:22 UTC (rev 28829)
@@ -81,6 +81,7 @@
_activeZone2 = 0;
+ initJobs();
initResources();
initFonts();
initCursors();
@@ -358,7 +359,7 @@
}
void Parallaction_br::initJobs() {
-/*
+
static const JobFn jobs[] = {
&Parallaction_br::jobDisplayAnimations,
&Parallaction_br::jobEraseAnimations,
@@ -366,12 +367,12 @@
&Parallaction_br::jobRemovePickedItem,
&Parallaction_br::jobRunScripts,
&Parallaction_br::jobWalk,
- &Parallaction_br::jobDrawLabel,
+ &Parallaction_br::jobDisplayLabel,
&Parallaction_br::jobEraseLabel,
&Parallaction_br::jobWaitRemoveLabelJob,
&Parallaction_br::jobToggleDoor,
- &Parallaction_br::jobClearSubtitle,
- &Parallaction_br::jobDrawSubtitle,
+ &Parallaction_br::jobEraseSubtitle,
+ &Parallaction_br::jobDisplaySubtitle,
&Parallaction_br::jobWaitRemoveSubtitleJob,
&Parallaction_br::jobPauseSfx,
&Parallaction_br::jobStopFollower,
@@ -379,13 +380,10 @@
};
_jobsFn = jobs;
-*/
-
}
JobOpcode* Parallaction_br::createJobOpcode(uint functionId, Job *job) {
- //return new OpcodeImpl2<Parallaction_br>(this, _jobsFn[functionId], job);
- return 0;
+ return new OpcodeImpl2<Parallaction_br>(this, _jobsFn[functionId], job);
}
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp 2007-09-02 18:34:11 UTC (rev 28828)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp 2007-09-02 19:00:22 UTC (rev 28829)
@@ -740,7 +740,7 @@
COMMAND_PARSER(zone), // leave
COMMAND_PARSER(math), // inc
COMMAND_PARSER(math), // dec
- COMMAND_PARSER(math), // test
+ COMMAND_PARSER(test), // test
COMMAND_PARSER(invalid),
COMMAND_PARSER(invalid),
COMMAND_PARSER(math), // let
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