Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Character group data cleanup

Browse Source
This commit is contained in:
Simon Rozman 2016-05-05 15:21:25 +02:00
parent 1a6dc8b723
commit 2a6212d19d
5 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ZRColaCompile/dbsource.cpp
View File

@ -537,7 +537,7 @@ bool ZRCola::DBSource::SelectCharacterGroups(ATL::CComPtr<ADORecordset>& rs) con
// Open it. // Open it.
if (FAILED(rs->Open(ATL::CComVariant( 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"FROM [VRS_SkupinaZnakov] "
L"ORDER BY [Rang], [opis_en]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText))) L"ORDER BY [Rang], [opis_en]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
{ {
@ -576,12 +576,6 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr<ADORecordset>& rs, c
wxCHECK(GetValue(f, cg.rank), false); wxCHECK(GetValue(f, cg.rank), false);
} }
{
ATL::CComPtr<ADOField> f;
wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"prikazano"), &f)));
wxCHECK(GetValue(f, cg.show), false);
}
{ {
ATL::CComPtr<ADOField> f; ATL::CComPtr<ADOField> f;
wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"opis_en"), &f))); wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"opis_en"), &f)));

1
ZRColaCompile/dbsource.h
View File

@ -93,7 +93,6 @@ namespace ZRCola {
public: public:
int id; ///< Character group ID int id; ///< Character group ID
int rank; ///< Character group rank int rank; ///< Character group rank
bool show; ///< Show initially
std::wstring name; ///< Character group name std::wstring name; ///< Character group name
std::wstring chars; ///< Character group characters std::wstring chars; ///< Character group characters
}; };

1
ZRColaCompile/main.cpp
View File

@ -622,7 +622,6 @@ int _tmain(int argc, _TCHAR *argv[])
db.data.push_back((unsigned __int16)cg.id); 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")); 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((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(); std::wstring::size_type n_name = cg.name.length();
wxASSERT_MSG(n_name <= 0xffff, wxT("character group name too long")); wxASSERT_MSG(n_name <= 0xffff, wxT("character group name too long"));
db.data.push_back((unsigned __int16)n_name); db.data.push_back((unsigned __int16)n_name);

5
lib/libZRColaUI/include/zrcolaui/chargroup.h
View File

@ -44,13 +44,8 @@ namespace ZRCola {
/// Character group data /// Character group data
/// ///
struct chrgrp { struct chrgrp {
enum flags_t {
SHOW = 1<<0, ///< Show initially
};
unsigned __int16 id; ///< Character group id unsigned __int16 id; ///< Character group id
unsigned __int16 rank; ///< Character group rank 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 name_len; ///< Character group name length in \c data
unsigned __int16 char_len; ///< Character list length in \c data unsigned __int16 char_len; ///< Character list length in \c data
wchar_t data[]; ///< Character group name and character list wchar_t data[]; ///< Character group name and character list

BIN
output/data/ZRCola.zrcdb
View File

Binary file not shown.