Merge branch 'dm' of https://github.com/WinterGrascph/scummvm into dm

1 files changed, 191 insertions, 191 deletions

diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
index 67f0ac730e..1356120388 100644
--- a/engines/dm/dungeonman.cpp
+++ b/engines/dm/dungeonman.cpp
@@ -49,31 +49,31 @@ void DungeonMan::setupConstants() {
 	ObjectInfo objectInfo[180] = { // @ G0237_as_Graphic559_ObjectInfo
 		/* { Type, ObjectAspectIndex, ActionSetIndex, AllowedSlots } */
 		ObjectInfo(30,  1,  0, 0x0500),   /* COMPASS        Pouch/Chest */
-		ObjectInfo(144,  0,  0, 0x0200),   /* COMPASS        Hands */
-		ObjectInfo(148, 67,  0, 0x0500),   /* COMPASS        Pouch/Chest */
-		ObjectInfo(149, 67,  0, 0x0500),   /* COMPASS        Pouch/Chest */
-		ObjectInfo(150, 67,  0, 0x0500),   /* TORCH          Pouch/Chest */
-		ObjectInfo(151, 67, 42, 0x0500),   /* TORCH          Pouch/Chest */
-		ObjectInfo(152, 67,  0, 0x0500),   /* TORCH          Pouch/Chest */
-		ObjectInfo(153, 67,  0, 0x0500),   /* TORCH          Pouch/Chest */
-		ObjectInfo(154,  2,  0, 0x0501),   /* WATERSKIN      Mouth/Pouch/Chest */
-		ObjectInfo(155,  2,  0, 0x0501),   /* WATER          Mouth/Pouch/Chest */
-		ObjectInfo(156,  2,  0, 0x0501),   /* JEWEL SYMAL    Mouth/Pouch/Chest */
-		ObjectInfo(157,  2,  0, 0x0501),   /* JEWEL SYMAL    Mouth/Pouch/Chest */
-		ObjectInfo(158,  2,  0, 0x0501),   /* ILLUMULET      Mouth/Pouch/Chest */
-		ObjectInfo(159,  2,  0, 0x0501),   /* ILLUMULET      Mouth/Pouch/Chest */
-		ObjectInfo(160,  2,  0, 0x0501),   /* FLAMITT        Mouth/Pouch/Chest */
-		ObjectInfo(161,  2,  0, 0x0501),   /* FLAMITT        Mouth/Pouch/Chest */
-		ObjectInfo(162,  2,  0, 0x0501),   /* EYE OF TIME    Mouth/Pouch/Chest */
-		ObjectInfo(163,  2,  0, 0x0501),   /* EYE OF TIME    Mouth/Pouch/Chest */
-		ObjectInfo(164, 68,  0, 0x0500),   /* STORMRING      Pouch/Chest */
-		ObjectInfo(165, 68,  0, 0x0500),   /* STORMRING      Pouch/Chest */
-		ObjectInfo(166, 68,  0, 0x0500),   /* STAFF OF CLAWS Pouch/Chest */
-		ObjectInfo(167, 68, 42, 0x0500),   /* STAFF OF CLAWS Pouch/Chest */
-		ObjectInfo(195, 80,  0, 0x0500),   /* STAFF OF CLAWS Pouch/Chest */
+		ObjectInfo(144,  0,  0, 0x0200),  /* COMPASS        Hands */
+		ObjectInfo(148, 67,  0, 0x0500),  /* COMPASS        Pouch/Chest */
+		ObjectInfo(149, 67,  0, 0x0500),  /* COMPASS        Pouch/Chest */
+		ObjectInfo(150, 67,  0, 0x0500),  /* TORCH          Pouch/Chest */
+		ObjectInfo(151, 67, 42, 0x0500),  /* TORCH          Pouch/Chest */
+		ObjectInfo(152, 67,  0, 0x0500),  /* TORCH          Pouch/Chest */
+		ObjectInfo(153, 67,  0, 0x0500),  /* TORCH          Pouch/Chest */
+		ObjectInfo(154,  2,  0, 0x0501),  /* WATERSKIN      Mouth/Pouch/Chest */
+		ObjectInfo(155,  2,  0, 0x0501),  /* WATER          Mouth/Pouch/Chest */
+		ObjectInfo(156,  2,  0, 0x0501),  /* JEWEL SYMAL    Mouth/Pouch/Chest */
+		ObjectInfo(157,  2,  0, 0x0501),  /* JEWEL SYMAL    Mouth/Pouch/Chest */
+		ObjectInfo(158,  2,  0, 0x0501),  /* ILLUMULET      Mouth/Pouch/Chest */
+		ObjectInfo(159,  2,  0, 0x0501),  /* ILLUMULET      Mouth/Pouch/Chest */
+		ObjectInfo(160,  2,  0, 0x0501),  /* FLAMITT        Mouth/Pouch/Chest */
+		ObjectInfo(161,  2,  0, 0x0501),  /* FLAMITT        Mouth/Pouch/Chest */
+		ObjectInfo(162,  2,  0, 0x0501),  /* EYE OF TIME    Mouth/Pouch/Chest */
+		ObjectInfo(163,  2,  0, 0x0501),  /* EYE OF TIME    Mouth/Pouch/Chest */
+		ObjectInfo(164, 68,  0, 0x0500),  /* STORMRING      Pouch/Chest */
+		ObjectInfo(165, 68,  0, 0x0500),  /* STORMRING      Pouch/Chest */
+		ObjectInfo(166, 68,  0, 0x0500),  /* STAFF OF CLAWS Pouch/Chest */
+		ObjectInfo(167, 68, 42, 0x0500),  /* STAFF OF CLAWS Pouch/Chest */
+		ObjectInfo(195, 80,  0, 0x0500),  /* STAFF OF CLAWS Pouch/Chest */
 		ObjectInfo(16, 38, 43, 0x0500),   /* BOLT BLADE     Pouch/Chest */
 		ObjectInfo(18, 38,  7, 0x0500),   /* BOLT BLADE     Pouch/Chest */
-		ObjectInfo(4, 35,  5, 0x0400),   /* FURY           Chest */
+		ObjectInfo(4, 35,  5, 0x0400),    /* FURY           Chest */
 		ObjectInfo(14, 37,  6, 0x0400),   /* FURY           Chest */
 		ObjectInfo(20, 11,  8, 0x0040),   /* THE FIRESTAFF  Quiver 1 */
 		ObjectInfo(23, 12,  9, 0x0040),   /* THE FIRESTAFF  Quiver 1 */
@@ -114,14 +114,14 @@ void DungeonMan::setupConstants() {
 		ObjectInfo(64, 51, 33, 0x0040),   /* SNAKE STAFF    Quiver 1 */
 		ObjectInfo(65, 32,  5, 0x0440),   /* THE CONDUIT    Quiver 1/Chest */
 		ObjectInfo(66, 30, 35, 0x0040),   /* DRAGON SPIT    Quiver 1 */
-		ObjectInfo(135, 65, 36, 0x0440),   /* SCEPTRE OF LYF Quiver 1/Chest */
-		ObjectInfo(143, 45, 27, 0x0040),   /* ROBE           Quiver 1 */
+		ObjectInfo(135, 65, 36, 0x0440),  /* SCEPTRE OF LYF Quiver 1/Chest */
+		ObjectInfo(143, 45, 27, 0x0040),  /* ROBE           Quiver 1 */
 		ObjectInfo(28, 82,  1, 0x0040),   /* FINE ROBE      Quiver 1 */
 		ObjectInfo(80, 23,  0, 0x040C),   /* KIRTLE         Neck/Torso/Chest */
 		ObjectInfo(81, 23,  0, 0x040C),   /* SILK SHIRT     Neck/Torso/Chest */
 		ObjectInfo(82, 23,  0, 0x0410),   /* ELVEN DOUBLET  Legs/Chest */
-		ObjectInfo(112, 55,  0, 0x0420),   /* LEATHER JERKIN Feet/Chest */
-		ObjectInfo(114,  8,  0, 0x0420),   /* TUNIC          Feet/Chest */
+		ObjectInfo(112, 55,  0, 0x0420),  /* LEATHER JERKIN Feet/Chest */
+		ObjectInfo(114,  8,  0, 0x0420),  /* TUNIC          Feet/Chest */
 		ObjectInfo(67, 24,  0, 0x0408),   /* GHI            Torso/Chest */
 		ObjectInfo(83, 24,  0, 0x0410),   /* MAIL AKETON    Legs/Chest */
 		ObjectInfo(68, 24,  0, 0x0408),   /* MITHRAL AKETON Torso/Chest */
@@ -132,102 +132,102 @@ void DungeonMan::setupConstants() {
 		ObjectInfo(86, 69,  0, 0x0410),   /* CLOAK OF NIGHT Legs/Chest */
 		ObjectInfo(71,  7,  0, 0x0408),   /* BARBARIAN HIDE Torso/Chest */
 		ObjectInfo(87,  7,  0, 0x0410),   /* ROBE           Legs/Chest */
-		ObjectInfo(119, 57,  0, 0x0420),   /* FINE ROBE      Feet/Chest */
+		ObjectInfo(119, 57,  0, 0x0420),  /* FINE ROBE      Feet/Chest */
 		ObjectInfo(72, 23,  0, 0x0408),   /* TABARD         Torso/Chest */
 		ObjectInfo(88, 23,  0, 0x0410),   /* GUNNA          Legs/Chest */
-		ObjectInfo(113, 29,  0, 0x0420),   /* ELVEN HUKE     Feet/Chest */
+		ObjectInfo(113, 29,  0, 0x0420),  /* ELVEN HUKE     Feet/Chest */
 		ObjectInfo(89, 69,  0, 0x0410),   /* LEATHER PANTS  Legs/Chest */
 		ObjectInfo(73, 69,  0, 0x0408),   /* BLUE PANTS     Torso/Chest */
 		ObjectInfo(74, 24,  0, 0x0408),   /* GHI TROUSERS   Torso/Chest */
 		ObjectInfo(90, 24,  0, 0x0410),   /* LEG MAIL       Legs/Chest */
-		ObjectInfo(103, 53,  0, 0x0402),   /* MITHRAL MAIL   Head/Chest */
-		ObjectInfo(104, 53,  0, 0x0402),   /* LEG PLATE      Head/Chest */
+		ObjectInfo(103, 53,  0, 0x0402),  /* MITHRAL MAIL   Head/Chest */
+		ObjectInfo(104, 53,  0, 0x0402),  /* LEG PLATE      Head/Chest */
 		ObjectInfo(96,  9,  0, 0x0402),   /* POLEYN OF LYTE Head/Chest */
 		ObjectInfo(97,  9,  0, 0x0402),   /* POLEYN OF DARC Head/Chest */
 		ObjectInfo(98,  9,  0, 0x0402),   /* BEZERKER HELM  Head/Chest */
-		ObjectInfo(105, 54, 41, 0x0400),   /* HELMET         Chest */
-		ObjectInfo(106, 54, 41, 0x0200),   /* BASINET        Hands */
-		ObjectInfo(108, 10, 41, 0x0200),   /* CASQUE 'N COIF Hands */
-		ObjectInfo(107, 54, 41, 0x0200),   /* ARMET          Hands */
+		ObjectInfo(105, 54, 41, 0x0400),  /* HELMET         Chest */
+		ObjectInfo(106, 54, 41, 0x0200),  /* BASINET        Hands */
+		ObjectInfo(108, 10, 41, 0x0200),  /* CASQUE 'N COIF Hands */
+		ObjectInfo(107, 54, 41, 0x0200),  /* ARMET          Hands */
 		ObjectInfo(75, 19,  0, 0x0408),   /* HELM OF LYTE   Torso/Chest */
 		ObjectInfo(91, 19,  0, 0x0410),   /* HELM OF DARC   Legs/Chest */
 		ObjectInfo(76, 19,  0, 0x0408),   /* CALISTA        Torso/Chest */
 		ObjectInfo(92, 19,  0, 0x0410),   /* CROWN OF NERRA Legs/Chest */
 		ObjectInfo(99,  9,  0, 0x0402),   /* BUCKLER        Head/Chest */
-		ObjectInfo(115, 19,  0, 0x0420),   /* HIDE SHIELD    Feet/Chest */
-		ObjectInfo(100, 52,  0, 0x0402),   /* SMALL SHIELD   Head/Chest */
+		ObjectInfo(115, 19,  0, 0x0420),  /* HIDE SHIELD    Feet/Chest */
+		ObjectInfo(100, 52,  0, 0x0402),  /* SMALL SHIELD   Head/Chest */
 		ObjectInfo(77, 20,  0, 0x0008),   /* WOODEN SHIELD  Torso */
 		ObjectInfo(93, 22,  0, 0x0010),   /* LARGE SHIELD   Legs */
-		ObjectInfo(116, 56,  0, 0x0420),   /* SHIELD OF LYTE Feet/Chest */
-		ObjectInfo(109, 10, 41, 0x0200),   /* SHIELD OF DARC Hands */
-		ObjectInfo(101, 52,  0, 0x0402),   /* SANDALS        Head/Chest */
+		ObjectInfo(116, 56,  0, 0x0420),  /* SHIELD OF LYTE Feet/Chest */
+		ObjectInfo(109, 10, 41, 0x0200),  /* SHIELD OF DARC Hands */
+		ObjectInfo(101, 52,  0, 0x0402),  /* SANDALS        Head/Chest */
 		ObjectInfo(78, 20,  0, 0x0008),   /* SUEDE BOOTS    Torso */
 		ObjectInfo(94, 22,  0, 0x0010),   /* LEATHER BOOTS  Legs */
-		ObjectInfo(117, 56,  0, 0x0420),   /* HOSEN          Feet/Chest */
-		ObjectInfo(110, 10, 41, 0x0200),   /* FOOT PLATE     Hands */
-		ObjectInfo(102, 52,  0, 0x0402),   /* GREAVE OF LYTE Head/Chest */
+		ObjectInfo(117, 56,  0, 0x0420),  /* HOSEN          Feet/Chest */
+		ObjectInfo(110, 10, 41, 0x0200),  /* FOOT PLATE     Hands */
+		ObjectInfo(102, 52,  0, 0x0402),  /* GREAVE OF LYTE Head/Chest */
 		ObjectInfo(79, 20,  0, 0x0008),   /* GREAVE OF DARC Torso */
 		ObjectInfo(95, 22,  0, 0x0010),   /* ELVEN BOOTS    Legs */
-		ObjectInfo(118, 56,  0, 0x0420),   /* GEM OF AGES    Feet/Chest */
-		ObjectInfo(111, 10, 41, 0x0200),   /* EKKHARD CROSS  Hands */
-		ObjectInfo(140, 52,  0, 0x0402),   /* MOONSTONE      Head/Chest */
-		ObjectInfo(141, 19,  0, 0x0408),   /* THE HELLION    Torso/Chest */
-		ObjectInfo(142, 22,  0, 0x0010),   /* PENDANT FERAL  Legs */
-		ObjectInfo(194, 81,  0, 0x0420),   /* COPPER COIN    Feet/Chest */
-		ObjectInfo(196, 84,  0, 0x0408),   /* SILVER COIN    Torso/Chest */
-		ObjectInfo(0, 34,  0, 0x0500),   /* GOLD COIN      Pouch/Chest */
-		ObjectInfo(8,  6,  0, 0x0501),   /* BOULDER        Mouth/Pouch/Chest */
+		ObjectInfo(118, 56,  0, 0x0420),  /* GEM OF AGES    Feet/Chest */
+		ObjectInfo(111, 10, 41, 0x0200),  /* EKKHARD CROSS  Hands */
+		ObjectInfo(140, 52,  0, 0x0402),  /* MOONSTONE      Head/Chest */
+		ObjectInfo(141, 19,  0, 0x0408),  /* THE HELLION    Torso/Chest */
+		ObjectInfo(142, 22,  0, 0x0010),  /* PENDANT FERAL  Legs */
+		ObjectInfo(194, 81,  0, 0x0420),  /* COPPER COIN    Feet/Chest */
+		ObjectInfo(196, 84,  0, 0x0408),  /* SILVER COIN    Torso/Chest */
+		ObjectInfo(0, 34,  0, 0x0500),    /* GOLD COIN      Pouch/Chest */
+		ObjectInfo(8,  6,  0, 0x0501),    /* BOULDER        Mouth/Pouch/Chest */
 		ObjectInfo(10, 15,  0, 0x0504),   /* BLUE GEM       Neck/Pouch/Chest */
 		ObjectInfo(12, 15,  0, 0x0504),   /* ORANGE GEM     Neck/Pouch/Chest */
-		ObjectInfo(146, 40,  0, 0x0500),   /* GREEN GEM      Pouch/Chest */
-		ObjectInfo(147, 41,  0, 0x0400),   /* MAGICAL BOX    Chest */
-		ObjectInfo(125,  4, 37, 0x0500),   /* MAGICAL BOX    Pouch/Chest */
-		ObjectInfo(126, 83, 37, 0x0500),   /* MIRROR OF DAWN Pouch/Chest */
-		ObjectInfo(127,  4, 37, 0x0500),   /* HORN OF FEAR   Pouch/Chest */
-		ObjectInfo(176, 18,  0, 0x0500),   /* ROPE           Pouch/Chest */
-		ObjectInfo(177, 18,  0, 0x0500),   /* RABBIT'S FOOT  Pouch/Chest */
-		ObjectInfo(178, 18,  0, 0x0500),   /* CORBAMITE      Pouch/Chest */
-		ObjectInfo(179, 18,  0, 0x0500),   /* CHOKER         Pouch/Chest */
-		ObjectInfo(180, 18,  0, 0x0500),   /* DEXHELM        Pouch/Chest */
-		ObjectInfo(181, 18,  0, 0x0500),   /* FLAMEBAIN      Pouch/Chest */
-		ObjectInfo(182, 18,  0, 0x0500),   /* POWERTOWERS    Pouch/Chest */
-		ObjectInfo(183, 18,  0, 0x0500),   /* SPEEDBOW       Pouch/Chest */
-		ObjectInfo(184, 62,  0, 0x0500),   /* CHEST          Pouch/Chest */
-		ObjectInfo(185, 62,  0, 0x0500),   /* OPEN CHEST     Pouch/Chest */
-		ObjectInfo(186, 62,  0, 0x0500),   /* ASHES          Pouch/Chest */
-		ObjectInfo(187, 62,  0, 0x0500),   /* BONES          Pouch/Chest */
-		ObjectInfo(188, 62,  0, 0x0500),   /* MON POTION     Pouch/Chest */
-		ObjectInfo(189, 62,  0, 0x0500),   /* UM POTION      Pouch/Chest */
-		ObjectInfo(190, 62,  0, 0x0500),   /* DES POTION     Pouch/Chest */
-		ObjectInfo(191, 62,  0, 0x0500),   /* VEN POTION     Pouch/Chest */
-		ObjectInfo(128, 76,  0, 0x0200),   /* SAR POTION     Hands */
-		ObjectInfo(129,  3,  0, 0x0500),   /* ZO POTION      Pouch/Chest */
-		ObjectInfo(130, 60,  0, 0x0500),   /* ROS POTION     Pouch/Chest */
-		ObjectInfo(131, 61,  0, 0x0500),   /* KU POTION      Pouch/Chest */
-		ObjectInfo(168, 27,  0, 0x0501),   /* DANE POTION    Mouth/Pouch/Chest */
-		ObjectInfo(169, 28,  0, 0x0501),   /* NETA POTION    Mouth/Pouch/Chest */
-		ObjectInfo(170, 25,  0, 0x0501),   /* BRO POTION     Mouth/Pouch/Chest */
-		ObjectInfo(171, 26,  0, 0x0501),   /* MA POTION      Mouth/Pouch/Chest */
-		ObjectInfo(172, 71,  0, 0x0401),   /* YA POTION      Mouth/Chest */
-		ObjectInfo(173, 70,  0, 0x0401),   /* EE POTION      Mouth/Chest */
-		ObjectInfo(174,  5,  0, 0x0501),   /* VI POTION      Mouth/Pouch/Chest */
-		ObjectInfo(175, 66,  0, 0x0501),   /* WATER FLASK    Mouth/Pouch/Chest */
-		ObjectInfo(120, 15,  0, 0x0504),   /* KATH BOMB      Neck/Pouch/Chest */
-		ObjectInfo(121, 15,  0, 0x0504),   /* PEW BOMB       Neck/Pouch/Chest */
-		ObjectInfo(122, 58,  0, 0x0504),   /* RA BOMB        Neck/Pouch/Chest */
-		ObjectInfo(123, 59,  0, 0x0504),   /* FUL BOMB       Neck/Pouch/Chest */
-		ObjectInfo(124, 59,  0, 0x0504),   /* APPLE          Neck/Pouch/Chest */
-		ObjectInfo(132, 79, 38, 0x0500),   /* CORN           Pouch/Chest */
-		ObjectInfo(133, 63, 38, 0x0500),   /* BREAD          Pouch/Chest */
-		ObjectInfo(134, 64,  0, 0x0500),   /* CHEESE         Pouch/Chest */
-		ObjectInfo(136, 72, 39, 0x0400),   /* SCREAMER SLICE Chest */
-		ObjectInfo(137, 73,  0, 0x0500),   /* WORM ROUND     Pouch/Chest */
-		ObjectInfo(138, 74,  0, 0x0500),   /* DRUMSTICK      Pouch/Chest */
-		ObjectInfo(139, 75,  0, 0x0504),   /* DRAGON STEAK   Neck/Pouch/Chest */
-		ObjectInfo(192, 77,  0, 0x0500),   /* IRON KEY       Pouch/Chest */
-		ObjectInfo(193, 78,  0, 0x0500),   /* KEY OF B       Pouch/Chest */
-		ObjectInfo(197, 74,  0, 0x0000),   /* SOLID KEY */
-		ObjectInfo(198, 41,  0, 0x0400)    /* SQUARE KEY     Chest */
+		ObjectInfo(146, 40,  0, 0x0500),  /* GREEN GEM      Pouch/Chest */
+		ObjectInfo(147, 41,  0, 0x0400),  /* MAGICAL BOX    Chest */
+		ObjectInfo(125,  4, 37, 0x0500),  /* MAGICAL BOX    Pouch/Chest */
+		ObjectInfo(126, 83, 37, 0x0500),  /* MIRROR OF DAWN Pouch/Chest */
+		ObjectInfo(127,  4, 37, 0x0500),  /* HORN OF FEAR   Pouch/Chest */
+		ObjectInfo(176, 18,  0, 0x0500),  /* ROPE           Pouch/Chest */
+		ObjectInfo(177, 18,  0, 0x0500),  /* RABBIT'S FOOT  Pouch/Chest */
+		ObjectInfo(178, 18,  0, 0x0500),  /* CORBAMITE      Pouch/Chest */
+		ObjectInfo(179, 18,  0, 0x0500),  /* CHOKER         Pouch/Chest */
+		ObjectInfo(180, 18,  0, 0x0500),  /* DEXHELM        Pouch/Chest */
+		ObjectInfo(181, 18,  0, 0x0500),  /* FLAMEBAIN      Pouch/Chest */
+		ObjectInfo(182, 18,  0, 0x0500),  /* POWERTOWERS    Pouch/Chest */
+		ObjectInfo(183, 18,  0, 0x0500),  /* SPEEDBOW       Pouch/Chest */
+		ObjectInfo(184, 62,  0, 0x0500),  /* CHEST          Pouch/Chest */
+		ObjectInfo(185, 62,  0, 0x0500),  /* OPEN CHEST     Pouch/Chest */
+		ObjectInfo(186, 62,  0, 0x0500),  /* ASHES          Pouch/Chest */
+		ObjectInfo(187, 62,  0, 0x0500),  /* BONES          Pouch/Chest */
+		ObjectInfo(188, 62,  0, 0x0500),  /* MON POTION     Pouch/Chest */
+		ObjectInfo(189, 62,  0, 0x0500),  /* UM POTION      Pouch/Chest */
+		ObjectInfo(190, 62,  0, 0x0500),  /* DES POTION     Pouch/Chest */
+		ObjectInfo(191, 62,  0, 0x0500),  /* VEN POTION     Pouch/Chest */
+		ObjectInfo(128, 76,  0, 0x0200),  /* SAR POTION     Hands */
+		ObjectInfo(129,  3,  0, 0x0500),  /* ZO POTION      Pouch/Chest */
+		ObjectInfo(130, 60,  0, 0x0500),  /* ROS POTION     Pouch/Chest */
+		ObjectInfo(131, 61,  0, 0x0500),  /* KU POTION      Pouch/Chest */
+		ObjectInfo(168, 27,  0, 0x0501),  /* DANE POTION    Mouth/Pouch/Chest */
+		ObjectInfo(169, 28,  0, 0x0501),  /* NETA POTION    Mouth/Pouch/Chest */
+		ObjectInfo(170, 25,  0, 0x0501),  /* BRO POTION     Mouth/Pouch/Chest */
+		ObjectInfo(171, 26,  0, 0x0501),  /* MA POTION      Mouth/Pouch/Chest */
+		ObjectInfo(172, 71,  0, 0x0401),  /* YA POTION      Mouth/Chest */
+		ObjectInfo(173, 70,  0, 0x0401),  /* EE POTION      Mouth/Chest */
+		ObjectInfo(174,  5,  0, 0x0501),  /* VI POTION      Mouth/Pouch/Chest */
+		ObjectInfo(175, 66,  0, 0x0501),  /* WATER FLASK    Mouth/Pouch/Chest */
+		ObjectInfo(120, 15,  0, 0x0504),  /* KATH BOMB      Neck/Pouch/Chest */
+		ObjectInfo(121, 15,  0, 0x0504),  /* PEW BOMB       Neck/Pouch/Chest */
+		ObjectInfo(122, 58,  0, 0x0504),  /* RA BOMB        Neck/Pouch/Chest */
+		ObjectInfo(123, 59,  0, 0x0504),  /* FUL BOMB       Neck/Pouch/Chest */
+		ObjectInfo(124, 59,  0, 0x0504),  /* APPLE          Neck/Pouch/Chest */
+		ObjectInfo(132, 79, 38, 0x0500),  /* CORN           Pouch/Chest */
+		ObjectInfo(133, 63, 38, 0x0500),  /* BREAD          Pouch/Chest */
+		ObjectInfo(134, 64,  0, 0x0500),  /* CHEESE         Pouch/Chest */
+		ObjectInfo(136, 72, 39, 0x0400),  /* SCREAMER SLICE Chest */
+		ObjectInfo(137, 73,  0, 0x0500),  /* WORM ROUND     Pouch/Chest */
+		ObjectInfo(138, 74,  0, 0x0500),  /* DRUMSTICK      Pouch/Chest */
+		ObjectInfo(139, 75,  0, 0x0504),  /* DRAGON STEAK   Neck/Pouch/Chest */
+		ObjectInfo(192, 77,  0, 0x0500),  /* IRON KEY       Pouch/Chest */
+		ObjectInfo(193, 78,  0, 0x0500),  /* KEY OF B       Pouch/Chest */
+		ObjectInfo(197, 74,  0, 0x0000),  /* SOLID KEY */
+		ObjectInfo(198, 41,  0, 0x0400)   /* SQUARE KEY     Chest */
 	};
 	ArmourInfo armourInfo[58] = { // G0239_as_Graphic559_ArmourInfo
 		/* { Weight, Defense, Attributes, Unreferenced } */
@@ -235,7 +235,7 @@ void DungeonMan::setupConstants() {
 		ArmourInfo(4,  10, 0x01),   /* CLOAK OF NIGHT */
 		ArmourInfo(3,   4, 0x01),   /* BARBARIAN HIDE */
 		ArmourInfo(6,   5, 0x02),   /* SANDALS */
-		ArmourInfo(16,  25, 0x04),   /* LEATHER BOOTS */
+		ArmourInfo(16,  25, 0x04),  /* LEATHER BOOTS */
 		ArmourInfo(4,   5, 0x00),   /* ROBE */
 		ArmourInfo(4,   5, 0x00),   /* ROBE */
 		ArmourInfo(3,   7, 0x01),   /* FINE ROBE */
@@ -249,59 +249,59 @@ void DungeonMan::setupConstants() {
 		ArmourInfo(4,  13, 0x02),   /* ELVEN BOOTS */
 		ArmourInfo(6,  17, 0x03),   /* LEATHER JERKIN */
 		ArmourInfo(8,  20, 0x03),   /* LEATHER PANTS */
-		ArmourInfo(14,  20, 0x03),   /* SUEDE BOOTS */
+		ArmourInfo(14,  20, 0x03),  /* SUEDE BOOTS */
 		ArmourInfo(6,  12, 0x02),   /* BLUE PANTS */
 		ArmourInfo(5,   9, 0x01),   /* TUNIC */
 		ArmourInfo(5,   8, 0x01),   /* GHI */
 		ArmourInfo(5,   9, 0x01),   /* GHI TROUSERS */
 		ArmourInfo(4,   1, 0x04),   /* CALISTA */
 		ArmourInfo(6,   5, 0x04),   /* CROWN OF NERRA */
-		ArmourInfo(11,  12, 0x05),   /* BEZERKER HELM */
-		ArmourInfo(14,  17, 0x05),   /* HELMET */
-		ArmourInfo(15,  20, 0x05),   /* BASINET */
-		ArmourInfo(11,  22, 0x85),   /* BUCKLER */
-		ArmourInfo(10,  16, 0x82),   /* HIDE SHIELD */
-		ArmourInfo(14,  20, 0x83),   /* WOODEN SHIELD */
-		ArmourInfo(21,  35, 0x84),   /* SMALL SHIELD */
-		ArmourInfo(65,  35, 0x05),   /* MAIL AKETON */
-		ArmourInfo(53,  35, 0x05),   /* LEG MAIL */
-		ArmourInfo(52,  70, 0x07),   /* MITHRAL AKETON */
-		ArmourInfo(41,  55, 0x07),   /* MITHRAL MAIL */
-		ArmourInfo(16,  25, 0x06),   /* CASQUE 'N COIF */
-		ArmourInfo(16,  30, 0x06),   /* HOSEN */
-		ArmourInfo(19,  40, 0x07),   /* ARMET */
-		ArmourInfo(120,  65, 0x04),   /* TORSO PLATE */
-		ArmourInfo(80,  56, 0x04),   /* LEG PLATE */
-		ArmourInfo(28,  37, 0x05),   /* FOOT PLATE */
-		ArmourInfo(34,  56, 0x84),   /* LARGE SHIELD */
-		ArmourInfo(17,  62, 0x05),   /* HELM OF LYTE */
-		ArmourInfo(108, 125, 0x04),   /* PLATE OF LYTE */
-		ArmourInfo(72,  90, 0x04),   /* POLEYN OF LYTE */
-		ArmourInfo(24,  50, 0x05),   /* GREAVE OF LYTE */
-		ArmourInfo(30,  85, 0x84),   /* SHIELD OF LYTE */
-		ArmourInfo(35,  76, 0x04),   /* HELM OF DARC */
-		ArmourInfo(141, 160, 0x04),   /* PLATE OF DARC */
-		ArmourInfo(90, 101, 0x04),   /* POLEYN OF DARC */
-		ArmourInfo(31,  60, 0x05),   /* GREAVE OF DARC */
-		ArmourInfo(40, 100, 0x84),   /* SHIELD OF DARC */
-		ArmourInfo(14,  54, 0x06),   /* DEXHELM */
-		ArmourInfo(57,  60, 0x07),   /* FLAMEBAIN */
-		ArmourInfo(81,  88, 0x04),   /* POWERTOWERS */
+		ArmourInfo(11,  12, 0x05),  /* BEZERKER HELM */
+		ArmourInfo(14,  17, 0x05),  /* HELMET */
+		ArmourInfo(15,  20, 0x05),  /* BASINET */
+		ArmourInfo(11,  22, 0x85),  /* BUCKLER */
+		ArmourInfo(10,  16, 0x82),  /* HIDE SHIELD */
+		ArmourInfo(14,  20, 0x83),  /* WOODEN SHIELD */
+		ArmourInfo(21,  35, 0x84),  /* SMALL SHIELD */
+		ArmourInfo(65,  35, 0x05),  /* MAIL AKETON */
+		ArmourInfo(53,  35, 0x05),  /* LEG MAIL */
+		ArmourInfo(52,  70, 0x07),  /* MITHRAL AKETON */
+		ArmourInfo(41,  55, 0x07),  /* MITHRAL MAIL */
+		ArmourInfo(16,  25, 0x06),  /* CASQUE 'N COIF */
+		ArmourInfo(16,  30, 0x06),  /* HOSEN */
+		ArmourInfo(19,  40, 0x07),  /* ARMET */
+		ArmourInfo(120,  65, 0x04), /* TORSO PLATE */
+		ArmourInfo(80,  56, 0x04),  /* LEG PLATE */
+		ArmourInfo(28,  37, 0x05),  /* FOOT PLATE */
+		ArmourInfo(34,  56, 0x84),  /* LARGE SHIELD */
+		ArmourInfo(17,  62, 0x05),  /* HELM OF LYTE */
+		ArmourInfo(108, 125, 0x04), /* PLATE OF LYTE */
+		ArmourInfo(72,  90, 0x04),  /* POLEYN OF LYTE */
+		ArmourInfo(24,  50, 0x05),  /* GREAVE OF LYTE */
+		ArmourInfo(30,  85, 0x84),  /* SHIELD OF LYTE */
+		ArmourInfo(35,  76, 0x04),  /* HELM OF DARC */
+		ArmourInfo(141, 160, 0x04), /* PLATE OF DARC */
+		ArmourInfo(90, 101, 0x04),  /* POLEYN OF DARC */
+		ArmourInfo(31,  60, 0x05),  /* GREAVE OF DARC */
+		ArmourInfo(40, 100, 0x84),  /* SHIELD OF DARC */
+		ArmourInfo(14,  54, 0x06),  /* DEXHELM */
+		ArmourInfo(57,  60, 0x07),  /* FLAMEBAIN */
+		ArmourInfo(81,  88, 0x04),  /* POWERTOWERS */
 		ArmourInfo(3,  16, 0x02),   /* BOOTS OF SPEED */
 		ArmourInfo(2,   3, 0x03)    /* HALTER */
 	};
 
 	WeaponInfo weaponInfo[46] = { // @ G0238_as_Graphic559_WeaponInfo
 		/* { Weight, Class, Strength, KineticEnergy, Attributes } */
-		WeaponInfo(1, 130,   2,   0, 0x2000),   /* EYE OF TIME */
-		WeaponInfo(1, 131,   2,   0, 0x2000),   /* STORMRING */
+		WeaponInfo(1, 130,   2,   0, 0x2000),  /* EYE OF TIME */
+		WeaponInfo(1, 131,   2,   0, 0x2000),  /* STORMRING */
 		WeaponInfo(11, 0,   8,   2, 0x2000),   /* TORCH */
-		WeaponInfo(12, 112,  10,  80, 0x2028),   /* FLAMITT */
-		WeaponInfo(9, 129,  16,   7, 0x2000),   /* STAFF OF CLAWS */
-		WeaponInfo(30, 113,  49, 110, 0x0942),   /* BOLT BLADE */
+		WeaponInfo(12, 112,  10,  80, 0x2028), /* FLAMITT */
+		WeaponInfo(9, 129,  16,   7, 0x2000),  /* STAFF OF CLAWS */
+		WeaponInfo(30, 113,  49, 110, 0x0942), /* BOLT BLADE */
 		WeaponInfo(47, 0,  55,  20, 0x0900),   /* FURY */
-		WeaponInfo(24, 255,  25,  10, 0x20FF),   /* THE FIRESTAFF */
-		WeaponInfo(5, 2,  10,  19, 0x0200),   /* DAGGER */
+		WeaponInfo(24, 255,  25,  10, 0x20FF), /* THE FIRESTAFF */
+		WeaponInfo(5, 2,  10,  19, 0x0200),    /* DAGGER */
 		WeaponInfo(33, 0,  30,   8, 0x0900),   /* FALCHION */
 		WeaponInfo(32, 0,  34,  10, 0x0900),   /* SWORD */
 		WeaponInfo(26, 0,  38,  10, 0x0900),   /* RAPIER */
@@ -317,28 +317,28 @@ void DungeonMan::setupConstants() {
 		WeaponInfo(41, 0,  42,  13, 0x2000),   /* MACE OF ORDER */
 		WeaponInfo(50, 0,  60,  15, 0x2000),   /* MORNINGSTAR */
 		WeaponInfo(36, 0,  19,  10, 0x2700),   /* CLUB */
-		WeaponInfo(110, 0,  44,  22, 0x2600),   /* STONE CLUB */
-		WeaponInfo(10, 20,   1,  50, 0x2032),   /* BOW */
-		WeaponInfo(28, 30,   1, 180, 0x2078),   /* CROSSBOW */
+		WeaponInfo(110, 0,  44,  22, 0x2600),  /* STONE CLUB */
+		WeaponInfo(10, 20,   1,  50, 0x2032),  /* BOW */
+		WeaponInfo(28, 30,   1, 180, 0x2078),  /* CROSSBOW */
 		WeaponInfo(2, 10,   2,  10, 0x0100),   /* ARROW */
 		WeaponInfo(2, 10,   2,  28, 0x0500),   /* SLAYER */
-		WeaponInfo(19, 39,   5,  20, 0x2032),   /* SLING */
-		WeaponInfo(10, 11,   6,  18, 0x2000),   /* ROCK */
+		WeaponInfo(19, 39,   5,  20, 0x2032),  /* SLING */
+		WeaponInfo(10, 11,   6,  18, 0x2000),  /* ROCK */
 		WeaponInfo(3, 12,   7,  23, 0x0800),   /* POISON DART */
-		WeaponInfo(1, 1,   3,  19, 0x0A00),   /* THROWING STAR */
-		WeaponInfo(8, 0,   4,   4, 0x2000),   /* STICK */
-		WeaponInfo(26, 129,  12,   4, 0x2000),   /* STAFF */
-		WeaponInfo(1, 130,   0,   0, 0x2000),   /* WAND */
-		WeaponInfo(2, 140,   1,  20, 0x2000),   /* TEOWAND */
-		WeaponInfo(35, 128,  18,   6, 0x2000),   /* YEW STAFF */
-		WeaponInfo(29, 159,   0,   4, 0x2000),   /* STAFF OF MANAR */
-		WeaponInfo(21, 131,   0,   3, 0x2000),   /* SNAKE STAFF */
-		WeaponInfo(33, 136,   0,   7, 0x2000),   /* THE CONDUIT */
-		WeaponInfo(8, 132,   3,   1, 0x2000),   /* DRAGON SPIT */
-		WeaponInfo(18, 131,   9,   4, 0x2000),   /* SCEPTRE OF LYF */
-		WeaponInfo(8, 192,   1,   1, 0x2000),   /* HORN OF FEAR */
-		WeaponInfo(30, 26,   1, 220, 0x207D),   /* SPEEDBOW */
-		WeaponInfo(36, 255, 100,  50, 0x20FF)   /* THE FIRESTAFF */
+		WeaponInfo(1, 1,   3,  19, 0x0A00),    /* THROWING STAR */
+		WeaponInfo(8, 0,   4,   4, 0x2000),    /* STICK */
+		WeaponInfo(26, 129,  12,   4, 0x2000), /* STAFF */
+		WeaponInfo(1, 130,   0,   0, 0x2000),  /* WAND */
+		WeaponInfo(2, 140,   1,  20, 0x2000),  /* TEOWAND */
+		WeaponInfo(35, 128,  18,   6, 0x2000), /* YEW STAFF */
+		WeaponInfo(29, 159,   0,   4, 0x2000), /* STAFF OF MANAR */
+		WeaponInfo(21, 131,   0,   3, 0x2000), /* SNAKE STAFF */
+		WeaponInfo(33, 136,   0,   7, 0x2000), /* THE CONDUIT */
+		WeaponInfo(8, 132,   3,   1, 0x2000),  /* DRAGON SPIT */
+		WeaponInfo(18, 131,   9,   4, 0x2000), /* SCEPTRE OF LYF */
+		WeaponInfo(8, 192,   1,   1, 0x2000),  /* HORN OF FEAR */
+		WeaponInfo(30, 26,   1, 220, 0x207D),  /* SPEEDBOW */
+		WeaponInfo(36, 255, 100,  50, 0x20FF)  /* THE FIRESTAFF */
 	};
 
 	CreatureInfo creatureInfo[k27_CreatureTypeCount] = { // @ G0243_as_Graphic559_CreatureInfo
@@ -735,7 +735,7 @@ void DungeonMan::loadDungeonFile(Common::InSaveFile *file) {
 		uint8 mapCount = _dungeonFileHeader._mapCount;
 		delete[] _dungeonMapData;
 		_dungeonMapData = new byte**[_dungeonColumCount + mapCount];
-		byte **colFirstSquares = (byte**)_dungeonMapData + mapCount;
+		byte **colFirstSquares = (byte **)_dungeonMapData + mapCount;
 		for (uint8 i = 0; i < mapCount; ++i) {
 			_dungeonMapData[i] = colFirstSquares;
 			byte *square = _dungeonRawMapData + _dungeonMaps[i]._rawDunDataOffset;
@@ -897,9 +897,9 @@ T0172010_ClosedFakeWall:
 			ThingType curThingType = curThing.getType();
 			int16 AL0310_i_SideIndex = normalizeModulo4(curThing.getCell() - dir);
 			if (AL0310_i_SideIndex) { /* Invisible on the back wall if 0 */
-				Sensor *curSensor = (Sensor*)getThingData(curThing);
+				Sensor *curSensor = (Sensor *)getThingData(curThing);
 				if (curThingType == k2_TextstringType) {
-					if (((TextString*)curSensor)->isVisible()) {
+					if (((TextString *)curSensor)->isVisible()) {
 						aspectArray[AL0310_i_SideIndex + 1] = _currMapInscriptionWallOrnIndex + 1;
 						_vm->_displayMan->_inscriptionThing = curThing; /* BUG0_76 The same text is drawn on multiple sides of a wall square. The engine stores only a single text to draw on a wall in a global variable. Even if different texts are placed on different sides of the wall, the same text is drawn on each affected side */
 					}
@@ -948,7 +948,7 @@ T0172010_ClosedFakeWall:
 
 		while ((curThing != Thing::_endOfList) && (curThing.getType() <= k3_SensorThingType)) {
 			if (curThing.getType() == k3_SensorThingType) {
-				Sensor *curSensor = (Sensor*)getThingData(curThing);
+				Sensor *curSensor = (Sensor *)getThingData(curThing);
 				aspectArray[k4_FloorOrnOrdAspect] = curSensor->getAttrOrnOrdinal();
 			}
 			curThing = getNextThing(curThing);
@@ -1027,7 +1027,7 @@ uint16 *DungeonMan::getThingData(Thing thing) {
 	return _thingData[thing.getType()] + thing.getIndex() * _thingDataWordCount[thing.getType()];
 }
 
-uint16* DungeonMan::getSquareFirstThingData(int16 mapX, int16 mapY) {
+uint16 *DungeonMan::getSquareFirstThingData(int16 mapX, int16 mapY) {
 	return getThingData(getSquareFirstThing(mapX, mapY));
 }
 
@@ -1263,14 +1263,14 @@ uint16 DungeonMan::getObjectWeight(Thing thing) {
 		break;
 	case k9_ContainerThingType:
 		weight = 50;
-		thing = ((Container*)junk)->getSlot();
+		thing = ((Container *)junk)->getSlot();
 		while (thing != Thing::_endOfList) {
 			weight += getObjectWeight(thing);
 			thing = getNextThing(thing);
 		}
 		break;
 	case k8_PotionThingType:
-		if (((Potion*)junk)->getType() == k20_PotionTypeEmptyFlask)
+		if (((Potion *)junk)->getType() == k20_PotionTypeEmptyFlask)
 			weight = 1;
 		else
 			weight = 3;
@@ -1318,7 +1318,7 @@ void DungeonMan::linkThingToList(Thing thingToLink, Thing thingInList, int16 map
 			thingInList = getSquareFirstThing(mapX, mapY);
 		} else {
 			setFlag(*currSquare, k0x0010_ThingListPresent);
-			uint16 * tmp = _currMapColCumulativeSquareFirstThingCount + mapX + 1;
+			uint16 *tmp = _currMapColCumulativeSquareFirstThingCount + mapX + 1;
 			uint16 currColumn = _dungeonColumCount - (_dungeonMapsFirstColumnIndex[_currMapIndex] + mapX) - 1;
 			while (currColumn--) { /* For each column starting from and after the column containing the square where the thing is added */
 				(*tmp++)++; /* Increment the cumulative first thing count */
@@ -1347,8 +1347,8 @@ void DungeonMan::linkThingToList(Thing thingToLink, Thing thingInList, int16 map
 	*thingPtr = thingToLink;
 }
 
-WeaponInfo* DungeonMan::getWeaponInfo(Thing thing) {
-	Weapon* weapon = (Weapon*)getThingData(thing);
+WeaponInfo *DungeonMan::getWeaponInfo(Thing thing) {
+	Weapon *weapon = (Weapon *)getThingData(thing);
 	return &_weaponInfos[weapon->getType()];
 }
 
@@ -1375,7 +1375,7 @@ int16 DungeonMan::getProjectileAspect(Thing thing) {
 	return _objectInfos[getObjectInfoIndex(thing)]._objectAspectIndex;
 }
 
-int16 DungeonMan::getLocationAfterLevelChange(int16 mapIndex, int16 levelDelta, int16* mapX, int16* mapY) {
+int16 DungeonMan::getLocationAfterLevelChange(int16 mapIndex, int16 levelDelta, int16 *mapX, int16 *mapY) {
 	if (_partyMapIndex == k255_mapIndexEntrance)
 		return kM1_mapIndexNone;
 
@@ -1406,7 +1406,7 @@ Thing DungeonMan::getSquareFirstObject(int16 mapX, int16 mapY) {
 	return thing;
 }
 
-uint16 DungeonMan::getArmourDefense(ArmourInfo* armourInfo, bool useSharpDefense) {
+uint16 DungeonMan::getArmourDefense(ArmourInfo *armourInfo, bool useSharpDefense) {
 	uint16 defense = armourInfo->_defense;
 	if (useSharpDefense)
 		defense = _vm->getScaledProduct(defense, 3, getFlag(armourInfo->_attributes, k0x0007_ArmourAttributeSharpDefense) + 4);
@@ -1443,14 +1443,14 @@ Thing DungeonMan::getDiscardThing(uint16 thingType) {
 					do {
 						ThingType squareThingType = squareThing.getType();
 						if (squareThingType == k3_SensorThingType) {
-							Thing *squareThingData = (Thing*)getThingData(squareThing);
-							if (((Sensor*)squareThingData)->getType()) /* If sensor is not disabled */
+							Thing *squareThingData = (Thing *)getThingData(squareThing);
+							if (((Sensor *)squareThingData)->getType()) /* If sensor is not disabled */
 								break;
 						} else if (squareThingType == thingType) {
-							Thing *squareThingData = (Thing*)getThingData(squareThing);
+							Thing *squareThingData = (Thing *)getThingData(squareThing);
 							switch (thingType) {
 							case k4_GroupThingType:
-								if (((Group*)squareThingData)->getDoNotDiscard())
+								if (((Group *)squareThingData)->getDoNotDiscard())
 									continue;
 							case k14_ProjectileThingType:
 								setCurrentMap(mapIndex);
@@ -1464,28 +1464,28 @@ Thing DungeonMan::getDiscardThing(uint16 thingType) {
 								}
 								break;
 							case k6_ArmourThingType:
-								if (((Armour*)squareThingData)->getDoNotDiscard())
+								if (((Armour *)squareThingData)->getDoNotDiscard())
 									continue;
 
 								setCurrentMap(mapIndex);
 								_vm->_moveSens->getMoveResult(squareThing, currMapX, currMapY, kM1_MapXNotOnASquare, 0);
 								break;
 							case k5_WeaponThingType:
-								if (((Weapon*)squareThingData)->getDoNotDiscard())
+								if (((Weapon *)squareThingData)->getDoNotDiscard())
 									continue;
 
 								setCurrentMap(mapIndex);
 								_vm->_moveSens->getMoveResult(squareThing, currMapX, currMapY, kM1_MapXNotOnASquare, 0);
 								break;
 							case k10_JunkThingType:
-								if (((Junk*)squareThingData)->getDoNotDiscard())
+								if (((Junk *)squareThingData)->getDoNotDiscard())
 									continue;
 
 								setCurrentMap(mapIndex);
 								_vm->_moveSens->getMoveResult(squareThing, currMapX, currMapY, kM1_MapXNotOnASquare, 0);
 								break;
 							case k8_PotionThingType:
-								if (((Potion*)squareThingData)->getDoNotDiscard())
+								if (((Potion *)squareThingData)->getDoNotDiscard())
 									continue;
 
 								setCurrentMap(mapIndex);
@@ -1520,14 +1520,14 @@ uint16 DungeonMan::getCreatureAttributes(Thing thing) {
 	return _creatureInfos[currGroup->_type]._attributes;
 }
 
-void DungeonMan::setGroupCells(Group* group, uint16 cells, uint16 mapIndex) {
+void DungeonMan::setGroupCells(Group *group, uint16 cells, uint16 mapIndex) {
 	if (mapIndex == _partyMapIndex)
 		_vm->_groupMan->_activeGroups[group->getActiveGroupIndex()]._cells = cells;
 	else
 		group->_cells = cells;
 }
 
-void DungeonMan::setGroupDirections(Group* group, int16 dir, uint16 mapIndex) {
+void DungeonMan::setGroupDirections(Group *group, int16 dir, uint16 mapIndex) {
 	if (mapIndex == _partyMapIndex)
 		_vm->_groupMan->_activeGroups[group->getActiveGroupIndex()]._directions = (Direction)dir;
 	else
@@ -1535,7 +1535,7 @@ void DungeonMan::setGroupDirections(Group* group, int16 dir, uint16 mapIndex) {
 }
 
 bool DungeonMan::isCreatureAllowedOnMap(Thing thing, uint16 mapIndex) {
-	int16 creatureType = ((Group*)getThingData(thing))->_type;
+	int16 creatureType = ((Group *)getThingData(thing))->_type;
 	Map *map = &_dungeonMaps[mapIndex];
 	byte *allowedCreatureType = _dungeonMapData[mapIndex][map->_width] + map->_height + 1;
 	for (int16 L0234_i_Counter = map->_creatureTypeCount; L0234_i_Counter > 0; L0234_i_Counter--) {
@@ -1555,10 +1555,10 @@ void DungeonMan::unlinkThingFromList(Thing thingToUnlink, Thing thingInList, int
 
 	Thing *thingPtr = nullptr;
 	if (mapX >= 0) {
-		thingPtr = (Thing*)getThingData(thingToUnlink);
+		thingPtr = (Thing *)getThingData(thingToUnlink);
 		uint16 firstThingIndex = getSquareFirstThingIndex(mapX, mapY);
 		Thing *currThing = &_squareFirstThings[firstThingIndex]; /* BUG0_01 Coding error without consequence. The engine does not check that there are things at the specified square coordinates. f160_getSquareFirstThingIndex would return -1 for an empty square. No consequence as the function is never called with the coordinates of an empty square (except in the case of BUG0_59) */
-		if ((*thingPtr == Thing::_endOfList) && (((Thing*)currThing)->getTypeAndIndex() == thingToUnlink.toUint16())) { /* If the thing to unlink is the last thing on the square */
+		if ((*thingPtr == Thing::_endOfList) && (((Thing *)currThing)->getTypeAndIndex() == thingToUnlink.toUint16())) { /* If the thing to unlink is the last thing on the square */
 			clearFlag(_currMapData[mapX][mapY], k0x0010_ThingListPresent);
 			uint16 squareFirstThingIdx = _dungeonFileHeader._squareFirstThingCount - 1;
 			for (uint16 i = 0; i < squareFirstThingIdx - firstThingIndex; ++i)
@@ -1573,7 +1573,7 @@ void DungeonMan::unlinkThingFromList(Thing thingToUnlink, Thing thingInList, int
 			*thingPtr = Thing::_endOfList;
 			return;
 		}
-		if (((Thing*)currThing)->getTypeAndIndex() == thingToUnlink.toUint16()) {
+		if (((Thing *)currThing)->getTypeAndIndex() == thingToUnlink.toUint16()) {
 			*currThing = *thingPtr;
 			*thingPtr = Thing::_endOfList;
 			return;
@@ -1589,9 +1589,9 @@ void DungeonMan::unlinkThingFromList(Thing thingToUnlink, Thing thingInList, int
 		}
 		currThing = getNextThing(thingInList = currThing);
 	}
-	thingPtr = (Thing*)getThingData(thingInList);
+	thingPtr = (Thing *)getThingData(thingInList);
 	*thingPtr = getNextThing(currThing);
-	thingPtr = (Thing*)getThingData(thingToUnlink);
+	thingPtr = (Thing *)getThingData(thingToUnlink);
 	*thingPtr = Thing::_endOfList;
 }
 
@@ -1655,10 +1655,10 @@ Thing DungeonMan::getObjForProjectileLaucherOrObjGen(uint16 iconIndex) {
 	if (unusedThing == Thing::_none)
 		return Thing::_none;
 
-	Junk *junkPtr = (Junk*)getThingData(unusedThing);
+	Junk *junkPtr = (Junk *)getThingData(unusedThing);
 	junkPtr->setType(junkType); /* Also works for WEAPON in cases other than Boulder */
-	if ((iconIndex == k4_IconIndiceWeaponTorchUnlit) && ((Weapon*)junkPtr)->isLit()) /* BUG0_65 Torches created by object generator or projectile launcher sensors have no charges. Charges are only defined if the Torch is lit which is not possible at the time it is created */
-		((Weapon*)junkPtr)->setChargeCount(15);
+	if ((iconIndex == k4_IconIndiceWeaponTorchUnlit) && ((Weapon *)junkPtr)->isLit()) /* BUG0_65 Torches created by object generator or projectile launcher sensors have no charges. Charges are only defined if the Torch is lit which is not possible at the time it is created */
+		((Weapon *)junkPtr)->setChargeCount(15);
 
 	return unusedThing;
 }