diff options
| -rw-r--r-- | engines/parallaction/exec_br.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/objects.cpp | 10 | ||||
| -rw-r--r-- | engines/parallaction/objects.h | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp index b21c67ab0e..37eec54f6a 100644 --- a/engines/parallaction/exec_br.cpp +++ b/engines/parallaction/exec_br.cpp @@ -70,6 +70,7 @@ typedef OpcodeImpl<Parallaction_br> OpcodeV2; #define DECLARE_INSTRUCTION_OPCODE(op) void Parallaction_br::instOp_##op() void Parallaction_br::setupSubtitles(char *s, char *s2, int y) { +#if 0 debugC(5, kDebugExec, "setupSubtitles(%s, %s, %i)", s, s2, y); if (!scumm_stricmp("clear", s)) { @@ -109,6 +110,7 @@ void Parallaction_br::setupSubtitles(char *s, char *s2, int y) { _jDisplaySubtitle = addJob(kJobDisplaySubtitle, 0, 1); _jEraseSubtitle = addJob(kJobEraseSubtitle, 0, 20); } +#endif } diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp index cac1c5e148..1135724cd5 100644 --- a/engines/parallaction/objects.cpp +++ b/engines/parallaction/objects.cpp @@ -192,7 +192,6 @@ uint16 Zone::height() const { Label::Label() { resetPosition(); - _text = 0; } Label::~Label() { @@ -201,9 +200,6 @@ Label::~Label() { void Label::free() { _cnv.free(); - ::free(_text); - _text = 0; - resetPosition(); } @@ -212,12 +208,6 @@ void Label::resetPosition() { _pos.y = -1000; } -void Label::getRect(Common::Rect &r) { - r.setWidth(_cnv.w); - r.setHeight(_cnv.h); - r.moveTo(_pos); -} - Answer::Answer() { _text = NULL; _mood = 0; diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index 5648ea25fb..4bd290fb6b 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -258,7 +258,6 @@ struct TypeData { }; struct Label { - char* _text; Graphics::Surface _cnv; Common::Point _pos; @@ -268,7 +267,6 @@ struct Label { void free(); void resetPosition(); - void getRect(Common::Rect &r); }; #define ZONENAME_LENGTH 32 |