well, a lot more is now implemented

2 files changed, 160 insertions, 10 deletions

diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index 5c4d1f7..6228a8f 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -16,60 +16,69 @@
 #include <qiconset.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtextstream.h>
 #include <qtimer.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
 #include <qvbox.h>
 #include <qwidgetstack.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qregexp.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>
 
 OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( parent , name , fl )
 {
         QWidget *thing = new QWidget( this );
         setCentralWidget( thing );
         
+
+        setPlayerNumber( 4 );
+        setRoundsNumber( 1 );
+        
+        playerList ps;
+        ps.append( new Player( "Carsten" ) );
+        ps.append( new Player( "Julia" ) );
+        ps.append( new Player( "Christine" ) );
+        ps.append( new Player( "Stephan" ) );
+
+        Game *g = new Game( ps );
+        
+        
         QVBoxLayout *vbox = new QVBoxLayout( thing );
 
-        sb = new Scoreboard( thing , "sb" );
+        sb = new Scoreboard( ps, thing , "sb" );
         dw = new DiceWidget( thing , "dw" );
+        connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) );
         
         vbox->addWidget( sb );
         vbox->addWidget( dw );
-
-        setPlayerNumber( 2 );
-        setRoundsNumber( 1 );
-        
-        connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) );
 }
 
 OYatzee::~OYatzee()
 {
 }
 
 void OYatzee::detectPosibilities()
 {
         posibilities.clear();
         qDebug( "running detectPosibilities()" );
         
         Dice *d = dw->diceList.first();
 
         QValueListInt numbers;
         
         for ( ; d != 0 ; d = dw->diceList.next() )
         {
                 numbers.append( d->Value );
         }
         
         //the 6 numbers
         QValueListInt::Iterator it;
 
         for ( int i = 1 ; i < 7 ; ++i ) // check for 1-->6
@@ -139,50 +148,48 @@ void OYatzee::detectPosibilities()
                         //12345 or 23456
                         if ( numbers.find( 1 ) != numbers.end() || numbers.find( 6) != numbers.end() )
                                 isLong = true;
                 }
                 //1234
                 if ( numbers.find( 1 ) != numbers.end() && numbers.find( 2 ) != numbers.end() )
                         isShort = true;
                 //3456
                 if ( numbers.find( 5 ) != numbers.end() && numbers.find( 6 ) != numbers.end() )
                         isShort = true;
                 
                 if ( isShort )
                         posibilities.append( 10 );
                 if ( isLong )
                         posibilities.append( 11 );
                 }
         
         posibilities.append( 13 );        //Chance, well, this is allways possible
 
         displayPossibilites();
 }
 
 void OYatzee::displayPossibilites()
 {
-        qDebug( "running displayPossibilites(), %d item", posibilities.count() );
-        
         for ( QValueListInt::Iterator it = posibilities.begin() ; it != posibilities.end(); ++it )
         {
                 qDebug( QString::number( *it ) );
                 switch ( *it )
                 {
                         case Ones:
                                 qDebug( "1er" );
                                 break;
                         case Twos:
                                 qDebug( "2er" );
                                 break;
                         case Threes:
                                 qDebug( "3er" );
                                 break;
                         case Fours:
                                 qDebug( "4er" );
                                 break;
                         case Fives:
                                 qDebug( "5er" );
                                 break;
                         case Sixes:
                                 qDebug( "6er" );
                                 break;
                         case ThreeOfAKind:
@@ -219,50 +226,78 @@ void OYatzee::setRoundsNumber( const int num )
 {
         numOfRounds = num;
 }
 
 void OYatzee::slotStartGame()
 {
 }
 
 void OYatzee::slotRollDices()
 {
         Dice *d = dw->diceList.first();
         
         for ( ; d != 0 ; d = dw->diceList.next() )
         {
                 if ( !d->isSelected )
                         d->roll();
         }
         
         detectPosibilities();
 }
 
 /*
  * Scoreboard
  */
-Scoreboard::Scoreboard( QWidget *parent, const char *name ) : QWidget( parent , name )
+Scoreboard::Scoreboard( playerList ps, QWidget *parent, const char *name ) : QWidget( parent , name )
+{ 
+        ps_ = ps;
+
+        pb = new Possibilityboard( this , "pb" );
+
+        createResultboards( 4 );
+
+        QHBoxLayout *hbox = new QHBoxLayout( this );
+
+        hbox->addWidget( pb );
+
+        hbox->addSpacing( 25 );
+
+        Resultboard *r = rbList.first();
+        
+        for ( ; r != 0 ; r = rbList.next() )
+        {
+                hbox->addWidget( r );
+        }
+}
+
+void Scoreboard::createResultboards(const int num)
 {
+        Player *p = ps_.first();
+        for ( int i = 0 ; i < num ; ++i , p = ps_.next() )
+        {
+                QString n = p->playerName;
+                rbList.append( new Resultboard( n , this ) );
+        }
 }
 
 void Scoreboard::paintEvent( QPaintEvent * )
 {
         QPainter p;
         p.begin( this );
 
         p.drawRect( 0,0, this->width() , this->height() );
 }
 
 /*
  * Dice
  */
 Dice::Dice( QWidget *parent , const char *name ) : QFrame( parent , name )
 {
         QTime t = QTime::currentTime();   // set random seed
         srand(t.hour()*12+t.minute()*60+t.second()*60);
 
         connect( this , SIGNAL( selected() ), this , SLOT( slotSelected() ) );
 }
 
 void Dice::slotSelected()
 {
         if ( isSelected )
@@ -340,24 +375,83 @@ DiceWidget::DiceWidget( QWidget *parent , const char *name ) : QWidget(  parent
                 //appending the 5 dices of the game
                 diceList.append( new Dice( this, "wuerfel" ) );
         }
         
         QHBoxLayout *hbox = new QHBoxLayout( this );
 
         Dice *d = diceList.first();
         
         for ( ; d != 0 ; d = diceList.next() )
         {
                 hbox->addWidget( d );
         }
 
         hbox->addWidget( rollButton );
 }
 
 /*
  * Player
  */
 Player::Player( QString name )
 {
         playerName = name;
 }
 
+
+/*
+ * Board
+ */
+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
+ */
+
+Resultboard::Resultboard( QString playerName , QWidget *parent , const char* name ) : Board ( parent , name )
+{
+        pName = playerName;
+}
+
+void Resultboard::paintEvent( QPaintEvent* )
+{
+        QPainter p;
+        p.begin( this );
+
+        p.drawText( 10,10, pName );
+        p.drawRect( 0,0, this->width() , this->height() );
+}
+
+/*
+ * Possibilityboard
+ */
+
+Possibilityboard::Possibilityboard( QWidget *parent , const char* name ) : Board ( parent , name )
+{
+}
+
+void Possibilityboard::paintEvent( QPaintEvent* )
+{
+        QPainter p;
+        p.begin( this );
+
+        p.drawRect( 0,0, this->width() , this->height() );
+}
+
+/*
+ * Game
+ */
+
+Game::Game( playerList pla )
+{
+        players = pla;
+}
+
diff --git a/noncore/games/oyatzee/oyatzee.h b/noncore/games/oyatzee/oyatzee.h
index 65a18fc..dd996ee 100644
--- a/noncore/games/oyatzee/oyatzee.h
+++ b/noncore/games/oyatzee/oyatzee.h
@@ -1,116 +1,172 @@
 #ifndef WORDGAME_H
 #define WORDGAME_H
 
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qlist.h>
 
 #include <stdlib.h>       // rand() function
 #include <qdatetime.h>        // seed for rand()
 
 class Dice;
 class Game;
 class Scoreboard;
 class DiceWidget;
+class Resultboard;
+class Player;
 
 typedef QList<Dice> dicesList;
+typedef QList<Resultboard> resultboardList;
 typedef QValueList<int> QValueListInt;
+typedef QList<Player> playerList;
 
 class OYatzee : public QMainWindow {
         Q_OBJECT
         public:
                 OYatzee( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
                 ~OYatzee();
 
                 Game *g;
                 DiceWidget *dw;
                 Scoreboard *sb;
 
                         QValueListInt posibilities;     
                 
                 void setPlayerNumber( const int num );
                 void setRoundsNumber( const int num );
                 
                 enum { 
                                 Ones=1, 
                                 Twos = 2,
                                 Threes = 3,
                                 Fours = 4,
                                 Fives = 5,
                                 Sixes = 6,
                                 ThreeOfAKind = 7,        //12444
                                 FourOfAKind = 8,         //14444
                                 FullHouse = 9,           //22555
                                 SStraight = 10,          //13456
                                 LStraight = 11,          //12345
                                 Yatzee = 12,             //55555
                                 Chance = 13};
 
         public slots:
                 void slotStartGame();
                 void slotRollDices();
 
         private:
                 int numOfPlayers;
                 int numOfRounds;
 
+                /*
+                 * Check what posibilities the player currently has
+                 */
                 void detectPosibilities();
                 void displayPossibilites();
 
 };
 
 class Dice : public QFrame
 {
         Q_OBJECT
         public:
                 Dice( QWidget* parent = 0, const char* name = 0 );
 
                 int Value;
                 bool isSelected;
 
                 int hasValue();
                 void roll();
                 virtual void mousePressEvent( QMouseEvent* );
 
         private slots:
                 void slotSelected();
 
         signals:
                 void selected();
         
         protected:
                 void paintEvent(  QPaintEvent *e );
                 void paintNumber( QPainter *p );
 };
 
 class DiceWidget : public QWidget
 {
         Q_OBJECT
         public:
                 DiceWidget( QWidget *parent = 0, const char* name = 0 );
 
                 QPushButton *rollButton;
 
                 dicesList diceList;
 };
 
+
+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
+{
+        Q_OBJECT
+
+        public:
+                Possibilityboard( QWidget *parent = 0, const char* name = 0 );
+        
+        protected:
+                virtual void paintEvent(  QPaintEvent *e );
+};
+
+class Resultboard : public Board
+{
+        Q_OBJECT
+
+        public:
+                Resultboard( QString playerName , QWidget *parent = 0, const char* name = 0 );
+                QString pName;
+
+        protected:
+                virtual void paintEvent(  QPaintEvent *e );
+};
+
+
 class Scoreboard : public QWidget
 {
         Q_OBJECT
         public:
-                Scoreboard( QWidget *parent = 0, const char* name = 0 );
+                Scoreboard( playerList ps, QWidget *parent = 0, const char* name = 0 );
+
+                Possibilityboard *pb;
+                resultboardList rbList;
+                playerList ps_;
 
+                void createResultboards(const int);
+                
         protected:
                 void paintEvent(  QPaintEvent *e );
 };
 
+
 class Player
 {
         public:
                 Player( QString name );
 
                 QString playerName;
                 int totalPoints;
 };
 
+class Game
+{
+        public:
+                Game( playerList pla );
+                playerList players;
+};
+
 #endif // WORDGAME_H