Merge branch 'master' into master

1 files changed, 43 insertions, 45 deletions

diff --git a/src/unittest/test_inventory.cpp b/src/unittest/test_inventory.cpp
index 5f71636c4..3359a75fa 100644
--- a/src/unittest/test_inventory.cpp
+++ b/src/unittest/test_inventory.cpp
@@ -24,7 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "inventory.h"
 
-class TestInventory : public TestBase {
+class TestInventory : public TestBase
+{
 public:
 	TestInventory() { TestManager::registerTestModule(this); }
 	const char *getName() { return "TestInventory"; }
@@ -80,47 +81,44 @@ void TestInventory::testSerializeDeserialize(IItemDefManager *idef)
 	UASSERT(leftover == wanted);
 }
 
-const char *TestInventory::serialized_inventory_in =
-	"List 0 10\n"
-	"Width 3\n"
-	"Empty\n"
-	"Empty\n"
-	"Item default:cobble 61\n"
-	"Empty\n"
-	"Empty\n"
-	"Item default:dirt 71\n"
-	"Empty\n"
-	"Item default:dirt 99\n"
-	"Item default:cobble 38\n"
-	"Empty\n"
-	"EndInventoryList\n"
-	"List abc 1\n"
-	"Item default:stick 3\n"
-	"Width 0\n"
-	"EndInventoryList\n"
-	"EndInventory\n";
-
-const char *TestInventory::serialized_inventory_out =
-	"List main 10\n"
-	"Width 5\n"
-	"Empty\n"
-	"Empty\n"
-	"Item default:cobble 61\n"
-	"Empty\n"
-	"Empty\n"
-	"Item default:dirt 71\n"
-	"Empty\n"
-	"Item default:dirt 99\n"
-	"Item default:cobble 38\n"
-	"Empty\n"
-	"EndInventoryList\n"
-	"List abc 1\n"
-	"Width 0\n"
-	"Item default:stick 3\n"
-	"EndInventoryList\n"
-	"EndInventory\n";
-
-const char *TestInventory::serialized_inventory_inc =
-	"KeepList main\n"
-	"KeepList abc\n"
-	"EndInventory\n";
+const char *TestInventory::serialized_inventory_in = "List 0 10\n"
+						     "Width 3\n"
+						     "Empty\n"
+						     "Empty\n"
+						     "Item default:cobble 61\n"
+						     "Empty\n"
+						     "Empty\n"
+						     "Item default:dirt 71\n"
+						     "Empty\n"
+						     "Item default:dirt 99\n"
+						     "Item default:cobble 38\n"
+						     "Empty\n"
+						     "EndInventoryList\n"
+						     "List abc 1\n"
+						     "Item default:stick 3\n"
+						     "Width 0\n"
+						     "EndInventoryList\n"
+						     "EndInventory\n";
+
+const char *TestInventory::serialized_inventory_out = "List main 10\n"
+						      "Width 5\n"
+						      "Empty\n"
+						      "Empty\n"
+						      "Item default:cobble 61\n"
+						      "Empty\n"
+						      "Empty\n"
+						      "Item default:dirt 71\n"
+						      "Empty\n"
+						      "Item default:dirt 99\n"
+						      "Item default:cobble 38\n"
+						      "Empty\n"
+						      "EndInventoryList\n"
+						      "List abc 1\n"
+						      "Width 0\n"
+						      "Item default:stick 3\n"
+						      "EndInventoryList\n"
+						      "EndInventory\n";
+
+const char *TestInventory::serialized_inventory_inc = "KeepList main\n"
+						      "KeepList abc\n"
+						      "EndInventory\n";