summaryrefslogtreecommitdiff
authorzecke <zecke>2004-11-15 14:28:50 (UTC)
committer zecke <zecke>2004-11-15 14:28:50 (UTC)
commitc9543dc4edd3ea586c04e8114e133296ad9529d9 (patch) (unidiff)
treea5031c6fed1808b69c174480430944f8377b88a2
parentf0c8746173f4cea9680b120bf823e77e7c8729b3 (diff)
downloadopie-c9543dc4edd3ea586c04e8114e133296ad9529d9.zip
opie-c9543dc4edd3ea586c04e8114e133296ad9529d9.tar.gz
opie-c9543dc4edd3ea586c04e8114e133296ad9529d9.tar.bz2
Make SFCave quick launchable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/sfcave/opie-sfcave.control2
-rw-r--r--noncore/games/sfcave/sfcave.cpp48
-rw-r--r--noncore/games/sfcave/sfcave.h8
-rw-r--r--noncore/games/sfcave/sfcave.pro5
4 files changed, 21 insertions, 42 deletions
diff --git a/noncore/games/sfcave/opie-sfcave.control b/noncore/games/sfcave/opie-sfcave.control
index 0ff3e2c..1d98a19 100644
--- a/noncore/games/sfcave/opie-sfcave.control
+++ b/noncore/games/sfcave/opie-sfcave.control
@@ -1,9 +1,9 @@
1Package: opie-sfcave 1Package: opie-sfcave
2Files: bin/sfcave apps/Games/sfcave.desktop pics/sfcave 2Files: plugins/applications/libsfcave.so* bin/sfcave apps/Games/sfcave.desktop pics/sfcave
3Priority: optional 3Priority: optional
4Section: opie/games 4Section: opie/games
5Maintainer: Andy Qua <andy.qua@blueyonder.co.uk> 5Maintainer: Andy Qua <andy.qua@blueyonder.co.uk>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal
8Description: SFCave for the Zaurus. Fly the dot though the cave avoiding the walls. 8Description: SFCave for the Zaurus. Fly the dot though the cave avoiding the walls.
9Version: $QPE_VERSION$EXTRAVERSION 9Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/sfcave/sfcave.cpp b/noncore/games/sfcave/sfcave.cpp
index 9b30fe6..5dca427 100644
--- a/noncore/games/sfcave/sfcave.cpp
+++ b/noncore/games/sfcave/sfcave.cpp
@@ -1,23 +1,21 @@
1#include <stdio.h> 1#include <stdio.h>
2#include <stdlib.h> 2#include <stdlib.h>
3#include <math.h> 3#include <math.h>
4#include <time.h> 4#include <time.h>
5 5
6#ifdef QWS 6#include <opie2/oapplicationfactory.h>
7#include <qpe/qpeapplication.h>
8#include <qpe/config.h> 7#include <qpe/config.h>
9#else 8
10#include <qapplication.h> 9#include <qapplication.h>
11#endif
12#include <qdir.h> 10#include <qdir.h>
13 11
14#include "helpwindow.h" 12#include "helpwindow.h"
15#include "sfcave.h" 13#include "sfcave.h"
16 14
17#define CAPTION "SFCave 1.13 by AndyQ" 15#define CAPTION "SFCave 1.13 by AndyQ"
18 16
19#define UP_THRUST 0.6 17#define UP_THRUST 0.6
20#define NO_THRUST 0.8 18#define NO_THRUST 0.8
21#define MAX_DOWN_THRUST 4.0 19#define MAX_DOWN_THRUST 4.0
22#define MAX_UP_THRUST -3.5 20#define MAX_UP_THRUST -3.5
23 21
@@ -123,60 +121,36 @@ int SFCave::flyHardScores[7][3] = { { 0, 20, 5 },
123 { 40, 100, 1 }, 121 { 40, 100, 1 },
124 { 100, 150, -2 }, 122 { 100, 150, -2 },
125 { 150, 300, -5 }, 123 { 150, 300, -5 },
126 { -1, -1, -1 } }; 124 { -1, -1, -1 } };
127 125
128int SFCave::initialGateGaps[] = { 75, 50, 25 }; 126int SFCave::initialGateGaps[] = { 75, 50, 25 };
129 127
130 128
131#define FLYSCORES( x, y ) (*(flyScores + ((x)*3) + y)) 129#define FLYSCORES( x, y ) (*(flyScores + ((x)*3) + y))
132bool movel; 130bool movel;
133 131
134 132
135int main( int argc, char *argv[] ) 133OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<SFCave> )
136{
137 movel = true;
138#ifdef QWS
139 QPEApplication a( argc, argv );
140#else
141 QApplication a( argc, argv );
142#endif
143 134
144 int speed = 3; 135SFCave :: SFCave( QWidget *w, const char *name, WFlags fl )
145 for ( int i = 0 ; i < argc ; ++i ) 136 : QMainWindow( w, name, fl )
146 {
147 if ( strcmp( argv[i], "-s" ) == 0 )
148 {
149 if ( i+1 < argc )
150 speed = atoi( argv[i+1] );
151 }
152 }
153
154 SFCave app( speed );
155 a.setMainWidget( &app );
156 app.show();
157 app.start();
158 a.exec();
159}
160
161SFCave :: SFCave( int spd, QWidget *w, char *name )
162 : QMainWindow( w, name )
163 137
164{ 138{
165 replayIt = 0;
166#ifdef QWS
167 showMaximized(); 139 showMaximized();
168#else 140 movel = true;
169 resize( 240, 284 ); 141 int spd = 3;
170#endif 142
143
144 replayIt = 0;
171 145
172 replayFile = QDir::home().path(); 146 replayFile = QDir::home().path();
173 replayFile += "/sfcave.replay"; 147 replayFile += "/sfcave.replay";
174 printf( "%s\n", (const char *)replayFile ); 148 printf( "%s\n", (const char *)replayFile );
175 149
176 sWidth = width(); 150 sWidth = width();
177 sHeight = height(); 151 sHeight = height();
178 segSize = sWidth/(MAPSIZE-1)+1; 152 segSize = sWidth/(MAPSIZE-1)+1;
179 153
180 currentMenuNr = 0; 154 currentMenuNr = 0;
181 currentGameType = 0; 155 currentGameType = 0;
182 currentGameDifficulty = 0; 156 currentGameDifficulty = 0;
@@ -204,24 +178,26 @@ SFCave :: SFCave( int spd, QWidget *w, char *name )
204 178
205 offscreen = new QPixmap( sWidth, sHeight ); 179 offscreen = new QPixmap( sWidth, sHeight );
206 offscreen->fill( Qt::black ); 180 offscreen->fill( Qt::black );
207 181
208// setUp(); 182// setUp();
209 crashLineLength = -1; 183 crashLineLength = -1;
210 state = STATE_MENU; 184 state = STATE_MENU;
211 prevState = STATE_MENU; 185 prevState = STATE_MENU;
212 186
213 gameTimer = new QTimer( this, "game timer" ); 187 gameTimer = new QTimer( this, "game timer" );
214 connect( gameTimer, SIGNAL( timeout() ), 188 connect( gameTimer, SIGNAL( timeout() ),
215 this, SLOT( run() ) ); 189 this, SLOT( run() ) );
190
191 QTimer::singleShot(0, this, SLOT(start()));
216} 192}
217 193
218SFCave :: ~SFCave() 194SFCave :: ~SFCave()
219{ 195{
220} 196}
221 197
222void SFCave :: start() 198void SFCave :: start()
223{ 199{
224 gameTimer->start( 10 ); 200 gameTimer->start( 10 );
225 201
226} 202}
227 203
diff --git a/noncore/games/sfcave/sfcave.h b/noncore/games/sfcave/sfcave.h
index b1fe819..7bdf881 100644
--- a/noncore/games/sfcave/sfcave.h
+++ b/noncore/games/sfcave/sfcave.h
@@ -86,27 +86,33 @@ public:
86 86
87 int offset; 87 int offset;
88 int maxHeight; 88 int maxHeight;
89 int nrFrames; 89 int nrFrames;
90 int dir; 90 int dir;
91 91
92 bool showScoreZones; 92 bool showScoreZones;
93 93
94 bool press; 94 bool press;
95 double thrust; 95 double thrust;
96 bool running; 96 bool running;
97 97
98 SFCave( int speed = 3, QWidget *p = 0, char *name = 0 ); 98 SFCave( QWidget *p = 0, const char *name = 0, WFlags fl = 0 );
99 ~SFCave(); 99 ~SFCave();
100
101 static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); }
102
103public slots:
100 void start(); 104 void start();
105public:
106
101 void setSeed( int seed ); 107 void setSeed( int seed );
102 int nextInt( int range ); 108 int nextInt( int range );
103 void setUp(); 109 void setUp();
104 void handleGameSFCave(); 110 void handleGameSFCave();
105 void handleGameGates(); 111 void handleGameGates();
106 void handleGameFly(); 112 void handleGameFly();
107 bool checkFlyGameCollision(); 113 bool checkFlyGameCollision();
108 void moveFlyGameLandscape(); 114 void moveFlyGameLandscape();
109 void setFlyPoint( int point ); 115 void setFlyPoint( int point );
110 bool checkCollision(); 116 bool checkCollision();
111 void moveLandscape(); 117 void moveLandscape();
112 void addBlock(); 118 void addBlock();
diff --git a/noncore/games/sfcave/sfcave.pro b/noncore/games/sfcave/sfcave.pro
index a0df828..3a26a79 100644
--- a/noncore/games/sfcave/sfcave.pro
+++ b/noncore/games/sfcave/sfcave.pro
@@ -1,13 +1,10 @@
1 TEMPLATE= app 1 CONFIG += qt quick-app
2 CONFIG += qt warn_on
3 DESTDIR = $(OPIEDIR)/bin
4 SOURCES = sfcave.cpp helpwindow.cpp random.cpp 2 SOURCES = sfcave.cpp helpwindow.cpp random.cpp
5 HEADERS = sfcave.h helpwindow.h random.h 3 HEADERS = sfcave.h helpwindow.h random.h
6 TARGET = sfcave 4 TARGET = sfcave
7 INCLUDEPATH += $(OPIEDIR)/include 5 INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 6 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 7LIBS += -lqpe
10 8
11 9
12
13include ( $(OPIEDIR)/include.pro ) 10include ( $(OPIEDIR)/include.pro )