diff options
Diffstat (limited to 'wordhunt.py')
-rw-r--r-- | wordhunt.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/wordhunt.py b/wordhunt.py index dfe0ea9..eb40646 100644 --- a/wordhunt.py +++ b/wordhunt.py @@ -159,15 +159,15 @@ class wordhunt(): for transform in matrix: new_row = row + transform[0] new_column = column + transform[1] - if new_row < 0 or new_column < 0 or \ - new_row > 3 or new_column > 3 or \ - used[new_row][new_column] == 1: - pass - elif self.dice[self.facedie[new_row][new_column]][self.face[new_row][new_column]] == letter: + if new_row >= 0 and new_column >= 0 and \ + new_row < 4 and new_column < 4 and \ + used[new_row][new_column] != 1 and \ + self.dice[self.facedie[new_row][new_column]][self.face[new_row][new_column]] == letter: used_copy = used used_copy[new_row][new_column] = 1 - return [[new_row, new_column]] + \ - self.find_word(new_word, new_row, new_column, used_copy) + new = self.find_word(new_word, new_row, new_column, used_copy) + if new != [False]: + return [[new_row, new_column]] + new return [False] def word_is_valid(self,word): @@ -218,7 +218,8 @@ class wordhunt(): for position in word_chain: self.grid.set_color(gtk.gdk.Color(100, 100, 60000), position[0], position[1]) - gobject.source_remove(self.highlight_timer) + if self.highlight_timer > 0: + gobject.source_remove(self.highlight_timer) self.highlight_timer = gobject.timeout_add(5000, self.unmark_word) return |