Diffstat (limited to 'noncore/games/tetrix/qtetrixb.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/tetrix/qtetrixb.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/noncore/games/tetrix/qtetrixb.cpp b/noncore/games/tetrix/qtetrixb.cpp index 3c179df..8c41fb2 100644 --- a/noncore/games/tetrix/qtetrixb.cpp +++ b/noncore/games/tetrix/qtetrixb.cpp | |||
@@ -47,24 +47,25 @@ QTetrixBoard::QTetrixBoard( QWidget *p, const char *name ) | |||
47 | blockHeight = 20; | 47 | blockHeight = 20; |
48 | noGame = TRUE; | 48 | noGame = TRUE; |
49 | isPaused = FALSE; | 49 | isPaused = FALSE; |
50 | waitingAfterLine = FALSE; | 50 | waitingAfterLine = FALSE; |
51 | updateTimeoutTime(); // Sets timeoutTime | 51 | updateTimeoutTime(); // Sets timeoutTime |
52 | } | 52 | } |
53 | 53 | ||
54 | void QTetrixBoard::startGame(int gameType,int fillRandomLines) | 54 | void QTetrixBoard::startGame(int gameType,int fillRandomLines) |
55 | { | 55 | { |
56 | if ( isPaused ) | 56 | if ( isPaused ) |
57 | return; // ignore if game is paused | 57 | return; // ignore if game is paused |
58 | noGame = FALSE; | 58 | noGame = FALSE; |
59 | |||
59 | GenericTetrix::startGame( gameType, fillRandomLines ); | 60 | GenericTetrix::startGame( gameType, fillRandomLines ); |
60 | // Note that the timer is started by updateLevel! | 61 | // Note that the timer is started by updateLevel! |
61 | } | 62 | } |
62 | 63 | ||
63 | 64 | ||
64 | void QTetrixBoard::pause() | 65 | void QTetrixBoard::pause() |
65 | { | 66 | { |
66 | if ( noGame ) // game not active | 67 | if ( noGame ) // game not active |
67 | return; | 68 | return; |
68 | isPaused = !isPaused; | 69 | isPaused = !isPaused; |
69 | if ( isPaused ) { | 70 | if ( isPaused ) { |
70 | timer->stop(); | 71 | timer->stop(); |
@@ -197,26 +198,29 @@ void QTetrixBoard::drawContents( QPainter *p ) | |||
197 | y2 = 0; | 198 | y2 = 0; |
198 | if (y2 >= boardHeight()) | 199 | if (y2 >= boardHeight()) |
199 | y2 = boardHeight() - 1; | 200 | y2 = boardHeight() - 1; |
200 | 201 | ||
201 | updateBoard( x1, y1, x2, y2, TRUE ); | 202 | updateBoard( x1, y1, x2, y2, TRUE ); |
202 | paint = 0; // reset widget painter | 203 | paint = 0; // reset widget painter |
203 | return; | 204 | return; |
204 | } | 205 | } |
205 | 206 | ||
206 | void QTetrixBoard::resizeEvent(QResizeEvent *e) | 207 | void QTetrixBoard::resizeEvent(QResizeEvent *e) |
207 | { | 208 | { |
208 | QSize sz = e->size(); | 209 | QSize sz = e->size(); |
210 | |||
209 | blockWidth = (sz.width() - 2)/10; | 211 | blockWidth = (sz.width() - 2)/10; |
210 | blockHeight = (sz.height() - 2)/22; | 212 | blockHeight = (sz.height() - 2)/22; |
213 | /* blockWidth > blockHeight ? blockWidth = blockHeight | ||
214 | : blockHeight = blockWidth;*/ | ||
211 | xOffset = 1; | 215 | xOffset = 1; |
212 | //yOffset = 1; | 216 | //yOffset = 1; |
213 | yOffset = (sz.height() - 2) - (blockHeight *22); | 217 | yOffset = (sz.height() - 2) - (blockHeight *22); |
214 | } | 218 | } |
215 | 219 | ||
216 | void QTetrixBoard::keyPressEvent( QKeyEvent *e ) | 220 | void QTetrixBoard::keyPressEvent( QKeyEvent *e ) |
217 | { | 221 | { |
218 | if ( noGame || isPaused || waitingAfterLine ) | 222 | if ( noGame || isPaused || waitingAfterLine ) |
219 | return; | 223 | return; |
220 | switch( e->key() ) { | 224 | switch( e->key() ) { |
221 | case Key_Left : | 225 | case Key_Left : |
222 | moveLeft(); | 226 | moveLeft(); |