-rw-r--r-- | noncore/games/oyatzee/oyatzee.cpp | 49 | ||||
-rw-r--r-- | noncore/games/oyatzee/oyatzee.h | 8 |
2 files changed, 43 insertions, 14 deletions
diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp index 6228a8f..d0e220c 100644 --- a/noncore/games/oyatzee/oyatzee.cpp +++ b/noncore/games/oyatzee/oyatzee.cpp | |||
@@ -38,26 +38,26 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( | |||
38 | setCentralWidget( thing ); | 38 | setCentralWidget( thing ); |
39 | 39 | ||
40 | 40 | ||
41 | setPlayerNumber( 4 ); | 41 | setPlayerNumber( 4 ); |
42 | setRoundsNumber( 1 ); | 42 | setRoundsNumber( 1 ); |
43 | 43 | ||
44 | playerList ps; | 44 | playerList ps; |
45 | ps.append( new Player( "Carsten" ) ); | 45 | ps.append( new Player( "Carsten" ) ); |
46 | ps.append( new Player( "Julia" ) ); | 46 | ps.append( new Player( "Julia" ) ); |
47 | ps.append( new Player( "Christine" ) ); | 47 | ps.append( new Player( "Christine" ) ); |
48 | ps.append( new Player( "Stephan" ) ); | 48 | ps.append( new Player( "Stephan" ) ); |
49 | 49 | ||
50 | Game *g = new Game( ps ); | 50 | //X Game *g = new Game( ps ); |
51 | 51 | //X | |
52 | 52 | ||
53 | QVBoxLayout *vbox = new QVBoxLayout( thing ); | 53 | QVBoxLayout *vbox = new QVBoxLayout( thing ); |
54 | 54 | ||
55 | sb = new Scoreboard( ps, thing , "sb" ); | 55 | sb = new Scoreboard( ps, thing , "sb" ); |
56 | dw = new DiceWidget( thing , "dw" ); | 56 | dw = new DiceWidget( thing , "dw" ); |
57 | connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) ); | 57 | connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) ); |
58 | 58 | ||
59 | vbox->addWidget( sb ); | 59 | vbox->addWidget( sb ); |
60 | vbox->addWidget( dw ); | 60 | vbox->addWidget( dw ); |
61 | } | 61 | } |
62 | 62 | ||
63 | OYatzee::~OYatzee() | 63 | OYatzee::~OYatzee() |
@@ -395,32 +395,24 @@ Player::Player( QString name ) | |||
395 | { | 395 | { |
396 | playerName = name; | 396 | playerName = name; |
397 | } | 397 | } |
398 | 398 | ||
399 | 399 | ||
400 | /* | 400 | /* |
401 | * Board | 401 | * Board |
402 | */ | 402 | */ |
403 | Board::Board( QWidget *parent , const char* name ) : QWidget ( parent , name ) | 403 | Board::Board( QWidget *parent , const char* name ) : QWidget ( parent , name ) |
404 | { | 404 | { |
405 | } | 405 | } |
406 | 406 | ||
407 | void Board::paintEvent( QPaintEvent* ) | ||
408 | { | ||
409 | QPainter p; | ||
410 | p.begin( this ); | ||
411 | |||
412 | p.drawRect( 0,0, this->width() , this->height() ); | ||
413 | } | ||
414 | |||
415 | /* | 407 | /* |
416 | * Resultboard | 408 | * Resultboard |
417 | */ | 409 | */ |
418 | 410 | ||
419 | Resultboard::Resultboard( QString playerName , QWidget *parent , const char* name ) : Board ( parent , name ) | 411 | Resultboard::Resultboard( QString playerName , QWidget *parent , const char* name ) : Board ( parent , name ) |
420 | { | 412 | { |
421 | pName = playerName; | 413 | pName = playerName; |
422 | } | 414 | } |
423 | 415 | ||
424 | void Resultboard::paintEvent( QPaintEvent* ) | 416 | void Resultboard::paintEvent( QPaintEvent* ) |
425 | { | 417 | { |
426 | QPainter p; | 418 | QPainter p; |
@@ -434,24 +426,59 @@ void Resultboard::paintEvent( QPaintEvent* ) | |||
434 | * Possibilityboard | 426 | * Possibilityboard |
435 | */ | 427 | */ |
436 | 428 | ||
437 | Possibilityboard::Possibilityboard( QWidget *parent , const char* name ) : Board ( parent , name ) | 429 | Possibilityboard::Possibilityboard( QWidget *parent , const char* name ) : Board ( parent , name ) |
438 | { | 430 | { |
439 | } | 431 | } |
440 | 432 | ||
441 | void Possibilityboard::paintEvent( QPaintEvent* ) | 433 | void Possibilityboard::paintEvent( QPaintEvent* ) |
442 | { | 434 | { |
443 | QPainter p; | 435 | QPainter p; |
444 | p.begin( this ); | 436 | p.begin( this ); |
445 | 437 | ||
446 | p.drawRect( 0,0, this->width() , this->height() ); | 438 | const int cell_width = this->width(); |
439 | const int h = this->height(); | ||
440 | const int cell_height = h/17; | ||
441 | |||
442 | QStringList begriffe; | ||
443 | begriffe.append( "1er" ); | ||
444 | begriffe.append( "2er" ); | ||
445 | begriffe.append( "3er" ); | ||
446 | begriffe.append( "4er" ); | ||
447 | begriffe.append( "5er" ); | ||
448 | begriffe.append( "6er" ); | ||
449 | begriffe.append( "Total" ); | ||
450 | begriffe.append( "Bonus" ); | ||
451 | begriffe.append( "3oaK" ); | ||
452 | begriffe.append( "4oaK" ); | ||
453 | begriffe.append( "Full House" ); | ||
454 | begriffe.append( "Short S" ); | ||
455 | begriffe.append( "Long S" ); | ||
456 | begriffe.append( "Yatzee!" ); | ||
457 | begriffe.append( "Chance" ); | ||
458 | begriffe.append( "Score" ); | ||
459 | |||
460 | QStringList::Iterator it = begriffe.begin(); | ||
461 | |||
462 | for ( int i = 1 ; i < 18 ; ++i ) | ||
463 | { | ||
464 | p.drawRect( 0 , i*cell_height , cell_width , cell_height ); | ||
465 | p.drawText( 0 , i*cell_height , cell_width , cell_height , Qt::AlignCenter , *it ); | ||
466 | ++it; | ||
467 | } | ||
447 | } | 468 | } |
448 | 469 | ||
449 | /* | 470 | /* |
450 | * Game | 471 | * Game |
451 | */ | 472 | */ |
452 | 473 | ||
453 | Game::Game( playerList pla ) | 474 | Game::Game( playerList pla ) |
454 | { | 475 | { |
455 | players = pla; | 476 | players = pla; |
456 | } | 477 | } |
457 | 478 | ||
479 | void Game::startGame() | ||
480 | {} | ||
481 | |||
482 | void Game::stopGame() | ||
483 | {} | ||
484 | |||
diff --git a/noncore/games/oyatzee/oyatzee.h b/noncore/games/oyatzee/oyatzee.h index dd996ee..1074f1d 100644 --- a/noncore/games/oyatzee/oyatzee.h +++ b/noncore/games/oyatzee/oyatzee.h | |||
@@ -98,27 +98,24 @@ class DiceWidget : public QWidget | |||
98 | 98 | ||
99 | QPushButton *rollButton; | 99 | QPushButton *rollButton; |
100 | 100 | ||
101 | dicesList diceList; | 101 | dicesList diceList; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | 104 | ||
105 | class Board : public QWidget | 105 | class Board : public QWidget |
106 | { | 106 | { |
107 | Q_OBJECT | 107 | Q_OBJECT |
108 | public: | 108 | public: |
109 | Board( QWidget *parent = 0, const char* name = 0 ); | 109 | Board( QWidget *parent = 0, const char* name = 0 ); |
110 | |||
111 | protected: | ||
112 | virtual void paintEvent( QPaintEvent *e ); | ||
113 | }; | 110 | }; |
114 | 111 | ||
115 | class Possibilityboard : public Board | 112 | class Possibilityboard : public Board |
116 | { | 113 | { |
117 | Q_OBJECT | 114 | Q_OBJECT |
118 | 115 | ||
119 | public: | 116 | public: |
120 | Possibilityboard( QWidget *parent = 0, const char* name = 0 ); | 117 | Possibilityboard( QWidget *parent = 0, const char* name = 0 ); |
121 | 118 | ||
122 | protected: | 119 | protected: |
123 | virtual void paintEvent( QPaintEvent *e ); | 120 | virtual void paintEvent( QPaintEvent *e ); |
124 | }; | 121 | }; |
@@ -157,16 +154,21 @@ class Player | |||
157 | { | 154 | { |
158 | public: | 155 | public: |
159 | Player( QString name ); | 156 | Player( QString name ); |
160 | 157 | ||
161 | QString playerName; | 158 | QString playerName; |
162 | int totalPoints; | 159 | int totalPoints; |
163 | }; | 160 | }; |
164 | 161 | ||
165 | class Game | 162 | class Game |
166 | { | 163 | { |
167 | public: | 164 | public: |
168 | Game( playerList pla ); | 165 | Game( playerList pla ); |
166 | |||
169 | playerList players; | 167 | playerList players; |
168 | int currentPlayer; | ||
169 | |||
170 | void startGame(); | ||
171 | void stopGame(); | ||
170 | }; | 172 | }; |
171 | 173 | ||
172 | #endif // WORDGAME_H | 174 | #endif // WORDGAME_H |