diff options
author | Strangerke | 2017-09-18 22:46:21 +0200 |
---|---|---|
committer | Thierry Crozat | 2018-01-23 02:15:32 +0000 |
commit | 4c9fc3cdbc0ff8a90a9af267fc63e8cf92e0f671 (patch) | |
tree | 477e92def80de2bbbacbc09c7e317be4281fd86b | |
parent | 2e79e243929dd7f2c3db83e79c673dee573c4875 (diff) | |
download | scummvm-rg350-4c9fc3cdbc0ff8a90a9af267fc63e8cf92e0f671.tar.gz scummvm-rg350-4c9fc3cdbc0ff8a90a9af267fc63e8cf92e0f671.tar.bz2 scummvm-rg350-4c9fc3cdbc0ff8a90a9af267fc63e8cf92e0f671.zip |
SUPERNOVA: Fix compilation using MSVC9, silent some CppCheck warnings
-rw-r--r-- | engines/supernova/graphics.cpp | 10 | ||||
-rw-r--r-- | engines/supernova/rooms.cpp | 14 | ||||
-rw-r--r-- | engines/supernova/state.cpp | 7 |
3 files changed, 17 insertions, 14 deletions
diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp index df3b706d10..657f27d50c 100644 --- a/engines/supernova/graphics.cpp +++ b/engines/supernova/graphics.cpp @@ -32,9 +32,13 @@ namespace Supernova { -MSNImageDecoder::MSNImageDecoder() - : _palette(NULL) - , _encodedImage(NULL) { +MSNImageDecoder::MSNImageDecoder() { + _palette = nullptr; + _encodedImage = nullptr; + _filenumber = -1; + _pitch = 0; + _numSections = 0; + _numClickFields = 0; } MSNImageDecoder::~MSNImageDecoder() { diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 484f1ca056..3835932e51 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -72,10 +72,9 @@ bool Room::deserialize(Common::ReadStream *in) { _shown[i] = in->readByte(); int numObjects = in->readSint32LE(); - int stringLength = 0; Common::SeekableReadStream *stream = NULL; for (int i = 0; i < numObjects; ++i) { - stringLength = in->readUint32LE(); + int stringLength = in->readUint32LE(); if (stringLength) { stream = in->readStream(stringLength); _objectState[i]._name = stream->readLine(); @@ -659,9 +658,9 @@ void ShipSleepCabin::onEntrance() { bool ShipCockpit::interact(Action verb, Object &obj1, Object &obj2) { // TODO: distance and remaining time not accurate - char c[2] = {0}; if ((verb == ACTION_LOOK) && (obj1._id == MONITOR)) { + char c[2] = {0, 0}; _gm->_guiEnabled = false; _vm->renderBox(0, 0, 320, 200, kColorBlack); _vm->renderText("Geschwindigkeit: ", 50, 50, kColorLightYellow); @@ -2059,14 +2058,13 @@ bool ArsanoMeetup2::interact(Action verb, Object &obj1, Object &obj2) { byte zeilen3[4] = {1, 1, 1, 1}; byte zeilen4[2] = {2, 1}; - bool found, flight; - if (((verb == ACTION_WALK) && ((obj1._id == SPACESHIP) || (obj1._id == ROGER_W))) || ((verb == ACTION_TALK) && (obj1._id == ROGER_W))) { _gm->changeRoom(INTRO); _vm->renderImage(30, 0); _vm->paletteBrightness(); + bool found; if (_gm->_rooms[MEETUP2]->isSectionVisible(kMaxSection - 2)) { _gm->reply("Was wollen Sie denn schon wieder?", 1, 1 + 128); found = !_gm->dialog(2, nullptr, nullptr, 0); // row4, dialog4 @@ -2084,7 +2082,7 @@ bool ArsanoMeetup2::interact(Action verb, Object &obj1, Object &obj2) { _gm->_inventory.remove(*_gm->_rooms[ROGER]->getObject(8)); _gm->reply("Oh! Vielen Dank.", 1, 1 + 128); _gm->reply("Wo ist denn Ihr Raumschiff?|Soll ich Sie ein St\201ck mitnehmen?", 1, 1 + 128); - flight = _gm->dialog(2, nullptr, nullptr, 0); // row2, dialog2 + bool flight = _gm->dialog(2, nullptr, nullptr, 0); // row2, dialog2 if (flight) { _gm->reply("Wo wollen Sie denn hin?", 1, 1 + 128); _gm->dialog(4, nullptr, nullptr, 0); // row3, dialog3 @@ -2196,9 +2194,9 @@ bool ArsanoMeetup3::interact(Action verb, Object &obj1, Object &obj2) { _gm->wait2(10); _gm->reply("Ja, sieht so aus.", 1, 1 + 128); - int i; do { - switch (i = _gm->dialog(4, nullptr, nullptr, 2)) { // row2, dialog2 + int i = _gm->dialog(4, nullptr, nullptr, 2); // row2, dialog2 + switch (i) { case 0: _gm->reply("Sie befinden sich im Raumschiff \"Dexxa\".", 1, 1 + 128); _gm->reply("Wir kommen vom Planeten Axacuss und|sind aus dem gleichen Grund hier wie Sie,|n„mlich zur Erforschung der Supernova.", 1, 1 + 128); diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index 52b7aaa7d7..6a586df466 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -170,15 +170,16 @@ Object *Inventory::get(ObjectID id) const { GuiElement::GuiElement() - : _text("") - , _isHighlighted(false) + : _isHighlighted(false) , _bgColorNormal(kColorWhite25) , _bgColorHighlighted(kColorWhite44) , _bgColor(kColorWhite25) , _textColorNormal(kColorGreen) , _textColorHighlighted(kColorLightGreen) , _textColor(kColorGreen) -{} +{ + _text[0] = '\0'; +} void GuiElement::setText(const char *text) { strncpy(_text, text, sizeof(_text)); |