summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -48,6 +48,6 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow(
ps.append( new Player( "Stephan" ) );
- Game *g = new Game( ps );
-
+//X Game *g = new Game( ps );
+//X
QVBoxLayout *vbox = new QVBoxLayout( thing );
@@ -405,12 +405,4 @@ Board::Board( QWidget *parent , const char* name ) : QWidget ( parent , name )
}
-void Board::paintEvent( QPaintEvent* )
-{
- QPainter p;
- p.begin( this );
-
- p.drawRect( 0,0, this->width() , this->height() );
-}
-
/*
* Resultboard
@@ -444,5 +436,34 @@ void Possibilityboard::paintEvent( QPaintEvent* )
p.begin( this );
- p.drawRect( 0,0, this->width() , this->height() );
+ const int cell_width = this->width();
+ const int h = this->height();
+ const int cell_height = h/17;
+
+ QStringList begriffe;
+ begriffe.append( "1er" );
+ begriffe.append( "2er" );
+ begriffe.append( "3er" );
+ begriffe.append( "4er" );
+ begriffe.append( "5er" );
+ begriffe.append( "6er" );
+ begriffe.append( "Total" );
+ begriffe.append( "Bonus" );
+ begriffe.append( "3oaK" );
+ begriffe.append( "4oaK" );
+ begriffe.append( "Full House" );
+ begriffe.append( "Short S" );
+ begriffe.append( "Long S" );
+ begriffe.append( "Yatzee!" );
+ begriffe.append( "Chance" );
+ begriffe.append( "Score" );
+
+ QStringList::Iterator it = begriffe.begin();
+
+ for ( int i = 1 ; i < 18 ; ++i )
+ {
+ p.drawRect( 0 , i*cell_height , cell_width , cell_height );
+ p.drawText( 0 , i*cell_height , cell_width , cell_height , Qt::AlignCenter , *it );
+ ++it;
+ }
}
@@ -456,2 +477,8 @@ Game::Game( playerList pla )
}
+void Game::startGame()
+{}
+
+void Game::stopGame()
+{}
+
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
@@ -108,7 +108,4 @@ class Board : public QWidget
public:
Board( QWidget *parent = 0, const char* name = 0 );
-
- protected:
- virtual void paintEvent( QPaintEvent *e );
};
@@ -167,5 +164,10 @@ class Game
public:
Game( playerList pla );
+
playerList players;
+ int currentPlayer;
+
+ void startGame();
+ void stopGame();
};