more done, much more to do

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
@@ -1,457 +1,484 @@
 #include "oyatzee.h"
 
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/filemanager.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qapplication.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qdir.h>
 #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 );
-        
+        //X Game *g = new Game( ps );
+        //X 
         
         QVBoxLayout *vbox = new QVBoxLayout( thing );
 
         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 );
 }
 
 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
         {
                 bool cont = false;
                 it = numbers.begin();
                 for ( ; it != numbers.end() ; ++it )
                 {
                         if ( cont )
                                 continue;
                 
                         if ( numbers.find( i ) != numbers.end() )
                         {
                                 posibilities.append( i );
                                 cont = true;
                         }
                 }
         }
                 
         
         //3er, 4er, Yatzee
         it = numbers.begin();
         int count;
         int temp;
         int countFH = 0; //for the full-house-check
 
         for ( int i = 1 ; i < 7 ; ++i ) // check for 1-->6 at least 3 times
         {
                 count = 0;
                 temp = 0;
                 it = numbers.begin();
                 for ( ; it != numbers.end() ; ++it )
                 {
                         if ( *it == i )
                         {
                                 count++;
                                 temp++;
                         }
                         if ( temp == 2 )
                                 countFH = temp;
                 }
                 
                 if ( count >= 3 )
                 {
                         posibilities.append( 7 );
 
                         //now we check if it is a full house
                         if ( count == 3 && countFH == 2 ) //aka Full House
                                 posibilities.append( 9 );
                 }
                 if ( count >= 4 )
                         posibilities.append( 8 );
                 if ( count == 5 )                     //Yatzee
                         posibilities.append( 12 );
         }
         
         //S-Straight
         if ( numbers.find( 3 ) != numbers.end() && numbers.find( 4 ) != numbers.end() )
         {
                 bool isLong = false;
                 bool isShort = true;
                 //L-Straight
                 if ( numbers.find( 2 ) != numbers.end() && numbers.find( 5 ) != numbers.end() )
                 {
                         isShort = true;
                 
                         //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()
 {
         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:
                                 qDebug( "3oaK" );
                                 break;
                         case FourOfAKind:
                                 qDebug( "4oaK" );
                                 break;
                         case FullHouse:
                                 qDebug( "Full House" );
                                 break;
                         case SStraight:
                                 qDebug( "Short S" );
                                 break;
                         case LStraight:
                                 qDebug( "Long S" );
                                 break;
                         case Yatzee:
                                 qDebug( "Yatzee!" );
                                 break;
                         case Chance:
                                 qDebug( "Chance" );
                                 break;
                 }
         }
 }
 
 void OYatzee::setPlayerNumber( const int num )
 {
         numOfPlayers = num;
 }
 
 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( 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 )
                 isSelected = false;
         else isSelected = true;
 
         update();
 }
 
 int Dice::hasValue()
 {
         return Value;
 }
 
 void Dice::roll()
 {
         Value = rand()%6;
         Value += 1;
 
         update();
 }
 
 void Dice::mousePressEvent( QMouseEvent* /*e*/ )
 {
             emit selected();
 }
 
 void Dice::paintEvent( QPaintEvent * )
 {
         QPainter p;
         p.begin( this );
 
         p.drawRect( 0,0, this->width() , this->height() );
 
         if ( isSelected )
                 p.drawRect( 20,20, 10,10 );
 
         paintNumber( &p );
 }
 
 void Dice::paintNumber( QPainter *p )
 {
         switch ( Value )
         {
                 case 1:
                         p->drawText( 10,10,"1");
                         break;
                 case 2:
                         p->drawText( 10,10,"2");
                         break;
                 case 3:
                         p->drawText( 10,10,"3");
                         break;
                 case 4:
                         p->drawText( 10,10,"4");
                         break;
                 case 5:
                         p->drawText( 10,10,"5");
                         break;
                 case 6:
                         p->drawText( 10,10,"6");
                         break;
         }
 }
 
 /*
  * DiceWidget
  */
 DiceWidget::DiceWidget( QWidget *parent , const char *name ) : QWidget(  parent , name )
 {
         rollButton = new QPushButton( tr( "Roll" ) , this ) ;
         
         for ( int i = 0 ; i < 5 ; i++ )
         {
                 //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() );
+        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
  */
 
 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
@@ -1,172 +1,174 @@
 #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( 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;
+                int currentPlayer;
+
+                void startGame();
+                void stopGame();
 };
 
 #endif // WORDGAME_H