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
@@ -2,98 +2,98 @@
#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;
}
}
}
@@ -359,99 +359,126 @@ void Dice::paintNumber( QPainter *p )
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
@@ -62,111 +62,113 @@ class OYatzee : public QMainWindow {
* 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