| -rw-r--r-- | noncore/games/qasteroids/toplevel.cpp | 9 | ||||
| -rw-r--r-- | noncore/games/qasteroids/view.cpp | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp index 9053d3d..d1e1fac 100644 --- a/noncore/games/qasteroids/toplevel.cpp +++ b/noncore/games/qasteroids/toplevel.cpp @@ -17,26 +17,27 @@ ** not clear to you. ** **********************************************************************//* * KAsteroids - Copyright (c) Martin R. Jones 1997 * * Part of the KDE project */ // --- toplevel.cpp --- #include "toplevel.h" #include "ledmeter.h" +#include <opie2/oresource.h> + #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qlabel.h> #include <qlayout.h> #include <qlcdnumber.h> #include <sys/utsname.h> #define SB_SCORE 1 #define SB_LEVEL 2 #define SB_SHIPS 3 @@ -176,55 +177,55 @@ KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name, WFlags fl ) hbd->addWidget( label ); teleportsLCD = new QLCDNumber( 1, mainWin ); teleportsLCD->setFrameStyle( QFrame::NoFrame ); teleportsLCD->setSegmentStyle( QLCDNumber::Flat ); teleportsLCD->setPalette( pal ); teleportsLCD->setFixedHeight( 18 ); hbd->addWidget( teleportsLCD ); hbd->addSpacing( 10 ); */ label = new QLabel( mainWin ); - label->setPixmap( Resource::loadPixmap("qasteroids/powerups/brake.png") ); + label->setPixmap( Opie::Core::OResource::loadPixmap("qasteroids/powerups/brake.png") ); label->setFixedWidth( 16 ); label->setPalette( pal ); hbd->addWidget( label ); brakesLCD = new QLCDNumber( 1, mainWin ); brakesLCD->setFrameStyle( QFrame::NoFrame ); brakesLCD->setSegmentStyle( QLCDNumber::Flat ); brakesLCD->setPalette( pal ); brakesLCD->setFixedHeight( 16 ); hbd->addWidget( brakesLCD ); hbd->addSpacing( 5 ); label = new QLabel( mainWin ); - label->setPixmap( Resource::loadPixmap("qasteroids/powerups/shield.png") ); + label->setPixmap( Opie::Core::OResource::loadPixmap("qasteroids/powerups/shield.png") ); label->setFixedWidth( 16 ); label->setPalette( pal ); hbd->addWidget( label ); shieldLCD = new QLCDNumber( 1, mainWin ); shieldLCD->setFrameStyle( QFrame::NoFrame ); shieldLCD->setSegmentStyle( QLCDNumber::Flat ); shieldLCD->setPalette( pal ); shieldLCD->setFixedHeight( 16 ); hbd->addWidget( shieldLCD ); hbd->addSpacing( 5 ); label = new QLabel( mainWin ); - label->setPixmap( Resource::loadPixmap("qasteroids/powerups/shoot.png") ); + label->setPixmap( Opie::Core::OResource::loadPixmap("qasteroids/powerups/shoot.png") ); label->setFixedWidth( 16 ); label->setPalette( pal ); hbd->addWidget( label ); shootLCD = new QLCDNumber( 1, mainWin ); shootLCD->setFrameStyle( QFrame::NoFrame ); shootLCD->setSegmentStyle( QLCDNumber::Flat ); shootLCD->setPalette( pal ); shootLCD->setFixedHeight( 16 ); hbd->addWidget( shootLCD ); hbd->addStretch( 1 ); diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp index 3a4d410..6cab700 100644 --- a/noncore/games/qasteroids/view.cpp +++ b/noncore/games/qasteroids/view.cpp @@ -15,31 +15,31 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************//* * KAsteroids - Copyright (c) Martin R. Jones 1997 * * Part of the KDE project */ #include "view.h" -#include <qpe/resource.h> - +#include <opie2/oresource.h> +#include <qpe/qpeapplication.h> #include <stdlib.h> #include <math.h> -#define IMG_BACKGROUND "qasteroids/bg.png" +#define IMG_BACKGROUND "qasteroids/bg" #define REFRESH_DELAY 33 #define SHIP_SPEED 0.3 #define MISSILE_SPEED 10.0 #define SHIP_STEPS 64 #define ROTATE_RATE 2 #define SHIELD_ON_COST 1 #define SHIELD_HIT_COST 30 #define BRAKE_ON_COST 4 #define MAX_ROCK_SPEED 2.5 #define MAX_POWERUP_SPEED 1.5 @@ -86,26 +86,25 @@ KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name ) : QWidget( parent, name ), field(200, 200), view(&field,this) { view.setVScrollBarMode( QScrollView::AlwaysOff ); view.setHScrollBarMode( QScrollView::AlwaysOff ); rocks.setAutoDelete( TRUE ); missiles.setAutoDelete( TRUE ); bits.setAutoDelete( TRUE ); powerups.setAutoDelete( TRUE ); exhaust.setAutoDelete( TRUE ); - QPixmap pm( Resource::loadPixmap(IMG_BACKGROUND) ); - field.setBackgroundPixmap( pm ); + field.setBackgroundPixmap( Opie::Core::OResource::loadPixmap(IMG_BACKGROUND) ); textSprite = new QCanvasText( &field ); QFont font( "helvetica", 14 ); textSprite->setFont( font ); shield = 0; shieldOn = FALSE; refreshRate = REFRESH_DELAY; readSprites(); shieldTimer = new QTimer( this ); @@ -239,28 +238,25 @@ void KAsteroidsView::brake( bool b ) thrustShip = FALSE; rotateRate = ROTATE_RATE; } brakeShip = b; } } // - - - void KAsteroidsView::readSprites() { - QString sprites_prefix = Resource::findPixmap( IMG_BACKGROUND ); - int sep = sprites_prefix.findRev( "/" ); - - sprites_prefix.truncate( sep ); + QString sprites_prefix = QPEApplication::qpeDir() + "pics/qasteroids"; int i = 0; while ( kas_animations[i].id ) { animation.insert( kas_animations[i].id, new QCanvasPixmapArray( sprites_prefix + "/" + kas_animations[i].path, kas_animations[i].frames ) ); i++; } ship = new QCanvasSprite( animation[ID_SHIP], &field ); ship->hide(); |