diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp index d85bb64..135f3ab 100644 --- a/ZRColaCompile/dbsource.cpp +++ b/ZRColaCompile/dbsource.cpp @@ -537,7 +537,7 @@ bool ZRCola::DBSource::SelectCharacterGroups(ATL::CComPtr& rs) con // Open it. if (FAILED(rs->Open(ATL::CComVariant( - L"SELECT DISTINCT [id], [Skupina], [opis_en], [Rang], [prikazano] " + L"SELECT DISTINCT [id], [Skupina], [opis_en], [Rang] " L"FROM [VRS_SkupinaZnakov] " L"ORDER BY [Rang], [opis_en]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText))) { @@ -576,12 +576,6 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr& rs, c wxCHECK(GetValue(f, cg.rank), false); } - { - ATL::CComPtr f; - wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"prikazano"), &f))); - wxCHECK(GetValue(f, cg.show), false); - } - { ATL::CComPtr f; wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"opis_en"), &f))); diff --git a/ZRColaCompile/dbsource.h b/ZRColaCompile/dbsource.h index 6409544..8382db3 100644 --- a/ZRColaCompile/dbsource.h +++ b/ZRColaCompile/dbsource.h @@ -93,7 +93,6 @@ namespace ZRCola { public: int id; ///< Character group ID int rank; ///< Character group rank - bool show; ///< Show initially std::wstring name; ///< Character group name std::wstring chars; ///< Character group characters }; diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index 5b20532..5de621f 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -622,7 +622,6 @@ int _tmain(int argc, _TCHAR *argv[]) db.data.push_back((unsigned __int16)cg.id); wxASSERT_MSG((int)0xffff8000 <= cg.rank && cg.rank <= (int)0x00007fff, wxT("character group rank out of bounds")); db.data.push_back((unsigned __int16)cg.rank); - db.data.push_back(cg.show ? ZRCola::chrgrp_db::chrgrp::SHOW : 0); std::wstring::size_type n_name = cg.name.length(); wxASSERT_MSG(n_name <= 0xffff, wxT("character group name too long")); db.data.push_back((unsigned __int16)n_name); diff --git a/lib/libZRColaUI/include/zrcolaui/chargroup.h b/lib/libZRColaUI/include/zrcolaui/chargroup.h index 5b8105e..0e7eba4 100644 --- a/lib/libZRColaUI/include/zrcolaui/chargroup.h +++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h @@ -44,13 +44,8 @@ namespace ZRCola { /// Character group data /// struct chrgrp { - enum flags_t { - SHOW = 1<<0, ///< Show initially - }; - unsigned __int16 id; ///< Character group id unsigned __int16 rank; ///< Character group rank - unsigned __int16 flags; ///< Character group flags (bitwise combination of \c flags_t flags) unsigned __int16 name_len; ///< Character group name length in \c data unsigned __int16 char_len; ///< Character list length in \c data wchar_t data[]; ///< Character group name and character list diff --git a/output/data/ZRCola.zrcdb b/output/data/ZRCola.zrcdb index 84d22cf..be4147b 100644 Binary files a/output/data/ZRCola.zrcdb and b/output/data/ZRCola.zrcdb differ