author | simon <simon> | 2002-04-30 14:37:40 (UTC) |
---|---|---|
committer | simon <simon> | 2002-04-30 14:37:40 (UTC) |
commit | c63b1853bb26bcd5ae21b73eb21d858a56534914 (patch) (unidiff) | |
tree | 9a0e5351252a80292cf5af0131487ac1742a335d | |
parent | 85b6723c707949f5689bfca6f442d9cbb73f2ee9 (diff) | |
download | opie-c63b1853bb26bcd5ae21b73eb21d858a56534914.zip opie-c63b1853bb26bcd5ae21b73eb21d858a56534914.tar.gz opie-c63b1853bb26bcd5ae21b73eb21d858a56534914.tar.bz2 |
- no default args in method impls
- resolved parameter shadowing
-rw-r--r-- | noncore/games/mindbreaker/mindbreaker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp index b0e4d88..1a1d05d 100644 --- a/noncore/games/mindbreaker/mindbreaker.cpp +++ b/noncore/games/mindbreaker/mindbreaker.cpp | |||
@@ -124,25 +124,25 @@ void Peg::buildImages() | |||
124 | QImage Peg::imageForType(int t) | 124 | QImage Peg::imageForType(int t) |
125 | { | 125 | { |
126 | if (eggLevel > t ) { | 126 | if (eggLevel > t ) { |
127 | if( t < 5) { | 127 | if( t < 5) { |
128 | return *specialPegs[t]; | 128 | return *specialPegs[t]; |
129 | } else { | 129 | } else { |
130 | return *normalPegs[rand() % 6]; | 130 | return *normalPegs[rand() % 6]; |
131 | } | 131 | } |
132 | } | 132 | } |
133 | return *normalPegs[t]; | 133 | return *normalPegs[t]; |
134 | } | 134 | } |
135 | 135 | ||
136 | Peg::Peg(QCanvas *canvas , int t, int g = -1, int p = -1) | 136 | Peg::Peg(QCanvas *canvas , int t, int g, int p) |
137 | : QCanvasRectangle(canvas) | 137 | : QCanvasRectangle(canvas) |
138 | { | 138 | { |
139 | setSize(normalPegs[t]->width(), normalPegs[t]->height() ); | 139 | setSize(normalPegs[t]->width(), normalPegs[t]->height() ); |
140 | pegtype = t; | 140 | pegtype = t; |
141 | isplaced = FALSE; | 141 | isplaced = FALSE; |
142 | peg_pos = p; | 142 | peg_pos = p; |
143 | peg_go = g; | 143 | peg_go = g; |
144 | aniStep = rand() % 6; | 144 | aniStep = rand() % 6; |
145 | setAnimated(TRUE); | 145 | setAnimated(TRUE); |
146 | } | 146 | } |
147 | 147 | ||
148 | void Peg::advance(int phase) { | 148 | void Peg::advance(int phase) { |
@@ -196,25 +196,25 @@ inline void Peg::setPlaced(bool p) | |||
196 | { | 196 | { |
197 | isplaced = p; | 197 | isplaced = p; |
198 | } | 198 | } |
199 | 199 | ||
200 | inline int Peg::type() const | 200 | inline int Peg::type() const |
201 | { | 201 | { |
202 | return pegtype; | 202 | return pegtype; |
203 | } | 203 | } |
204 | 204 | ||
205 | /* Load the main image, copy from it the pegs, the board, and the answer image | 205 | /* Load the main image, copy from it the pegs, the board, and the answer image |
206 | * and use these to create the tray, answer and board | 206 | * and use these to create the tray, answer and board |
207 | */ | 207 | */ |
208 | MindBreaker::MindBreaker( QWidget *parent=0, const char *name=0, int wFlags=0 ) | 208 | MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) |
209 | : QMainWindow(parent, name, wFlags), | 209 | : QMainWindow(parent, name, wFlags), |
210 | canvas(board_height, board_width) | 210 | canvas(board_height, board_width) |
211 | { | 211 | { |
212 | MindBreakerBoard *m = new MindBreakerBoard(canvas, this); | 212 | MindBreakerBoard *m = new MindBreakerBoard(canvas, this); |
213 | setCentralWidget(m); | 213 | setCentralWidget(m); |
214 | 214 | ||
215 | setToolBarsMovable( FALSE ); | 215 | setToolBarsMovable( FALSE ); |
216 | 216 | ||
217 | QPEToolBar *tb = new QPEToolBar(this); | 217 | QPEToolBar *tb = new QPEToolBar(this); |
218 | tb->setHorizontalStretchable( TRUE ); | 218 | tb->setHorizontalStretchable( TRUE ); |
219 | 219 | ||
220 | QPixmap newicon = Resource::loadPixmap("new"); | 220 | QPixmap newicon = Resource::loadPixmap("new"); |
@@ -241,27 +241,27 @@ void MindBreaker::setScore(int turns, int games) | |||
241 | double total_turns = turns; | 241 | double total_turns = turns; |
242 | double total_games = games; | 242 | double total_games = games; |
243 | 243 | ||
244 | if(total_games > 0) | 244 | if(total_games > 0) |
245 | average = total_turns / total_games; | 245 | average = total_turns / total_games; |
246 | else | 246 | else |
247 | average = 0.0; | 247 | average = 0.0; |
248 | 248 | ||
249 | score->setText(tr("win avg: %1 turns (%2 games)").arg(average).arg(games)); | 249 | score->setText(tr("win avg: %1 turns (%2 games)").arg(average).arg(games)); |
250 | } | 250 | } |
251 | 251 | ||
252 | 252 | ||
253 | MindBreakerBoard::MindBreakerBoard( QCanvas &c, QWidget *parent=0, | 253 | MindBreakerBoard::MindBreakerBoard( QCanvas &canv, QWidget *parent, |
254 | const char *name=0, int wFlags=0 ) | 254 | const char *name, int wFlags ) |
255 | : QCanvasView(&c, parent, name, wFlags) | 255 | : QCanvasView(&canv, parent, name, wFlags) |
256 | { | 256 | { |
257 | int i, x, y; | 257 | int i, x, y; |
258 | struct timeval tv; | 258 | struct timeval tv; |
259 | 259 | ||
260 | current_go = 0; | 260 | current_go = 0; |
261 | gettimeofday(&tv, 0); | 261 | gettimeofday(&tv, 0); |
262 | 262 | ||
263 | srand(tv.tv_usec); | 263 | srand(tv.tv_usec); |
264 | 264 | ||
265 | canvas()->setAdvancePeriod(500); | 265 | canvas()->setAdvancePeriod(500); |
266 | 266 | ||
267 | QImage image = Resource::loadImage("mindbreaker/mindbreaker"); | 267 | QImage image = Resource::loadImage("mindbreaker/mindbreaker"); |