Merge pull request #353 from KnopersPL/master

Fix for protocol 850 errors, thanks @KnopersPL
This commit is contained in:
Ben Dol 2013-08-25 03:54:39 -07:00
commit bbdeac2e33
2 changed files with 3 additions and 3 deletions

View File

@ -57,7 +57,7 @@ void buildMessageModesMap(int version) {
messageModesMap[Otc::MessageFailure] = 20; messageModesMap[Otc::MessageFailure] = 20;
messageModesMap[Otc::MessageBlue] = 21; messageModesMap[Otc::MessageBlue] = 21;
messageModesMap[Otc::MessageRed] = 22; messageModesMap[Otc::MessageRed] = 22;
} else if(version >= 854) { } else if(version >= 850) {
messageModesMap[Otc::MessageNone] = 0; messageModesMap[Otc::MessageNone] = 0;
messageModesMap[Otc::MessageSay] = 1; messageModesMap[Otc::MessageSay] = 1;
messageModesMap[Otc::MessageWhisper] = 2; messageModesMap[Otc::MessageWhisper] = 2;

View File

@ -385,7 +385,7 @@ void ProtocolGame::parseGMActions(const InputMessagePtr& msg)
int numViolationReasons; int numViolationReasons;
if(g_game.getProtocolVersion() >= 854) if(g_game.getProtocolVersion() >= 850)
numViolationReasons = 20; numViolationReasons = 20;
else else
numViolationReasons = 32; numViolationReasons = 32;
@ -535,7 +535,7 @@ void ProtocolGame::parseTileAddThing(const InputMessagePtr& msg)
Position pos = getPosition(msg); Position pos = getPosition(msg);
int stackPos = -1; int stackPos = -1;
if(g_game.getProtocolVersion() >= 854) if(g_game.getProtocolVersion() >= 850)
stackPos = msg->getU8(); stackPos = msg->getU8();
ThingPtr thing = getThing(msg); ThingPtr thing = getThing(msg);