diff --git a/modules/gamelib/game.lua b/modules/gamelib/game.lua index 8d524be4..0ca13e92 100644 --- a/modules/gamelib/game.lua +++ b/modules/gamelib/game.lua @@ -48,12 +48,13 @@ end function g_game.getSupportedClients() return { - 760, 770, 772, 810, 811, 840, 842, - 850, 853, 854, 860, 861, 862, 870, - 910, 940, 944, 953, 954, 960, 961, - 963, 970, 980, 981, 982, 983, 984, - 985, 986, 1001, 1002, 1010, 1020, - 1021, 1022 + 760, 770, 772, 780, 781, 782, 790, + 792, 800, 810, 811, 840, 842, 850, + 853, 854, 860, 861, 862, 870, 910, + 940, 944, 953, 954, 960, 961, 963, + 970, 980, 981, 982, 983, 984, 985, + 986, 1001, 1002, 1010, 1020, 1021, + 1022 } end diff --git a/src/client/game.cpp b/src/client/game.cpp index 0008eb2a..7081032e 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1445,7 +1445,7 @@ void Game::setProtocolVersion(int version) if(isOnline()) stdext::throw_exception("Unable to change protocol version while online"); - if(version != 0 && (version < 760 || (version > 772 && version < 810) || version > 1022)) + if(version != 0 && (version < 760 || version > 1022)) stdext::throw_exception(stdext::format("Protocol version %d not supported", version)); m_features.reset(); @@ -1553,7 +1553,7 @@ void Game::setClientVersion(int version) if(isOnline()) stdext::throw_exception("Unable to change client version while online"); - if(version != 0 && (version < 760 || (version > 772 && version < 810) || version > 1022)) + if(version != 0 && (version < 760 || version > 1022)) stdext::throw_exception(stdext::format("Client version %d not supported", version)); m_clientVersion = version; diff --git a/src/client/uiitem.cpp b/src/client/uiitem.cpp index 79a05b4f..a17afee4 100644 --- a/src/client/uiitem.cpp +++ b/src/client/uiitem.cpp @@ -59,7 +59,7 @@ void UIItem::drawSelf(Fw::DrawPane drawPane) m_item->draw(dest, scaleFactor, true); if(m_font && (m_item->isStackable() || m_item->isChargeable()) && m_item->getCountOrSubType() > 1) { - std::string count = stdext::to_string(m_item->getCount()); + std::string count = stdext::to_string(m_item->getCountOrSubType()); g_painter->setColor(Color(231, 231, 231)); m_font->drawText(count, Rect(m_rect.topLeft(), m_rect.bottomRight() - Point(3, 0)), Fw::AlignBottomRight); }