summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-08-13 18:14:00 (UTC)
committer cniehaus <cniehaus>2003-08-13 18:14:00 (UTC)
commit7812d22080064f97d964dcbc3b085fde586a97d7 (patch) (unidiff)
treec7f7af3163c2c945e78a9bc91c6d8b8714a7f2e1
parent7bb7c8f7f2af7854e3d50f07a8ff33ee3462c194 (diff)
downloadopie-7812d22080064f97d964dcbc3b085fde586a97d7.zip
opie-7812d22080064f97d964dcbc3b085fde586a97d7.tar.gz
opie-7812d22080064f97d964dcbc3b085fde586a97d7.tar.bz2
more done, much more to do
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/oyatzee/oyatzee.cpp49
-rw-r--r--noncore/games/oyatzee/oyatzee.h8
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
@@ -47,8 +47,8 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow(
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
@@ -404,14 +404,6 @@ Board::Board( QWidget *parent , const char* name ) : QWidget ( parent , name )
404{ 404{
405} 405}
406 406
407void 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 */
@@ -443,7 +435,36 @@ void Possibilityboard::paintEvent( QPaintEvent* )
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/*
@@ -455,3 +476,9 @@ Game::Game( playerList pla )
455 players = pla; 476 players = pla;
456} 477}
457 478
479void Game::startGame()
480{}
481
482void 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
@@ -107,9 +107,6 @@ class Board : public QWidget
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
115class Possibilityboard : public Board 112class Possibilityboard : public Board
@@ -166,7 +163,12 @@ 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