diff options
| author | Filippos Karapetis | 2010-05-14 15:21:00 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-14 15:21:00 +0000 |
| commit | 25bac3bef494aede6167734b7837c9308c9d9445 (patch) | |
| tree | 9711520f3d28105e2498b282cd83a9437f0edca8 /engines/sci | |
| parent | 94f1af2b4482c9447d05b95bdef058b5d085dc2a (diff) | |
| download | scummvm-rg350-25bac3bef494aede6167734b7837c9308c9d9445.tar.gz scummvm-rg350-25bac3bef494aede6167734b7837c9308c9d9445.tar.bz2 scummvm-rg350-25bac3bef494aede6167734b7837c9308c9d9445.zip | |
Silenced some MSVC warnings
svn-id: r49030
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/graphics/controls.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/text16.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/controls.cpp b/engines/sci/graphics/controls.cpp index 80670020df..f744d6e7f1 100644 --- a/engines/sci/graphics/controls.cpp +++ b/engines/sci/graphics/controls.cpp @@ -147,7 +147,7 @@ void GfxControls::kernelTexteditChange(reg_t controlObject, reg_t eventObject) { uint16 maxChars = GET_SEL32V(_segMan, controlObject, SELECTOR(max)); reg_t textReference = GET_SEL32(_segMan, controlObject, SELECTOR(text)); Common::String text; - uint16 textSize, eventType, eventKey; + uint16 textSize, eventType, eventKey = 0; bool textChanged = false; bool textAddChar = false; Common::Rect rect; @@ -251,7 +251,7 @@ int GfxControls::getPicNotValid() { } void GfxControls::kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite) { - int16 sci0EarlyPen, sci0EarlyBack; + int16 sci0EarlyPen = 0, sci0EarlyBack = 0; if (!hilite) { if (getSciVersion() == SCI_VERSION_0_EARLY) { // SCI0early actually used hardcoded green/black buttons instead of using the port colors diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp index c00803b8c1..952d13fbbd 100644 --- a/engines/sci/graphics/text16.cpp +++ b/engines/sci/graphics/text16.cpp @@ -159,7 +159,7 @@ static const uint16 text16_punctuationSjis[] = { // return max # of chars to fit maxwidth with full words, does not include breaking space int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgFontId) { - uint16 curChar; + uint16 curChar = 0; int16 maxChars = 0, curCharCount = 0; uint16 width = 0; GuiResourceId oldFontId = GetFontId(); |