diff --git a/engines/ultima8/std/string.h b/engines/ultima8/std/string.h index 092f9529ab9..27481b012fe 100644 --- a/engines/ultima8/std/string.h +++ b/engines/ultima8/std/string.h @@ -171,6 +171,22 @@ public: reverse_iterator rend() { return reverse_iterator(this, -1); } + + bool operator==(const string &x) const { + return !Compare(x); + } + + bool operator==(const char *x) const { + return !Compare(x); + } + + bool operator!=(const string &x) const { + return Compare(x) != 0; + } + + bool operator !=(const char *x) const { + return Compare(x) != 0; + } }; extern const char *const endl; diff --git a/engines/ultima8/ultima8.cpp b/engines/ultima8/ultima8.cpp index ecd26e28b33..2606210c5d4 100644 --- a/engines/ultima8/ultima8.cpp +++ b/engines/ultima8/ultima8.cpp @@ -1292,31 +1292,12 @@ void Ultima8Engine::handleEvent(const Common::Event &event) { break; } - case Common::EVENT_KEYDOWN: { - if (_mouse->dragging() != Mouse::DRAG_NOT) break; + case Common::EVENT_KEYDOWN: + if (_mouse->dragging() != Mouse::DRAG_NOT) + break; - /* - switch (event.kbd.keycode) { - case Common::KEYCODE_KP_PLUS: { - midi_volume+=8; - if (midi_volume>255) midi_volume =255; - pout << "Midi Volume is now: " << midi_volume << std::endl; - if (midi_driver) midi_driver->setGlobalVolume(midi_volume); - } break; - case Common::KEYCODE_KP_MINUS: { - midi_volume-=8; - if (midi_volume<0) midi_volume = 0; - pout << "Midi Volume is now: " << midi_volume << std::endl; - if (midi_driver) midi_driver->setGlobalVolume(midi_volume); - } break; - default: - break; - } - */ + // Any special key handling goes here break; - } - - // any more useful events? default: break;