make popup ptr local on main menu

This commit is contained in:
2019-02-09 11:54:42 +01:00
parent 1876207afb
commit e629a2a7b5
5 changed files with 61 additions and 57 deletions

View File

@@ -105,8 +105,9 @@ public:
n = -n + 1;
j++;
auto ch = ru8();
for (int c = 0; c < n; c++)
data.push_back(ru8());
data.push_back(ch);
}
else
{
@@ -213,7 +214,7 @@ class ABR : public BinaryStream
Type::Vec items;
virtual std::string str(int indent, const std::string& prefix) const override
{
auto ret = std::string(indent, '-') + fmt::format("list: {} props:", items.size());
auto ret = std::string(indent, '-') + fmt::format("list: {} items:", items.size());
for (int i = 0; i < items.size(); i++)
ret += "\n" + items[i]->str(indent + 1, fmt::format("{}) ", i));
return ret;
@@ -371,11 +372,11 @@ private:
auto& method = m_parser_table[t];
return method();
}
else if (m_parser_table.find(pick(4)) != m_parser_table.end())
{
auto& method = m_parser_table[rstring(4)];
return method();
}
//else if (m_parser_table.find(pick(4)) != m_parser_table.end())
//{
// auto& method = m_parser_table[rstring(4)];
// return method();
//}
return nullptr;
}
std::map<std::string, std::function<Type::Ref()>> m_parser_table;