summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-08-13 18:14:00 (UTC)
committer cniehaus <cniehaus>2003-08-13 18:14:00 (UTC)
commit7812d22080064f97d964dcbc3b085fde586a97d7 (patch) (side-by-side diff)
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
@@ -46,10 +46,10 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow(
ps.append( new Player( "Julia" ) );
ps.append( new Player( "Christine" ) );
ps.append( new Player( "Stephan" ) );
- Game *g = new Game( ps );
-
+//X Game *g = new Game( ps );
+//X
QVBoxLayout *vbox = new QVBoxLayout( thing );
sb = new Scoreboard( ps, thing , "sb" );
@@ -403,16 +403,8 @@ Player::Player( QString name )
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
*/
@@ -442,9 +434,38 @@ void Possibilityboard::paintEvent( QPaintEvent* )
{
QPainter p;
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;
+ }
}
/*
* Game
@@ -454,4 +475,10 @@ Game::Game( playerList pla )
{
players = 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
@@ -106,11 +106,8 @@ class Board : public QWidget
{
Q_OBJECT
public:
Board( QWidget *parent = 0, const char* name = 0 );
-
- protected:
- virtual void paintEvent( QPaintEvent *e );
};
class Possibilityboard : public Board
{
@@ -165,8 +162,13 @@ class Player
class Game
{
public:
Game( playerList pla );
+
playerList players;
+ int currentPlayer;
+
+ void startGame();
+ void stopGame();
};
#endif // WORDGAME_H