From 561309eaa2fb2d5298567366068ac9daafc7c2f7 Mon Sep 17 00:00:00 2001
From: Ľubomír Remák
Date: Sun, 19 Aug 2018 16:29:41 +0200
Subject: MUTATIONOFJB: Fix missing lines between block ends.

---
 engines/mutationofjb/commands/changecommand.cpp       | 1 +
 engines/mutationofjb/commands/conditionalcommand.cpp  | 5 ++---
 engines/mutationofjb/commands/definestructcommand.cpp | 1 +
 engines/mutationofjb/commands/definestructcommand.h   | 1 +
 engines/mutationofjb/commands/ifcommand.cpp           | 5 ++---
 engines/mutationofjb/commands/ifitemcommand.cpp       | 4 +---
 engines/mutationofjb/commands/ifpiggycommand.cpp      | 1 -
 engines/mutationofjb/commands/labelcommand.cpp        | 1 +
 engines/mutationofjb/commands/newroomcommand.cpp      | 1 -
 engines/mutationofjb/commands/randomcommand.cpp       | 2 ++
 engines/mutationofjb/commands/seqcommand.h            | 1 -
 engines/mutationofjb/debug.h                          | 1 -
 engines/mutationofjb/detection.cpp                    | 1 -
 engines/mutationofjb/mutationofjb.cpp                 | 1 -
 engines/mutationofjb/mutationofjb.h                   | 1 -
 engines/mutationofjb/script.cpp                       | 3 +--
 engines/mutationofjb/util.cpp                         | 1 -
 engines/mutationofjb/util.h                           | 1 -
 engines/mutationofjb/widgets/buttonwidget.cpp         | 4 +++-
 engines/mutationofjb/widgets/buttonwidget.h           | 2 +-
 engines/mutationofjb/widgets/conversationwidget.cpp   | 3 +--
 engines/mutationofjb/widgets/conversationwidget.h     | 2 +-
 engines/mutationofjb/widgets/imagewidget.cpp          | 2 +-
 engines/mutationofjb/widgets/imagewidget.h            | 2 +-
 engines/mutationofjb/widgets/inventorywidget.cpp      | 2 +-
 engines/mutationofjb/widgets/inventorywidget.h        | 2 +-
 engines/mutationofjb/widgets/widget.cpp               | 2 +-
 engines/mutationofjb/widgets/widget.h                 | 3 +--
 28 files changed, 24 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/mutationofjb/commands/changecommand.cpp b/engines/mutationofjb/commands/changecommand.cpp
index 7d2e7e6910..e3c8a993c5 100644
--- a/engines/mutationofjb/commands/changecommand.cpp
+++ b/engines/mutationofjb/commands/changecommand.cpp
@@ -556,4 +556,5 @@ Command::ExecuteResult ChangeSceneCommand::execute(ScriptExecutionContext &scrip
 Common::String ChangeSceneCommand::debugString() const {
 	return Common::String::format("SCENE%d.%s %s %s", _sceneId, getRegisterAsString(), getOperationAsString(), getValueAsString().c_str());
 }
+
 }
diff --git a/engines/mutationofjb/commands/conditionalcommand.cpp b/engines/mutationofjb/commands/conditionalcommand.cpp
index 27b271409a..2a6b36a979 100644
--- a/engines/mutationofjb/commands/conditionalcommand.cpp
+++ b/engines/mutationofjb/commands/conditionalcommand.cpp
@@ -46,9 +46,7 @@ void ConditionalCommandParser::finish(ScriptParseContext &) {
 ConditionalCommand::ConditionalCommand() :
 	_trueCommand(nullptr),
 	_falseCommand(nullptr),
-	_cachedResult(false)
-{}
-
+	_cachedResult(false) {}
 
 Command *ConditionalCommand::getTrueCommand() const {
 	return _trueCommand;
@@ -73,4 +71,5 @@ Command *ConditionalCommand::next() const {
 		return _falseCommand;
 	}
 }
+
 }
diff --git a/engines/mutationofjb/commands/definestructcommand.cpp b/engines/mutationofjb/commands/definestructcommand.cpp
index bea3497a3d..455e2433ab 100644
--- a/engines/mutationofjb/commands/definestructcommand.cpp
+++ b/engines/mutationofjb/commands/definestructcommand.cpp
@@ -96,4 +96,5 @@ Command::ExecuteResult DefineStructCommand::execute(ScriptExecutionContext &scri
 Common::String DefineStructCommand::debugString() const {
 	return "DEFINE_STRUCT <data omitted>";
 }
+
 }
diff --git a/engines/mutationofjb/commands/definestructcommand.h b/engines/mutationofjb/commands/definestructcommand.h
index 13fc910403..651f9439c7 100644
--- a/engines/mutationofjb/commands/definestructcommand.h
+++ b/engines/mutationofjb/commands/definestructcommand.h
@@ -38,4 +38,5 @@ public:
 private:
 	ConversationInfo _conversationInfo;
 };
+
 }
diff --git a/engines/mutationofjb/commands/ifcommand.cpp b/engines/mutationofjb/commands/ifcommand.cpp
index 06fb5ca4c6..9c435881b7 100644
--- a/engines/mutationofjb/commands/ifcommand.cpp
+++ b/engines/mutationofjb/commands/ifcommand.cpp
@@ -77,12 +77,12 @@ bool IfCommandParser::parse(const Common::String &line, ScriptParseContext &, Co
 	return true;
 }
 
+
 IfCommand::IfCommand(uint8 sceneId, uint8 objectId, uint16 value, bool negative) :
 	_sceneId(sceneId),
 	_objectId(objectId),
 	_value(value),
-	_negative(negative)
-{}
+	_negative(negative) {}
 
 Command::ExecuteResult IfCommand::execute(ScriptExecutionContext &scriptExecCtx) {
 	Scene *const scene = scriptExecCtx.getGameData().getScene(_sceneId);
@@ -108,4 +108,3 @@ Common::String IfCommand::debugString() const {
 }
 
 }
-
diff --git a/engines/mutationofjb/commands/ifitemcommand.cpp b/engines/mutationofjb/commands/ifitemcommand.cpp
index eec4621292..ccbf09e8af 100644
--- a/engines/mutationofjb/commands/ifitemcommand.cpp
+++ b/engines/mutationofjb/commands/ifitemcommand.cpp
@@ -70,8 +70,7 @@ bool IfItemCommandParser::parse(const Common::String &line, ScriptParseContext &
 
 IfItemCommand::IfItemCommand(const Common::String &item, bool negative) :
 	_item(item),
-	_negative(negative)
-{}
+	_negative(negative) {}
 
 Command::ExecuteResult IfItemCommand::execute(ScriptExecutionContext &scriptExecCtx) {
 	_cachedResult = scriptExecCtx.getGameData()._inventory.hasItem(_item);
@@ -87,4 +86,3 @@ Common::String IfItemCommand::debugString() const {
 }
 
 }
-
diff --git a/engines/mutationofjb/commands/ifpiggycommand.cpp b/engines/mutationofjb/commands/ifpiggycommand.cpp
index e3107806ec..d500b4adf2 100644
--- a/engines/mutationofjb/commands/ifpiggycommand.cpp
+++ b/engines/mutationofjb/commands/ifpiggycommand.cpp
@@ -68,4 +68,3 @@ Common::String IfPiggyCommand::debugString() const {
 }
 
 }
-
diff --git a/engines/mutationofjb/commands/labelcommand.cpp b/engines/mutationofjb/commands/labelcommand.cpp
index 7593e52bb3..ef2410aff0 100644
--- a/engines/mutationofjb/commands/labelcommand.cpp
+++ b/engines/mutationofjb/commands/labelcommand.cpp
@@ -59,6 +59,7 @@ bool LabelCommandParser::parse(const Common::String &line, ScriptParseContext &p
 	return true;
 }
 
+
 const Common::String &LabelCommand::getName() const {
 	return _name;
 }
diff --git a/engines/mutationofjb/commands/newroomcommand.cpp b/engines/mutationofjb/commands/newroomcommand.cpp
index 5aabc6705f..0f4d214f18 100644
--- a/engines/mutationofjb/commands/newroomcommand.cpp
+++ b/engines/mutationofjb/commands/newroomcommand.cpp
@@ -80,4 +80,3 @@ Common::String NewRoomCommand::debugString() const {
 }
 
 }
-
diff --git a/engines/mutationofjb/commands/randomcommand.cpp b/engines/mutationofjb/commands/randomcommand.cpp
index 467f7888d3..260fd3a812 100644
--- a/engines/mutationofjb/commands/randomcommand.cpp
+++ b/engines/mutationofjb/commands/randomcommand.cpp
@@ -61,6 +61,7 @@ bool RandomCommandParser::parse(const Common::String &line, ScriptParseContext &
 	return true;
 }
 
+
 bool RandomBlockStartParser::parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&) {
 	if (line != "/") {
 		return false;
@@ -84,6 +85,7 @@ void RandomBlockStartParser::transition(ScriptParseContext &parseCtx, Command *,
 	}
 }
 
+
 RandomCommand::RandomCommand(uint numChoices)
 	: _numChoices(numChoices),
 	  _chosenNext(nullptr) {
diff --git a/engines/mutationofjb/commands/seqcommand.h b/engines/mutationofjb/commands/seqcommand.h
index e37f77ff70..f61f33b66f 100644
--- a/engines/mutationofjb/commands/seqcommand.h
+++ b/engines/mutationofjb/commands/seqcommand.h
@@ -49,4 +49,3 @@ private:
 }
 
 #endif
-
diff --git a/engines/mutationofjb/debug.h b/engines/mutationofjb/debug.h
index 24b1e95a7c..b5c40c032f 100644
--- a/engines/mutationofjb/debug.h
+++ b/engines/mutationofjb/debug.h
@@ -60,4 +60,3 @@ private:
 }
 
 #endif
-
diff --git a/engines/mutationofjb/detection.cpp b/engines/mutationofjb/detection.cpp
index f95f696f29..5e80760dbb 100644
--- a/engines/mutationofjb/detection.cpp
+++ b/engines/mutationofjb/detection.cpp
@@ -110,4 +110,3 @@ public:
 #else
 	REGISTER_PLUGIN_STATIC(MUTATIONOFJB, PLUGIN_TYPE_ENGINE, MutationOfJBMetaEngine);
 #endif
-
diff --git a/engines/mutationofjb/mutationofjb.cpp b/engines/mutationofjb/mutationofjb.cpp
index 23202555e6..1d88269c48 100644
--- a/engines/mutationofjb/mutationofjb.cpp
+++ b/engines/mutationofjb/mutationofjb.cpp
@@ -52,7 +52,6 @@ MutationOfJBEngine::~MutationOfJBEngine() {
 	debug("MutationOfJBEngine::~MutationOfJBEngine");
 }
 
-
 void MutationOfJBEngine::setupCursor() {
 	const uint8 cursor[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/engines/mutationofjb/mutationofjb.h b/engines/mutationofjb/mutationofjb.h
index 91a31389e3..21f8094bc2 100644
--- a/engines/mutationofjb/mutationofjb.h
+++ b/engines/mutationofjb/mutationofjb.h
@@ -72,7 +72,6 @@ private:
 	CursorState _cursorState;
 };
 
-
 }
 
 #endif
diff --git a/engines/mutationofjb/script.cpp b/engines/mutationofjb/script.cpp
index fb148c163f..01aef2c481 100644
--- a/engines/mutationofjb/script.cpp
+++ b/engines/mutationofjb/script.cpp
@@ -87,8 +87,7 @@ ScriptParseContext::ScriptParseContext(Common::SeekableReadStream &stream) :
 	_stream(stream),
 	_currentCommand(nullptr),
 	_lastCommand(nullptr),
-	_pendingRandomCommand(nullptr)
-{}
+	_pendingRandomCommand(nullptr) {}
 
 bool ScriptParseContext::readLine(Common::String &line) {
 	do {
diff --git a/engines/mutationofjb/util.cpp b/engines/mutationofjb/util.cpp
index 2e3b0b3ad6..1483fb26e4 100644
--- a/engines/mutationofjb/util.cpp
+++ b/engines/mutationofjb/util.cpp
@@ -58,4 +58,3 @@ Common::String toUpperCP895(const Common::String &str) {
 }
 
 }
-
diff --git a/engines/mutationofjb/util.h b/engines/mutationofjb/util.h
index fe72794ce9..a98f6ffe85 100644
--- a/engines/mutationofjb/util.h
+++ b/engines/mutationofjb/util.h
@@ -32,7 +32,6 @@ namespace Common {
 class String;
 }
 
-
 namespace MutationOfJB {
 
 void reportFileMissingError(const char *fileName);
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
-
-- 
cgit v1.2.3