alex/CrossGen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small codestyle changes

Browse Source
This commit is contained in:
Aleksey Lobanov
2015-06-19 13:18:58 +03:00
parent f3748c1e95
commit 046d5a3a7c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crossexport.hpp
View File

@@ -24,7 +24,7 @@ wxString getGridString(const FilledCrossword &cross, wxChar space = wxT('-')){
wxString t_string; wxString t_string;
FilledCrossword t_cross(cross); FilledCrossword t_cross(cross);
if ( t_cross.ans.size() != 0 ) { if ( !t_cross.ans.empty() ) {
fillCross(t_cross); fillCross(t_cross);
} }
for (size_t i = 0; i < t_cross.grid.at(0).size(); ++i){ for (size_t i = 0; i < t_cross.grid.at(0).size(); ++i){
@@ -44,7 +44,7 @@ wxString getQuesString(const FilledCrossword &cross){
wxString t_string; wxString t_string;
if ( cross.ques.size() != 0 ) { // == print questions if ( !cross.ques.empty() ) { // == print questions
t_string += _("Vertical words:") + LINE_END; t_string += _("Vertical words:") + LINE_END;
for (size_t i = 0; i < cross.words.size(); ++i){ for (size_t i = 0; i < cross.words.size(); ++i){

6
src/crossgen.hpp
View File

@@ -199,14 +199,12 @@ bool procCross(
TransedWord cur_word = words.at(cur_len).at((icw + rand_add) % cur_words_size); TransedWord cur_word = words.at(cur_len).at((icw + rand_add) % cur_words_size);
// Показывает, можно ли записать это слово в сетку // Показывает, можно ли записать это слово в сетку
bool can_write = true; bool can_write = true;
if (cur_wi.direct == false){ if ( cur_wi.direct == false ){
for (size_t j = 0; j < cur_wi.len; ++j) for (size_t j = 0; j < cur_wi.len; ++j)
if ((grid.at(cur_wi.x).at(j + cur_wi.y) != TRANS_CLEAR) && if ((grid.at(cur_wi.x).at(j + cur_wi.y) != TRANS_CLEAR) &&
(grid.at(cur_wi.x).at(j + cur_wi.y) != cur_word.at(j))) (grid.at(cur_wi.x).at(j + cur_wi.y) != cur_word.at(j)))
can_write = false; can_write = false;
} } else {
if (cur_wi.direct == true){
for (size_t j = 0; j < cur_wi.len; ++j) for (size_t j = 0; j < cur_wi.len; ++j)
if ((grid.at(cur_wi.x + j).at(cur_wi.y) != TRANS_CLEAR) && if ((grid.at(cur_wi.x + j).at(cur_wi.y) != TRANS_CLEAR) &&
(grid.at(cur_wi.x + j).at(cur_wi.y) != cur_word.at(j))) (grid.at(cur_wi.x + j).at(cur_wi.y) != cur_word.at(j)))