Merge pull request #799 from zygzagZ/master

Fixed inconsistences between const.lua and const.h causing messagetypes not to work
Fixed talking with npc for 8.54

modules/gamelib/const.lua

@@ -209,17 +209,18 @@ MessageModes = {
   TutorialHint            = 38,
   Thankyou                = 39,
   Market                  = 40,
-  BeyondLast              = 41,
-  MonsterYell             = 42,
-  MonsterSay              = 43,
-  Red                     = 44,
-  Blue                    = 45,
-  RVRChannel              = 46,
-  RVRAnswer               = 47,
-  RVRContinue             = 48,
-  GameHighlight           = 49,
-  NpcFromStartBlock       = 50,
-  Last                    = 51,
+  Mana                    = 41,
+  BeyondLast              = 42,
+  MonsterYell             = 43,
+  MonsterSay              = 44,
+  Red                     = 45,
+  Blue                    = 46,
+  RVRChannel              = 47,
+  RVRAnswer               = 48,
+  RVRContinue             = 49,
+  GameHighlight           = 50,
+  NpcFromStartBlock       = 51,
+  Last                    = 52,
   Invalid                 = 255,
 }
 

src/client/protocolcodes.cpp

@@ -119,7 +119,7 @@ void buildMessageModesMap(int version) {
         messageModesMap[Otc::MessageWhisper]                 = 2;
         messageModesMap[Otc::MessageYell]                    = 3;
         messageModesMap[Otc::MessageNpcTo]                   = 4;
-        messageModesMap[Otc::MessageNpcFrom]                 = 5;
+        messageModesMap[Otc::MessageNpcFromStartBlock]       = 5;
         messageModesMap[Otc::MessagePrivateFrom]             = 6;
         messageModesMap[Otc::MessagePrivateTo]               = 6;
         messageModesMap[Otc::MessageChannel]                 = 7;