From 2a6212d19d365fbf7ece74a2c2b2a466fb183bdd Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 5 May 2016 15:21:25 +0200 Subject: [PATCH] Character group data cleanup --- ZRColaCompile/dbsource.cpp | 8 +------- ZRColaCompile/dbsource.h | 1 - ZRColaCompile/main.cpp | 1 - lib/libZRColaUI/include/zrcolaui/chargroup.h | 5 ----- output/data/ZRCola.zrcdb | Bin 132992 -> 132808 bytes 5 files changed, 1 insertion(+), 14 deletions(-) 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 84d22cfe492f395f3fb6eee2845f0d4590e59a7e..be4147b56c721f309186e7afd5c31b0996a9952f 100644 GIT binary patch delta 1084 zcmXBRZA@H66b9h;9Cq(6OS>8%5fEXc7u&R3KX*|ZiXX*Tu_(~SRD#4>Y%8HvktQ@L z!TJL?jkTs459trnU^R_jQHfo}M2SX1v{j;i8Z~x9VlAv$Dv*WRrS-jVlV|4KduPtf znR)3*aO`lX(GZQ$8A{UvIoI$MsfspGBdM*uAfMaB1?jeJ zlTvE~ld{^ros>0}VN~iM5A}Es&tfm0K|5MgZK>@kLD24;l3TBHc+E}N#{u2^{UScV zS13TpdZ(nx#;2s+s?$=ll%;_Ky3xfs)hE$jD+pC8F|1eW+i4@XJxYu&dS~P z$E<9#>N#mlCg$XjSaFtVYqQc~$FdT&v8*&(`8*eBnU|xMnP<6W3({&m3sPraFUafG zcu8JMrY=dbTJ|z0M{-hE8iZi;QXO8oU5K#wQMVrbb}%PZb}}dRHkXq(?a(53a(0oq zJFjqKgIA=-%CE}qWdBu3h+QkX$y&VTglN=$5v}zKidalFW*uI0T(#NeRI4qTrwKci zr;l6MrzN)9rxmuzr?*&-7tQ#14)6Okv=rsXu*2Qsx;SJ1`m`uNj&^siTZNyz*Bh3H z+=ZR)^X@8)+d98iE+=@(&jg)*EwhAQx7we6jlAV(xm7s)w4P0wSNaz0#~wV*+wNrP jQB*`qaJyKSqc!%4H}bSMXUdD5fVvh9=xx>(&>Q~;6}KB} delta 1338 zcmZwGe@N7490&0C=eZwRX2D#I^z`)n9@CW+Tdq~gkS5j2$}So#O18e?RU;GJ=Xmv>s~_I|!6j6url-p}*>KHum2 zd7kI)?%DKH9qI1fJJ#cPTCY2?^p$-FfJ)j-$_-rF*0(Ub=VC@^XjlXajR^JqbgSJd zp}wl`P733f@3YQINI$5O*CiBA+bWmO2Y<^4YLWWe&FG>V)K5b+K@I_OsEDfRG+m-z z8l(&bq&WZ&l~XNs(shc_n@(2h0(Q}HI!CwYo(n-ZS$YY@DLoB%o2uv-eN97@Ab&cr zkvi#5dOQ!9BF}u_4JxO4x<-GHHv?Ep$Eb%|7jQnhO~2DPIWmJlUM8@H>M2M+(o>qD z%!Pb0mC}0@pgL-$Q}h*e(^a}p5t=0TBH&f>Q3Y+IJ=9D=I!`^M6hs$~$PE$w_lO)} zR7d1pMn^=71v(s&W$ZmPJ<;=`!gJ7tQCY#Lj>=L-Q&e~;`esxb7`dZT&Zrr+N4AY} zGU(n>X%mDCpGcBl4Lvv^S$cU)mattBlM2SCG5fJ^W75Q)e@xaf_KwL(#$RL7&ZqZ1 z6~AKlvvDb4TppM844LIz&&S2bc1~QX7>#jR!|0An4I>#h<%KsqlP~AqZPqn4As;dV z2`OO&6B1wyChQ_IlX8x|?j)BE{c}=2V)!SelF>9Nos6kT>ENX8Q?l5UWH0F23wuF7 zypYOVew85Df(CrT{{|dJKB{rYdLN$yx?o!Te5!IkWP@DKUY(8~~D6@hZQD&pHD6=>Aru2(4n_{I`FrLw%6L9}o);u-L8*1D8uZECXvIAKrIf@W@Z5t@BVz