diff options
Diffstat (limited to 'engines/mutationofjb/widgets')
-rw-r--r-- | engines/mutationofjb/widgets/buttonwidget.cpp | 4 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/buttonwidget.h | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/conversationwidget.cpp | 3 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/conversationwidget.h | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/imagewidget.cpp | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/imagewidget.h | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/inventorywidget.cpp | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/inventorywidget.h | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/widget.cpp | 2 | ||||
-rw-r--r-- | engines/mutationofjb/widgets/widget.h | 3 |
10 files changed, 12 insertions, 12 deletions
diff --git a/engines/mutationofjb/widgets/buttonwidget.cpp b/engines/mutationofjb/widgets/buttonwidget.cpp index 911cb7d7df..e2a9dd3b65 100644 --- a/engines/mutationofjb/widgets/buttonwidget.cpp +++ b/engines/mutationofjb/widgets/buttonwidget.cpp @@ -62,7 +62,9 @@ void ButtonWidget::handleEvent(const Common::Event &event) { break; } } -void ButtonWidget::_draw(Graphics::ManagedSurface &surface) { + +void ButtonWidget::draw(Graphics::ManagedSurface &surface) { surface.blitFrom(_pressed ? _pressedSurface : _normalSurface, Common::Point(_area.left, _area.top)); } + } diff --git a/engines/mutationofjb/widgets/buttonwidget.h b/engines/mutationofjb/widgets/buttonwidget.h index de8cb631f5..d148fa8727 100644 --- a/engines/mutationofjb/widgets/buttonwidget.h +++ b/engines/mutationofjb/widgets/buttonwidget.h @@ -44,7 +44,7 @@ public: virtual void handleEvent(const Common::Event &event) override; protected: - virtual void _draw(Graphics::ManagedSurface &) override; + virtual void draw(Graphics::ManagedSurface &) override; private: Graphics::Surface _normalSurface; diff --git a/engines/mutationofjb/widgets/conversationwidget.cpp b/engines/mutationofjb/widgets/conversationwidget.cpp index e0bbf6645f..56e00579d3 100644 --- a/engines/mutationofjb/widgets/conversationwidget.cpp +++ b/engines/mutationofjb/widgets/conversationwidget.cpp @@ -59,7 +59,7 @@ void ConversationWidget::clearChoices() { markDirty(); } -void ConversationWidget::_draw(Graphics::ManagedSurface &surface) { +void ConversationWidget::draw(Graphics::ManagedSurface &surface) { surface.blitFrom(_surface, Common::Point(_area.left, _area.top)); for (int i = 0; i < CONVERSATION_MAX_CHOICES; ++i) { @@ -94,4 +94,3 @@ void ConversationWidget::handleEvent(const Common::Event &event) { } } - diff --git a/engines/mutationofjb/widgets/conversationwidget.h b/engines/mutationofjb/widgets/conversationwidget.h index abde70205b..34ea2152e8 100644 --- a/engines/mutationofjb/widgets/conversationwidget.h +++ b/engines/mutationofjb/widgets/conversationwidget.h @@ -51,7 +51,7 @@ public: virtual void handleEvent(const Common::Event &event) override; protected: - virtual void _draw(Graphics::ManagedSurface &surface) override; + virtual void draw(Graphics::ManagedSurface &surface) override; private: Graphics::Surface _surface; diff --git a/engines/mutationofjb/widgets/imagewidget.cpp b/engines/mutationofjb/widgets/imagewidget.cpp index 3395da8afa..8eeb7ed5e5 100644 --- a/engines/mutationofjb/widgets/imagewidget.cpp +++ b/engines/mutationofjb/widgets/imagewidget.cpp @@ -30,7 +30,7 @@ ImageWidget::ImageWidget(Gui &gui, const Common::Rect &area, const Graphics::Sur _image(image) {} -void ImageWidget::_draw(Graphics::ManagedSurface &surface) { +void ImageWidget::draw(Graphics::ManagedSurface &surface) { surface.blitFrom(_image, Common::Point(_area.left, _area.top)); } diff --git a/engines/mutationofjb/widgets/imagewidget.h b/engines/mutationofjb/widgets/imagewidget.h index 4585a72ee8..da3dd36d69 100644 --- a/engines/mutationofjb/widgets/imagewidget.h +++ b/engines/mutationofjb/widgets/imagewidget.h @@ -33,7 +33,7 @@ public: ImageWidget(Gui &gui, const Common::Rect &area, const Graphics::Surface &image); protected: - virtual void _draw(Graphics::ManagedSurface &surface) override; + virtual void draw(Graphics::ManagedSurface &surface) override; private: Graphics::Surface _image; diff --git a/engines/mutationofjb/widgets/inventorywidget.cpp b/engines/mutationofjb/widgets/inventorywidget.cpp index 96f35e4cb2..a26bab6c7e 100644 --- a/engines/mutationofjb/widgets/inventorywidget.cpp +++ b/engines/mutationofjb/widgets/inventorywidget.cpp @@ -63,7 +63,7 @@ void InventoryWidget::drawInventoryItem(Graphics::ManagedSurface &surface, const surface.blitFrom(_surfaces[surfaceNo], sourceRect, destStartPos); } -void InventoryWidget::_draw(Graphics::ManagedSurface &surface) { +void InventoryWidget::draw(Graphics::ManagedSurface &surface) { Inventory &inventory = _gui.getGame().getGameData().getInventory(); const Inventory::Items &items = inventory.getItems(); surface.fillRect(_area, 0x00); diff --git a/engines/mutationofjb/widgets/inventorywidget.h b/engines/mutationofjb/widgets/inventorywidget.h index 8d6205e1ef..f1841e8668 100644 --- a/engines/mutationofjb/widgets/inventorywidget.h +++ b/engines/mutationofjb/widgets/inventorywidget.h @@ -35,7 +35,7 @@ namespace MutationOfJB { class InventoryWidget : public Widget { public: InventoryWidget(Gui &gui, Gui::InventoryMap &inventoryMap, const Common::Array<Graphics::Surface> &inventorySurfaces); - virtual void _draw(Graphics::ManagedSurface &) override; + virtual void draw(Graphics::ManagedSurface &) override; private: void drawInventoryItem(Graphics::ManagedSurface &surface, const Common::String &item, int pos); diff --git a/engines/mutationofjb/widgets/widget.cpp b/engines/mutationofjb/widgets/widget.cpp index 5503f625cd..b0302110ea 100644 --- a/engines/mutationofjb/widgets/widget.cpp +++ b/engines/mutationofjb/widgets/widget.cpp @@ -54,7 +54,7 @@ bool Widget::isDirty() const { void Widget::update(Graphics::ManagedSurface &surface) { if (_dirty) { if (_visible) { - _draw(surface); + draw(surface); } _dirty = false; } diff --git a/engines/mutationofjb/widgets/widget.h b/engines/mutationofjb/widgets/widget.h index a88f628553..e16b1e4447 100644 --- a/engines/mutationofjb/widgets/widget.h +++ b/engines/mutationofjb/widgets/widget.h @@ -55,7 +55,7 @@ public: virtual void handleEvent(const Common::Event &) {} protected: - virtual void _draw(Graphics::ManagedSurface &) = 0; + virtual void draw(Graphics::ManagedSurface &) = 0; Gui &_gui; Common::Rect _area; @@ -67,4 +67,3 @@ protected: } #endif - |