Commit fec5b21a authored by Albert Astals Cid's avatar Albert Astals Cid

Fix bug #73944. Bump version. Update Changelog a bit. Add me to the credits

svn path=/trunk/kdegames/kmahjongg/; revision=284531
parent 99aa6b39
......@@ -2,12 +2,19 @@
This is the change log for kmahjongg.
Personel
Michael Haertjens: Solvable game generation
Albert Astals Cid: Some bug fixes and wishlists
Michael Haertjens: Solvable game generation
David Black: Fold, spindle and mutilate 0.4.1 to 0.5.0
Osvaldo Stark: Tileset creator, doc guinepig and tester 0.5.0
Robert Williams: Bug fixes 0.4.0 to 0.4.1
Mathias Muller: Implementor of the original kmahjongg.
0.7.4 to 0.7.6
+ Fix bug #73944
+ Implement wishlist #63171
+ Implement wishlist #56607
+ Fix bug #26595
0.7.3 to 0.7.4
+ Fixed bug #31639 Kmahjongg flashes wrong tiles.
+ Fixed bug #26872 Kmahjongg timer not reset.
......
......@@ -266,13 +266,13 @@ void BoardWidget::paintEvent( QPaintEvent* pa )
int xheight = pa->rect().height();
int xwidth = pa->rect().width();
back = theBackground.getBackground();
if (gamePaused) {
// If the game is paused, then blank out the board.
// We tolerate no cheats around here folks..
bitBlt( this, xx, pa->rect().top(),
theBackground.getBackground(), xx,
pa->rect().top(), xwidth, xheight, CopyROP );
back, xx, pa->rect().top(), xwidth, xheight, CopyROP );
return;
}
......@@ -286,13 +286,11 @@ void BoardWidget::paintEvent( QPaintEvent* pa )
// update the complete drawArea
back = theBackground.getBackground();
backBuffer.resize(back->width(), back->height());
// erase out with the background
bitBlt( &backBuffer, xx, pa->rect().top(),
theBackground.getBackground(), xx,pa->rect().top(), xwidth, xheight, CopyROP );
back, xx,pa->rect().top(), back->width(), back->height(), CopyROP );
// initial offset on the screen of tile 0,0
int xOffset = theTiles.width()/2;
......@@ -485,6 +483,21 @@ void BoardWidget::pause() {
gamePaused = !gamePaused;
drawBoard(true);
}
void BoardWidget::gameLoaded()
{
int i;
initialiseRemovedTiles();
i = Game.TileNum;
// use the history of moves to put in the removed tiles area the correct tiles
while (i < Game.MaxTileNum )
{
setRemovedTilePair(Game.MoveList[i], Game.MoveList[i+1]);
i +=2;
}
drawBoard();
}
// ---------------------------------------------------------
int BoardWidget::undoMove()
{
......@@ -1888,13 +1901,6 @@ void BoardWidget::initialiseRemovedTiles(void) {
}
// ---------------------------------------------------------
void BoardWidget::showMessage( const QString& pszText )
{
emit message( pszText );
}
// ---------------------------------------------------------
bool BoardWidget::loadTileset(const QString &path) {
......
......@@ -108,6 +108,7 @@ class BoardWidget : public QWidget
void stopDemoMode();
void pause();
void gameLoaded();
void animateMoveList();
void setShowMatch( bool );
......@@ -136,7 +137,6 @@ class BoardWidget : public QWidget
bool loadBackground ( const QString&, bool bShowError = true );
signals:
void statusTextChanged ( const QString&, long );
void message ( const QString& );
void tileNumberChanged ( int iMaximum, int iCurrent, int iLeft );
void demoModeChanged ( bool bActive );
......@@ -152,7 +152,6 @@ class BoardWidget : public QWidget
void mousePressEvent ( QMouseEvent* );
void setStatusText ( const QString& );
void showMessage ( const QString& );
void cancelUserSelectedTiles();
void drawTileNumber();
......
......@@ -87,9 +87,6 @@ KMahjongg::KMahjongg( QWidget* parent, const char *name)
connect( bw, SIGNAL( statusTextChanged(const QString&, long) ),
SLOT( showStatusText(const QString&, long) ) );
connect( bw, SIGNAL( message(const QString&) ),
SLOT( showMessage(const QString&) ) );
connect( bw, SIGNAL( tileNumberChanged(int,int,int) ),
SLOT( showTileNumber(int,int,int) ) );
......@@ -413,12 +410,6 @@ void KMahjongg::showStatusText( const QString &msg, long board )
}
// ---------------------------------------------------------
void KMahjongg::showMessage( const QString &msg )
{
KMessageBox::information( this, msg );
}
// ---------------------------------------------------------
void KMahjongg::showTileNumber( int iMaximum, int iCurrent, int iLeft )
{
......@@ -516,7 +507,7 @@ void KMahjongg::loadGame(void) {
KIO::NetAccess::removeTempFile( fname );
// refresh the board
bw->drawBoard();
bw->gameLoaded();
}
void KMahjongg::restartGame() {
......
......@@ -59,7 +59,6 @@ class KMahjongg : public KMainWindow
public slots:
void startNewGame( int num = -1 );
void showStatusText ( const QString& , long);
void showMessage ( const QString& );
void showTileNumber( int iMaximum, int iCurrent, int iLeft );
void demoModeChanged( bool bActive );
void gameOver( unsigned short removed, unsigned short cheats);
......
......@@ -17,6 +17,7 @@ int main( int argc, char** argv )
aboutData.addAuthor("Michael Haertjens", I18N_NOOP("Solvable game generation\nbased on algorithm by Michael Meeks in GNOME mahjongg"), "mhaertjens@modusoperandi.com");
aboutData.addAuthor("Osvaldo Stark", I18N_NOOP("Tile set contributor and web page maintainer"), "starko@dnet.it");
aboutData.addCredit("Benjamin Meyer", I18N_NOOP("Code cleanup"), "ben+kmahjongg@meyerhome.net");
aboutData.addCredit("Albert Astals Cid", I18N_NOOP("Implemented some bugfixes and wishes"), "astals11@terra.es");
KCmdLineArgs::init( argc, argv, &aboutData );
......
#define KMAHJONGG_VERSION "0.7.5"
#define KMAHJONGG_VERSION "0.7.6"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment