diff options
Diffstat (limited to 'kbounce')
| -rw-r--r-- | kbounce/game.cpp | 14 | ||||
| -rw-r--r-- | kbounce/kbounce.cpp | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 0f1895de..be31fe9e 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -344,7 +344,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c : TQWidget( parent, name ), m_wall1( 0 ), m_wall2( 0 ), m_text( 0 ), m_running( false ), m_percent( 0 ), m_pictured( false ) { - TQString path = kapp->dirs()->findResourceDir( "data", "kbounce/pics/ball0000.png" ) + "kbounce/pics/"; + TQString path = tdeApp->dirs()->findResourceDir( "data", "kbounce/pics/ball0000.png" ) + "kbounce/pics/"; // load gfx m_ballPixmaps = new TQCanvasPixmapArray( path + "ball%1.png", 25 ); @@ -359,7 +359,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c if ( m_artsServer->isNull() ) kdDebug(12008) << "Can't connect to aRts sound server" << endl; #endif - m_soundPath = kapp->dirs()->findResourceDir( "data", "kbounce/sounds/death.au" ) + + m_soundPath = tdeApp->dirs()->findResourceDir( "data", "kbounce/sounds/death.au" ) + "kbounce/sounds/"; // create field @@ -391,10 +391,10 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c { Ball *ball = new Ball( m_ballPixmaps, m_field ); m_balls.append( ball ); - ball->setVelocity( ((kapp->random() & 1)*2-1)*2, ((kapp->random() & 1)*2-1)*2 ); - ball->setFrame( kapp->random() % 25 ); - ball->move( 4*TILE_SIZE + kapp->random() % ( (FIELD_WIDTH-8)*TILE_SIZE ), - 4*TILE_SIZE + kapp->random() % ( (FIELD_HEIGHT-8)*TILE_SIZE ) ); + ball->setVelocity( ((tdeApp->random() & 1)*2-1)*2, ((tdeApp->random() & 1)*2-1)*2 ); + ball->setFrame( tdeApp->random() % 25 ); + ball->move( 4*TILE_SIZE + tdeApp->random() % ( (FIELD_WIDTH-8)*TILE_SIZE ), + 4*TILE_SIZE + tdeApp->random() % ( (FIELD_HEIGHT-8)*TILE_SIZE ) ); ball->show(); } @@ -693,7 +693,7 @@ void JezzGame::tick() if ( m_wall2 ) m_wall2->update(); } - //kapp->syncX(); + //tdeApp->syncX(); } #include "game.moc" diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index 1c9062e9..fa70e917 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -41,7 +41,7 @@ KJezzball::KJezzball() m_game.score = 0; m_state = Idle; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); m_backgroundDir = config->readPathEntry( "BackgroundDir" ); m_showBackground = config->readBoolEntry( "ShowBackground", false ); @@ -110,7 +110,7 @@ KJezzball::KJezzball() KJezzball::~KJezzball() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->writeEntry( "PlaySounds", m_soundAction->isChecked() ); } @@ -264,7 +264,7 @@ void KJezzball::selectBackground() m_backgroundShowAction->setEnabled(true); // save settings - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->writePathEntry( "BackgroundDir", m_backgroundDir ); config->sync(); @@ -289,7 +289,7 @@ void KJezzball::showBackground() m_showBackground = show; // save setting - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->writeEntry( "ShowBackground", m_showBackground ); config->sync(); @@ -315,7 +315,7 @@ TQPixmap KJezzball::getBackgroundPixmap() if (dir.count() > 1) { // return random pixmap - int num = kapp->random() % dir.count(); + int num = tdeApp->random() % dir.count(); return TQPixmap( dir.absFilePath( dir[num] ) ); } else if (dir.count()==1) |