aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2013-05-01 01:35:45 +0300
committerFilippos Karapetis2013-05-01 01:51:11 +0300
commit3012aaa14f2fb4db2139214e9a7a838913ed9a6b (patch)
tree179f0809f622ab489dc7ad42cf02534ada02a1d3 /engines/sci
parent66fce6d15608670c0cc957af9c1f7158af39fa71 (diff)
downloadscummvm-rg350-3012aaa14f2fb4db2139214e9a7a838913ed9a6b.tar.gz
scummvm-rg350-3012aaa14f2fb4db2139214e9a7a838913ed9a6b.tar.bz2
scummvm-rg350-3012aaa14f2fb4db2139214e9a7a838913ed9a6b.zip
SCI: Fix a non-initialized variable in GfxControls16 - CID 1003114
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/controls16.cpp7
-rw-r--r--engines/sci/graphics/controls16.h1
2 files changed, 2 insertions, 6 deletions
diff --git a/engines/sci/graphics/controls16.cpp b/engines/sci/graphics/controls16.cpp
index 7c09969717..0098f7b9ef 100644
--- a/engines/sci/graphics/controls16.cpp
+++ b/engines/sci/graphics/controls16.cpp
@@ -42,16 +42,13 @@ namespace Sci {
GfxControls16::GfxControls16(SegManager *segMan, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen)
: _segMan(segMan), _ports(ports), _paint16(paint16), _text16(text16), _screen(screen) {
- init();
+ _texteditBlinkTime = 0;
+ _texteditCursorVisible = false;
}
GfxControls16::~GfxControls16() {
}
-void GfxControls16::init() {
- _texteditCursorVisible = false;
-}
-
const char controlListUpArrow[2] = { 0x18, 0 };
const char controlListDownArrow[2] = { 0x19, 0 };
diff --git a/engines/sci/graphics/controls16.h b/engines/sci/graphics/controls16.h
index 90bd7beacb..2cde86d4b1 100644
--- a/engines/sci/graphics/controls16.h
+++ b/engines/sci/graphics/controls16.h
@@ -63,7 +63,6 @@ public:
void kernelTexteditChange(reg_t controlObject, reg_t eventObject);
private:
- void init();
void texteditSetBlinkTime();
void drawListControl(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const char **entries, GuiResourceId fontId, int16 upperPos, int16 cursorPos, bool isAlias);