From 899fdcb3677925a8c1d9b4c9335ae17a2f1cccff Mon Sep 17 00:00:00 2001 From: Nicola Mettifogo Date: Sat, 2 Feb 2008 22:45:31 +0000 Subject: Enabled rudimentary location switch in BRA. svn-id: r30748 --- engines/parallaction/exec_br.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engines/parallaction/exec_br.cpp') diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp index 69e64f6e5d..567d5ecf79 100644 --- a/engines/parallaction/exec_br.cpp +++ b/engines/parallaction/exec_br.cpp @@ -72,8 +72,7 @@ typedef OpcodeImpl OpcodeV2; void Parallaction_br::setupSubtitles(char *s, char *s2, int y) { debugC(5, kDebugExec, "setupSubtitles(%s, %s, %i)", s, s2, y); - _gfx->freeLabels(); - _subtitle[0] = _subtitle[1] = -1; + clearSubtitles(); if (!scumm_stricmp("clear", s)) { return; @@ -95,10 +94,17 @@ void Parallaction_br::setupSubtitles(char *s, char *s2, int y) { _subtitleLipSync = 0; } +void Parallaction_br::clearSubtitles() { + _gfx->freeLabels(); + _subtitle[0] = _subtitle[1] = -1; +} DECLARE_COMMAND_OPCODE(location) { warning("Parallaction_br::cmdOp_location command not yet implemented"); + + // TODO: handle startPos and startPos2 + scheduleLocationSwitch(_cmdRunCtxt.cmd->u._string); } @@ -545,12 +551,6 @@ void Parallaction_br::jobWaitRemoveLabelJob(void *parm, Job *job) { } - -void Parallaction_br::jobWaitRemoveSubtitleJob(void *parm, Job *job) { - -} - - void Parallaction_br::jobPauseSfx(void *parm, Job *job) { } -- cgit v1.2.3