summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/bounce/bounce.pro26
-rw-r--r--noncore/games/bounce/game.cpp (renamed from noncore/games/zbounce/game.cpp)2
-rw-r--r--noncore/games/bounce/game.h (renamed from noncore/games/zbounce/game.h)0
-rw-r--r--noncore/games/bounce/kbounce.cpp4
-rw-r--r--noncore/games/bounce/kbounce.h (renamed from noncore/games/zbounce/kbounce.h)0
-rw-r--r--noncore/games/bounce/main.cpp (renamed from noncore/games/zbounce/main.cpp)0
-rw-r--r--noncore/games/bounce/opie-bounce.control20
-rw-r--r--noncore/games/zbounce/kbounce.cpp302
-rw-r--r--noncore/games/zbounce/opie-zbounce.control20
-rw-r--r--noncore/games/zbounce/zbounce.pro26
10 files changed, 49 insertions, 351 deletions
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro
new file mode 100644
index 0000000..7be1fb5
--- a/dev/null
+++ b/noncore/games/bounce/bounce.pro
@@ -0,0 +1,26 @@
1 TEMPLATE= app
2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release
4 HEADERS = game.h kbounce.h
5 SOURCES = game.cpp kbounce.cpp main.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe
9DESTDIR = $(OPIEDIR)/bin
10 TARGET = bounce
11
12TRANSLATIONS = ../../../i18n/de/bounce.ts \
13 ../../../i18n/en/bounce.ts \
14 ../../../i18n/es/bounce.ts \
15 ../../../i18n/fr/bounce.ts \
16 ../../../i18n/hu/bounce.ts \
17 ../../../i18n/ja/bounce.ts \
18 ../../../i18n/ko/bounce.ts \
19 ../../../i18n/no/bounce.ts \
20 ../../../i18n/pl/bounce.ts \
21 ../../../i18n/pt/bounce.ts \
22 ../../../i18n/pt_BR/bounce.ts \
23 ../../../i18n/sl/bounce.ts \
24 ../../../i18n/zh_CN/bounce.ts \
25 ../../../i18n/zh_TW/bounce.ts \
26 ../../../i18n/it/bounce.ts
diff --git a/noncore/games/zbounce/game.cpp b/noncore/games/bounce/game.cpp
index 7a1a3cd..6ded218 100644
--- a/noncore/games/zbounce/game.cpp
+++ b/noncore/games/bounce/game.cpp
@@ -200,193 +200,193 @@ void Wall::advance()
200 200
201 // set tile 201 // set tile
202 m_field->setTile( m_x, m_y, TILE_WALLEND ); 202 m_field->setTile( m_x, m_y, TILE_WALLEND );
203 } else 203 } else
204 { 204 {
205 finish(); 205 finish();
206 emit finished( this, m_field->tile( m_x+m_dx, m_y+m_dy ) ); 206 emit finished( this, m_field->tile( m_x+m_dx, m_y+m_dy ) );
207 } 207 }
208 } 208 }
209 } 209 }
210} 210}
211 211
212void Wall::fill( bool black ) 212void Wall::fill( bool black )
213{ 213{
214 if ( m_dx ) 214 if ( m_dx )
215 { 215 {
216 for ( int x=m_startX ; x!=m_x; x+=m_dx ) 216 for ( int x=m_startX ; x!=m_x; x+=m_dx )
217 if ( m_field->tile(x, m_startY)==m_tile ) 217 if ( m_field->tile(x, m_startY)==m_tile )
218 m_field->setGameTile( x, m_startY, black ); 218 m_field->setGameTile( x, m_startY, black );
219 219
220 m_field->setGameTile( m_x, m_startY, black ); 220 m_field->setGameTile( m_x, m_startY, black );
221 } else 221 } else
222 { 222 {
223 for ( int y=m_startY ; y!=m_y; y+=m_dy ) 223 for ( int y=m_startY ; y!=m_y; y+=m_dy )
224 if ( m_field->tile(m_startX, y)==m_tile ) 224 if ( m_field->tile(m_startX, y)==m_tile )
225 m_field->setGameTile( m_startX, y, black ); 225 m_field->setGameTile( m_startX, y, black );
226 226
227 m_field->setGameTile( m_startX, m_y, black ); 227 m_field->setGameTile( m_startX, m_y, black );
228 } 228 }
229} 229}
230 230
231/*************************************************************************/ 231/*************************************************************************/
232 232
233JezzField::JezzField( QPixmap tiles, QObject* parent, const char* name ) 233JezzField::JezzField( QPixmap tiles, QObject* parent, const char* name )
234 : QCanvas( parent, name ), m_tiles( tiles ) 234 : QCanvas( parent, name ), m_tiles( tiles )
235{ 235{
236 setPixmaps( tiles ); 236 setPixmaps( tiles );
237} 237}
238 238
239void JezzField::setGameTile( int x, int y, bool black ) 239void JezzField::setGameTile( int x, int y, bool black )
240{ 240{
241 setTile( x, y, black ? TILE_BORDER : TILE_FREE ); 241 setTile( x, y, black ? TILE_BORDER : TILE_FREE );
242} 242}
243 243
244void JezzField::setPixmaps( QPixmap tiles ) 244void JezzField::setPixmaps( QPixmap tiles )
245{ 245{
246 // create new tiles 246 // create new tiles
247 QPixmap allTiles( TILE_SIZE*(FIELD_WIDTH-2), TILE_SIZE*(FIELD_HEIGHT-1) ); 247 QPixmap allTiles( TILE_SIZE*(FIELD_WIDTH-2), TILE_SIZE*(FIELD_HEIGHT-1) );
248 248
249 // handle default tiles 249 // handle default tiles
250 bitBlt( &allTiles, 0, TILE_SIZE*(FIELD_HEIGHT-2), 250 bitBlt( &allTiles, 0, TILE_SIZE*(FIELD_HEIGHT-2),
251 &tiles, 0, 0, tiles.width(), tiles.height() ); 251 &tiles, 0, 0, tiles.width(), tiles.height() );
252 252
253 // load tiles into canvas 253 // load tiles into canvas
254 setTiles( allTiles, FIELD_WIDTH, FIELD_HEIGHT, TILE_SIZE, TILE_SIZE ); 254 setTiles( allTiles, FIELD_WIDTH, FIELD_HEIGHT, TILE_SIZE, TILE_SIZE );
255} 255}
256 256
257/*************************************************************************/ 257/*************************************************************************/
258 258
259JezzView::JezzView(QCanvas* viewing, QWidget* parent, const char* name, WFlags f) 259JezzView::JezzView(QCanvas* viewing, QWidget* parent, const char* name, WFlags f)
260 : QCanvasView( viewing, parent, name, f ), m_vertical( false ) 260 : QCanvasView( viewing, parent, name, f ), m_vertical( false )
261{ 261{
262 setResizePolicy( AutoOne ); 262 setResizePolicy( AutoOne );
263 setHScrollBarMode( AlwaysOff ); 263 setHScrollBarMode( AlwaysOff );
264 setVScrollBarMode( AlwaysOff ); 264 setVScrollBarMode( AlwaysOff );
265 265
266 setCursor( sizeHorCursor ); 266 setCursor( sizeHorCursor );
267} 267}
268 268
269void JezzView::viewportMouseReleaseEvent( QMouseEvent *ev ) 269void JezzView::viewportMouseReleaseEvent( QMouseEvent *ev )
270{ 270{
271 if ( ev->button() & LeftButton ) 271 if ( ev->button() & LeftButton )
272 { 272 {
273 emit buildWall( ev->x()/TILE_SIZE, ev->y()/TILE_SIZE, m_vertical ); 273 emit buildWall( ev->x()/TILE_SIZE, ev->y()/TILE_SIZE, m_vertical );
274 } 274 }
275} 275}
276 276
277void JezzView::changeCursor() 277void JezzView::changeCursor()
278{ 278{
279 m_vertical = !m_vertical; 279 m_vertical = !m_vertical;
280 if ( m_vertical ) 280 if ( m_vertical )
281 { 281 {
282 setCursor( sizeVerCursor ); 282 setCursor( sizeVerCursor );
283 } 283 }
284 else 284 else
285 { 285 {
286 setCursor( sizeHorCursor ); 286 setCursor( sizeHorCursor );
287 } 287 }
288} 288}
289 289
290/*************************************************************************/ 290/*************************************************************************/
291 291
292JezzGame::JezzGame( int ballNum, QWidget *parent, const char *name ) 292JezzGame::JezzGame( int ballNum, QWidget *parent, const char *name )
293 : QWidget( parent, name ), m_wall1( 0 ), m_wall2( 0 ), 293 : QWidget( parent, name ), m_wall1( 0 ), m_wall2( 0 ),
294 m_text( 0 ), m_running( false ), m_percent( 0 ), m_pictured( false ) 294 m_text( 0 ), m_running( false ), m_percent( 0 ), m_pictured( false )
295{ 295{
296 QString path = QPEApplication::qpeDir()+"pics/zbounce/"; 296 QString path = QPEApplication::qpeDir()+"pics/bounce/";
297 297
298 // load gfx 298 // load gfx
299 m_ballPixmaps = new QCanvasPixmapArray( path + "ball%1.png", 25 ); 299 m_ballPixmaps = new QCanvasPixmapArray( path + "ball%1.png", 25 );
300 for ( unsigned n=0; n < m_ballPixmaps->count(); n++ ) 300 for ( unsigned n=0; n < m_ballPixmaps->count(); n++ )
301 m_ballPixmaps->image(n)->setOffset( 0, 0 ); 301 m_ballPixmaps->image(n)->setOffset( 0, 0 );
302 302
303 m_arrowPixmaps = new QCanvasPixmapArray( path + "arrow%1.png", 2 ); 303 m_arrowPixmaps = new QCanvasPixmapArray( path + "arrow%1.png", 2 );
304 for ( unsigned n=0; n < m_arrowPixmaps->count(); n++ ) 304 for ( unsigned n=0; n < m_arrowPixmaps->count(); n++ )
305 m_arrowPixmaps->image(n)->setOffset( 0, 0 ); 305 m_arrowPixmaps->image(n)->setOffset( 0, 0 );
306 306
307 QPixmap tiles( path + "tiles.png" ); 307 QPixmap tiles( path + "tiles.png" );
308 308
309 // create field 309 // create field
310 m_field = new JezzField( tiles, this, "m_field" ); 310 m_field = new JezzField( tiles, this, "m_field" );
311 m_field->resize( TILE_SIZE*FIELD_WIDTH, TILE_SIZE*FIELD_HEIGHT ); 311 m_field->resize( TILE_SIZE*FIELD_WIDTH, TILE_SIZE*FIELD_HEIGHT );
312 312
313 for ( int x=0; x<FIELD_WIDTH; x++ ) 313 for ( int x=0; x<FIELD_WIDTH; x++ )
314 m_field->setTile( x, 0, TILE_BORDER ); 314 m_field->setTile( x, 0, TILE_BORDER );
315 for ( int y=1; y<FIELD_HEIGHT-1; y++ ) 315 for ( int y=1; y<FIELD_HEIGHT-1; y++ )
316 { 316 {
317 m_field->setTile( 0, y, TILE_BORDER ); 317 m_field->setTile( 0, y, TILE_BORDER );
318 for ( int x=1; x<FIELD_WIDTH-1; x++ ) 318 for ( int x=1; x<FIELD_WIDTH-1; x++ )
319 m_field->setTile( x, y, TILE_FREE ); 319 m_field->setTile( x, y, TILE_FREE );
320 m_field->setTile( FIELD_WIDTH-1, y, TILE_BORDER ); 320 m_field->setTile( FIELD_WIDTH-1, y, TILE_BORDER );
321 } 321 }
322 for ( int x=0; x<FIELD_WIDTH; x++ ) 322 for ( int x=0; x<FIELD_WIDTH; x++ )
323 m_field->setTile( x, FIELD_HEIGHT-1, TILE_BORDER ); 323 m_field->setTile( x, FIELD_HEIGHT-1, TILE_BORDER );
324 324
325 connect( m_field, SIGNAL(ballCollision(Ball *, int, int, int)), this, SLOT(ballCollision(Ball *, int, int, int)) ); 325 connect( m_field, SIGNAL(ballCollision(Ball *, int, int, int)), this, SLOT(ballCollision(Ball *, int, int, int)) );
326 326
327 // create view 327 // create view
328 m_view = new JezzView( m_field, this, "m_view" ); 328 m_view = new JezzView( m_field, this, "m_view" );
329 m_view->move( 0, 0 ); 329 m_view->move( 0, 0 );
330 m_view->adjustSize(); 330 m_view->adjustSize();
331 connect( m_view, SIGNAL(buildWall(int, int, bool)), this, SLOT(buildWall(int, int, bool)) ); 331 connect( m_view, SIGNAL(buildWall(int, int, bool)), this, SLOT(buildWall(int, int, bool)) );
332 332
333 // create balls 333 // create balls
334 for ( int n=0; n<ballNum; n++ ) 334 for ( int n=0; n<ballNum; n++ )
335 { 335 {
336 Ball *ball = new Ball( m_ballPixmaps, m_field ); 336 Ball *ball = new Ball( m_ballPixmaps, m_field );
337 m_balls.append( ball ); 337 m_balls.append( ball );
338 ball->setVelocity( ((rand() & 1)*2-1)*2, ((rand() & 1)*2-1)*2 ); 338 ball->setVelocity( ((rand() & 1)*2-1)*2, ((rand() & 1)*2-1)*2 );
339 ball->setFrame( rand() % 25 ); 339 ball->setFrame( rand() % 25 );
340 ball->move( 4*TILE_SIZE + ( rand() - 50 ) % ( (FIELD_WIDTH-8)*TILE_SIZE ), 340 ball->move( 4*TILE_SIZE + ( rand() - 50 ) % ( (FIELD_WIDTH-8)*TILE_SIZE ),
341 4*TILE_SIZE + rand() % ( (FIELD_HEIGHT-8)*TILE_SIZE ) ); 341 4*TILE_SIZE + rand() % ( (FIELD_HEIGHT-8)*TILE_SIZE ) );
342 ball->show(); 342 ball->show();
343 } 343 }
344 344
345 // create arrow 345 // create arrow
346 arrow = new Arrow( m_arrowPixmaps, m_field ); 346 arrow = new Arrow( m_arrowPixmaps, m_field );
347 arrow->show(); 347 arrow->show();
348 348
349 // create text label 349 // create text label
350 m_text = new QCanvasText( m_field ); 350 m_text = new QCanvasText( m_field );
351 351
352 // create game clock 352 // create game clock
353 m_clock = new QTimer( this ); 353 m_clock = new QTimer( this );
354 connect( m_clock, SIGNAL(timeout()), this, SLOT(tick()) ); 354 connect( m_clock, SIGNAL(timeout()), this, SLOT(tick()) );
355 m_clock->start( GAME_DELAY ); 355 m_clock->start( GAME_DELAY );
356 356
357 // setup geometry 357 // setup geometry
358 setFixedSize( m_view->size() ); 358 setFixedSize( m_view->size() );
359} 359}
360 360
361JezzGame::~JezzGame() 361JezzGame::~JezzGame()
362{ 362{
363 m_balls.clear(); 363 m_balls.clear();
364 delete m_view; 364 delete m_view;
365 delete m_field; 365 delete m_field;
366 delete m_ballPixmaps; 366 delete m_ballPixmaps;
367} 367}
368 368
369void JezzGame::display( QString text, int size ) 369void JezzGame::display( QString text, int size )
370{ 370{
371 qDebug("This function \"display\" shouldn't be called!!!"); 371 qDebug("This function \"display\" shouldn't be called!!!");
372 if ( !text.isEmpty() ) 372 if ( !text.isEmpty() )
373 { 373 {
374 QFont font( "Helvetica", size, QFont::Bold ); 374 QFont font( "Helvetica", size, QFont::Bold );
375 font.setStyleHint( QFont::Helvetica ); 375 font.setStyleHint( QFont::Helvetica );
376 m_text->setFont( font ); 376 m_text->setFont( font );
377 m_text->setText( text ); 377 m_text->setText( text );
378 378
379 QRect size = m_text->boundingRect(); 379 QRect size = m_text->boundingRect();
380 m_text->move( ( FIELD_WIDTH*TILE_SIZE - size.width() ) / 2, 380 m_text->move( ( FIELD_WIDTH*TILE_SIZE - size.width() ) / 2,
381 ( FIELD_HEIGHT*TILE_SIZE - size.height() ) / 2 ); 381 ( FIELD_HEIGHT*TILE_SIZE - size.height() ) / 2 );
382 382
383 m_text->show(); 383 m_text->show();
384 } else 384 } else
385 { 385 {
386 m_text->hide(); 386 m_text->hide();
387 } 387 }
388} 388}
389 389
390void JezzGame::start() 390void JezzGame::start()
391{ 391{
392 m_running = true; 392 m_running = true;
diff --git a/noncore/games/zbounce/game.h b/noncore/games/bounce/game.h
index 656fba3..656fba3 100644
--- a/noncore/games/zbounce/game.h
+++ b/noncore/games/bounce/game.h
diff --git a/noncore/games/bounce/kbounce.cpp b/noncore/games/bounce/kbounce.cpp
index c1c0f70..f703f74 100644
--- a/noncore/games/bounce/kbounce.cpp
+++ b/noncore/games/bounce/kbounce.cpp
@@ -1,199 +1,199 @@
1/* 1/*
2 * Copyright (C) 2000 Stefan Schimanski <1Stein@gmx.de> 2 * Copyright (C) 2000 Stefan Schimanski <1Stein@gmx.de>
3 * 3 *
4 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License,Life or (at your option) any later version. 7 * version 2 of the License,Life or (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public 14 * You should have received a copy of the GNU Library General Public
15 * License along with this program; if not, write to the Free 15 * License along with this program; if not, write to the Free
16 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 16 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 */ 17 */
18 18
19#include <qlayout.h> 19#include <qlayout.h>
20#include <qtimer.h> 20#include <qtimer.h>
21#include <qlcdnumber.h> 21#include <qlcdnumber.h>
22#include <qmessagebox.h> 22#include <qmessagebox.h>
23#include <qmainwindow.h> 23#include <qmainwindow.h>
24#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
25 25
26#include "kbounce.h" 26#include "kbounce.h"
27#include "game.h" 27#include "game.h"
28#include <qlabel.h> 28#include <qlabel.h>
29 29
30KJezzball::KJezzball() : QMainWindow(0), m_gameWidget( 0 ) 30KJezzball::KJezzball() : QMainWindow(0), m_gameWidget( 0 )
31{ 31{
32 setCaption(tr("ZBounce")); 32 setCaption(tr("Bounce"));
33 // setup variables 33 // setup variables
34 m_game.level = 1; 34 m_game.level = 1;
35 m_game.score = 0; 35 m_game.score = 0;
36 m_state = Idle; 36 m_state = Idle;
37 37
38 38
39 menu = menuBar(); 39 menu = menuBar();
40 game = new QPopupMenu; 40 game = new QPopupMenu;
41 game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N ); 41 game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N );
42 game->insertItem(tr("&Pause game"), this, SLOT(pauseGame()), Key_P ); 42 game->insertItem(tr("&Pause game"), this, SLOT(pauseGame()), Key_P );
43 game->insertSeparator(); 43 game->insertSeparator();
44 game->insertItem(tr("&About"), this, SLOT(about())); 44 game->insertItem(tr("&About"), this, SLOT(about()));
45 menu->insertItem( tr("&Game"), game ); 45 menu->insertItem( tr("&Game"), game );
46 46
47 // create widgets 47 // create widgets
48 m_view = new QWidget( this, "m_view" ); 48 m_view = new QWidget( this, "m_view" );
49 setCentralWidget( m_view ); 49 setCentralWidget( m_view );
50 50
51 m_layout = new QGridLayout( m_view ); 51 m_layout = new QGridLayout( m_view );
52 m_layout->setSpacing( 0 ); 52 m_layout->setSpacing( 0 );
53 m_layout->setMargin( 0 ); 53 m_layout->setMargin( 0 );
54 54
55 ScoreLabel = new QLabel( m_view, "ScoreLabel" ); 55 ScoreLabel = new QLabel( m_view, "ScoreLabel" );
56 ScoreLabel->setText( tr( "Score: 00" ) ); 56 ScoreLabel->setText( tr( "Score: 00" ) );
57 ScoreLabel->setAlignment( int( QLabel::AlignCenter ) ); 57 ScoreLabel->setAlignment( int( QLabel::AlignCenter ) );
58 58
59 m_layout->addWidget( ScoreLabel, 1, 0 ); 59 m_layout->addWidget( ScoreLabel, 1, 0 );
60 60
61 LivesLabel = new QLabel( m_view, "LivesLabel" ); 61 LivesLabel = new QLabel( m_view, "LivesLabel" );
62 LivesLabel->setText( tr( "Lives: 0%" ) ); 62 LivesLabel->setText( tr( "Lives: 0%" ) );
63 LivesLabel->setAlignment( int( QLabel::AlignCenter ) ); 63 LivesLabel->setAlignment( int( QLabel::AlignCenter ) );
64 64
65 m_layout->addWidget( LivesLabel, 1, 2 ); 65 m_layout->addWidget( LivesLabel, 1, 2 );
66 66
67 FilledLabel = new QLabel( m_view, "FilledLabel" ); 67 FilledLabel = new QLabel( m_view, "FilledLabel" );
68 FilledLabel->setText( tr( "Filled: 00%" ) ); 68 FilledLabel->setText( tr( "Filled: 00%" ) );
69 FilledLabel->setAlignment( int( QLabel::AlignCenter ) ); 69 FilledLabel->setAlignment( int( QLabel::AlignCenter ) );
70 70
71 m_layout->addWidget( FilledLabel, 1, 1 ); 71 m_layout->addWidget( FilledLabel, 1, 1 );
72 72
73 TimeLabel = new QLabel( m_view, "TimeLabel" ); 73 TimeLabel = new QLabel( m_view, "TimeLabel" );
74 TimeLabel->setText( tr( "Time: 00" ) ); 74 TimeLabel->setText( tr( "Time: 00" ) );
75 TimeLabel->setAlignment( int( QLabel::AlignCenter ) ); 75 TimeLabel->setAlignment( int( QLabel::AlignCenter ) );
76 76
77 m_layout->addWidget( TimeLabel, 1, 3 ); 77 m_layout->addWidget( TimeLabel, 1, 3 );
78 78
79 // create timers 79 // create timers
80 m_nextLevelTimer = new QTimer( this, "m_nextLevelTimer" ); 80 m_nextLevelTimer = new QTimer( this, "m_nextLevelTimer" );
81 connect( m_nextLevelTimer, SIGNAL(timeout()), this, SLOT(switchLevel()) ); 81 connect( m_nextLevelTimer, SIGNAL(timeout()), this, SLOT(switchLevel()) );
82 82
83 m_gameOverTimer = new QTimer( this, "m_gameOverTimer" ); 83 m_gameOverTimer = new QTimer( this, "m_gameOverTimer" );
84 connect( m_gameOverTimer, SIGNAL(timeout()), this, SLOT(gameOverNow()) ); 84 connect( m_gameOverTimer, SIGNAL(timeout()), this, SLOT(gameOverNow()) );
85 85
86 m_timer = new QTimer( this, "m_timer" ); 86 m_timer = new QTimer( this, "m_timer" );
87 connect( m_timer, SIGNAL(timeout()), this, SLOT(second()) ); 87 connect( m_timer, SIGNAL(timeout()), this, SLOT(second()) );
88 88
89 // create demo game 89 // create demo game
90 createLevel( 1 ); 90 createLevel( 1 );
91} 91}
92 92
93void KJezzball::newGame() 93void KJezzball::newGame()
94{ 94{
95 // Check for running game 95 // Check for running game
96 closeGame(); 96 closeGame();
97 if ( m_state==Idle ) 97 if ( m_state==Idle )
98 { 98 {
99 // update displays 99 // update displays
100 m_game.level = 1; 100 m_game.level = 1;
101 m_game.score = 0; 101 m_game.score = 0;
102 102
103 setCaption(tr("ZBounce Level %1").arg(m_game.level)); 103 setCaption(tr("Bounce Level %1").arg(m_game.level));
104 ScoreLabel->setText( tr( "Score: %1" ).arg(m_game.score) ); 104 ScoreLabel->setText( tr( "Score: %1" ).arg(m_game.score) );
105 105
106 // start new game 106 // start new game
107 m_state = Running; 107 m_state = Running;
108 108
109 createLevel( m_game.level ); 109 createLevel( m_game.level );
110 startLevel(); 110 startLevel();
111 } 111 }
112} 112}
113 113
114void KJezzball::about() 114void KJezzball::about()
115{ 115{
116 QMessageBox::information( this, "About", "Written by: Stefan Schimanski\nPorted by: Martin Imobersteg\n\nThis program is distributed under\nthe terms of the GPL v2." ); 116 QMessageBox::information( this, "About", "Written by: Stefan Schimanski\nPorted by: Martin Imobersteg\n\nThis program is distributed under\nthe terms of the GPL v2." );
117} 117}
118 118
119void KJezzball::closeGame() 119void KJezzball::closeGame()
120{ 120{
121 if ( m_state!=Idle ) 121 if ( m_state!=Idle )
122 { 122 {
123 stopLevel(); 123 stopLevel();
124 m_state = Idle; 124 m_state = Idle;
125 } 125 }
126} 126}
127 127
128void KJezzball::pauseGame() 128void KJezzball::pauseGame()
129{ 129{
130 switch ( m_state ) 130 switch ( m_state )
131 { 131 {
132 case Running: 132 case Running:
133 m_state = Paused; 133 m_state = Paused;
134 m_gameWidget->display( tr("Game paused.\nPress P to continue!") ); 134 m_gameWidget->display( tr("Game paused.\nPress P to continue!") );
135 stopLevel(); 135 stopLevel();
136 break; 136 break;
137 137
138 case Paused: 138 case Paused:
139 case Suspend: 139 case Suspend:
140 m_state = Running; 140 m_state = Running;
141 m_gameWidget->display( QString::null ); 141 m_gameWidget->display( QString::null );
142 startLevel(); 142 startLevel();
143 break; 143 break;
144 144
145 case Idle: 145 case Idle:
146 break; 146 break;
147 } 147 }
148} 148}
149 149
150void KJezzball::gameOver() 150void KJezzball::gameOver()
151{ 151{
152 stopLevel(); 152 stopLevel();
153 m_gameOverTimer->start( 100, TRUE ); 153 m_gameOverTimer->start( 100, TRUE );
154} 154}
155 155
156 156
157void KJezzball::gameOverNow() 157void KJezzball::gameOverNow()
158{ 158{
159 m_state = Idle; 159 m_state = Idle;
160 160
161 QString score; 161 QString score;
162 score.setNum( m_game.score ); 162 score.setNum( m_game.score );
163 QMessageBox::information( this, "Game Over", tr("Game Over!\nScore: %1").arg(score) ); 163 QMessageBox::information( this, "Game Over", tr("Game Over!\nScore: %1").arg(score) );
164} 164}
165 165
166void KJezzball::focusOutEvent( QFocusEvent *ev ) 166void KJezzball::focusOutEvent( QFocusEvent *ev )
167{ 167{
168 if ( m_state==Running ) 168 if ( m_state==Running )
169 { 169 {
170 stopLevel(); 170 stopLevel();
171 m_state = Suspend; 171 m_state = Suspend;
172 } 172 }
173 173
174 QMainWindow::focusOutEvent( ev ); 174 QMainWindow::focusOutEvent( ev );
175} 175}
176 176
177void KJezzball::focusInEvent ( QFocusEvent *ev ) 177void KJezzball::focusInEvent ( QFocusEvent *ev )
178{ 178{
179 if ( m_state==Suspend ) 179 if ( m_state==Suspend )
180 { 180 {
181 startLevel(); 181 startLevel();
182 m_state = Running; 182 m_state = Running;
183 } 183 }
184 184
185 QMainWindow::focusInEvent( ev ); 185 QMainWindow::focusInEvent( ev );
186} 186}
187 187
188void KJezzball::second() 188void KJezzball::second()
189{ 189{
190 m_level.time--; 190 m_level.time--;
191 TimeLabel->setText( tr( "Time: %1" ).arg(m_level.time) ); 191 TimeLabel->setText( tr( "Time: %1" ).arg(m_level.time) );
192 if ( m_level.time<=0 ) 192 if ( m_level.time<=0 )
193 { 193 {
194 gameOver(); 194 gameOver();
195 } 195 }
196} 196}
197 197
198void KJezzball::died() 198void KJezzball::died()
199{ 199{
diff --git a/noncore/games/zbounce/kbounce.h b/noncore/games/bounce/kbounce.h
index de41710..de41710 100644
--- a/noncore/games/zbounce/kbounce.h
+++ b/noncore/games/bounce/kbounce.h
diff --git a/noncore/games/zbounce/main.cpp b/noncore/games/bounce/main.cpp
index a6b7c1a..a6b7c1a 100644
--- a/noncore/games/zbounce/main.cpp
+++ b/noncore/games/bounce/main.cpp
diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control
new file mode 100644
index 0000000..b3d3cf9
--- a/dev/null
+++ b/noncore/games/bounce/opie-bounce.control
@@ -0,0 +1,20 @@
1Files: bin/bounce apps/Games/bounce.desktop pics/bounce/bounce.png \
2pics/bounce/arrow0000.png pics/bounce/ball0008.png pics/bounce/ball0018.png \
3pics/bounce/arrow0001.png pics/bounce/ball0009.png pics/bounce/ball0019.png \
4pics/bounce/ball0000.png pics/bounce/ball0010.png pics/bounce/ball0020.png \
5pics/bounce/ball0001.png pics/bounce/ball0011.png pics/bounce/ball0021.png \
6pics/bounce/ball0002.png pics/bounce/ball0012.png pics/bounce/ball0022.png \
7pics/bounce/ball0003.png pics/bounce/ball0013.png pics/bounce/ball0023.png \
8pics/bounce/ball0004.png pics/bounce/ball0014.png pics/bounce/ball0024.png \
9pics/bounce/ball0005.png pics/bounce/ball0015.png pics/bounce/tiles.png \
10pics/bounce/ball0006.png pics/bounce/ball0016.png \
11pics/bounce/ball0007.png pics/bounce/ball0017.png \
12Version: 0.6
13Depends: opie-base ($QPE_VERSION)
14Priority: optional
15Section: opie/games
16Maintainer: Martin Imobersteg <imm@gmx.ch>
17Architecture: arm
18License: GPL
19Description: bounce
20 A JezzGame like game for Qtopia.
diff --git a/noncore/games/zbounce/kbounce.cpp b/noncore/games/zbounce/kbounce.cpp
deleted file mode 100644
index c1c0f70..0000000
--- a/noncore/games/zbounce/kbounce.cpp
+++ b/dev/null
@@ -1,302 +0,0 @@
1/*
2 * Copyright (C) 2000 Stefan Schimanski <1Stein@gmx.de>
3 *
4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either
7 * version 2 of the License,Life or (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details.
13 *
14 * You should have received a copy of the GNU Library General Public
15 * License along with this program; if not, write to the Free
16 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 */
18
19#include <qlayout.h>
20#include <qtimer.h>
21#include <qlcdnumber.h>
22#include <qmessagebox.h>
23#include <qmainwindow.h>
24#include <qpe/qpeapplication.h>
25
26#include "kbounce.h"
27#include "game.h"
28#include <qlabel.h>
29
30KJezzball::KJezzball() : QMainWindow(0), m_gameWidget( 0 )
31{
32 setCaption(tr("ZBounce"));
33 // setup variables
34 m_game.level = 1;
35 m_game.score = 0;
36 m_state = Idle;
37
38
39 menu = menuBar();
40 game = new QPopupMenu;
41 game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N );
42 game->insertItem(tr("&Pause game"), this, SLOT(pauseGame()), Key_P );
43 game->insertSeparator();
44 game->insertItem(tr("&About"), this, SLOT(about()));
45 menu->insertItem( tr("&Game"), game );
46
47 // create widgets
48 m_view = new QWidget( this, "m_view" );
49 setCentralWidget( m_view );
50
51 m_layout = new QGridLayout( m_view );
52 m_layout->setSpacing( 0 );
53 m_layout->setMargin( 0 );
54
55 ScoreLabel = new QLabel( m_view, "ScoreLabel" );
56 ScoreLabel->setText( tr( "Score: 00" ) );
57 ScoreLabel->setAlignment( int( QLabel::AlignCenter ) );
58
59 m_layout->addWidget( ScoreLabel, 1, 0 );
60
61 LivesLabel = new QLabel( m_view, "LivesLabel" );
62 LivesLabel->setText( tr( "Lives: 0%" ) );
63 LivesLabel->setAlignment( int( QLabel::AlignCenter ) );
64
65 m_layout->addWidget( LivesLabel, 1, 2 );
66
67 FilledLabel = new QLabel( m_view, "FilledLabel" );
68 FilledLabel->setText( tr( "Filled: 00%" ) );
69 FilledLabel->setAlignment( int( QLabel::AlignCenter ) );
70
71 m_layout->addWidget( FilledLabel, 1, 1 );
72
73 TimeLabel = new QLabel( m_view, "TimeLabel" );
74 TimeLabel->setText( tr( "Time: 00" ) );
75 TimeLabel->setAlignment( int( QLabel::AlignCenter ) );
76
77 m_layout->addWidget( TimeLabel, 1, 3 );
78
79 // create timers
80 m_nextLevelTimer = new QTimer( this, "m_nextLevelTimer" );
81 connect( m_nextLevelTimer, SIGNAL(timeout()), this, SLOT(switchLevel()) );
82
83 m_gameOverTimer = new QTimer( this, "m_gameOverTimer" );
84 connect( m_gameOverTimer, SIGNAL(timeout()), this, SLOT(gameOverNow()) );
85
86 m_timer = new QTimer( this, "m_timer" );
87 connect( m_timer, SIGNAL(timeout()), this, SLOT(second()) );
88
89 // create demo game
90 createLevel( 1 );
91}
92
93void KJezzball::newGame()
94{
95 // Check for running game
96 closeGame();
97 if ( m_state==Idle )
98 {
99 // update displays
100 m_game.level = 1;
101 m_game.score = 0;
102
103 setCaption(tr("ZBounce Level %1").arg(m_game.level));
104 ScoreLabel->setText( tr( "Score: %1" ).arg(m_game.score) );
105
106 // start new game
107 m_state = Running;
108
109 createLevel( m_game.level );
110 startLevel();
111 }
112}
113
114void KJezzball::about()
115{
116 QMessageBox::information( this, "About", "Written by: Stefan Schimanski\nPorted by: Martin Imobersteg\n\nThis program is distributed under\nthe terms of the GPL v2." );
117}
118
119void KJezzball::closeGame()
120{
121 if ( m_state!=Idle )
122 {
123 stopLevel();
124 m_state = Idle;
125 }
126}
127
128void KJezzball::pauseGame()
129{
130 switch ( m_state )
131 {
132 case Running:
133 m_state = Paused;
134 m_gameWidget->display( tr("Game paused.\nPress P to continue!") );
135 stopLevel();
136 break;
137
138 case Paused:
139 case Suspend:
140 m_state = Running;
141 m_gameWidget->display( QString::null );
142 startLevel();
143 break;
144
145 case Idle:
146 break;
147 }
148}
149
150void KJezzball::gameOver()
151{
152 stopLevel();
153 m_gameOverTimer->start( 100, TRUE );
154}
155
156
157void KJezzball::gameOverNow()
158{
159 m_state = Idle;
160
161 QString score;
162 score.setNum( m_game.score );
163 QMessageBox::information( this, "Game Over", tr("Game Over!\nScore: %1").arg(score) );
164}
165
166void KJezzball::focusOutEvent( QFocusEvent *ev )
167{
168 if ( m_state==Running )
169 {
170 stopLevel();
171 m_state = Suspend;
172 }
173
174 QMainWindow::focusOutEvent( ev );
175}
176
177void KJezzball::focusInEvent ( QFocusEvent *ev )
178{
179 if ( m_state==Suspend )
180 {
181 startLevel();
182 m_state = Running;
183 }
184
185 QMainWindow::focusInEvent( ev );
186}
187
188void KJezzball::second()
189{
190 m_level.time--;
191 TimeLabel->setText( tr( "Time: %1" ).arg(m_level.time) );
192 if ( m_level.time<=0 )
193 {
194 gameOver();
195 }
196}
197
198void KJezzball::died()
199{
200 m_level.lifes--;
201 LivesLabel->setText( tr( "Lives: %1" ).arg(m_level.lifes) );
202 if ( m_level.lifes==0 ) gameOver();
203}
204
205void KJezzball::newPercent( int percent )
206{
207 FilledLabel->setText( tr( "Filled: %1%" ).arg(percent) );
208 if ( percent>=75 )
209 {
210 m_level.score = m_level.lifes*15 + (percent-75)*2*(m_game.level+5);
211 nextLevel();
212 }
213}
214
215void KJezzball::createLevel( int level )
216{
217 // destroy old game
218 if ( m_gameWidget ) delete m_gameWidget;
219
220 m_gameWidget = new JezzGame( level+1, m_view, "m_gameWidget" );
221
222 m_gameWidget->show();
223 m_layout->addMultiCellWidget( m_gameWidget, 0, 0, 0, 3 );
224 connect( m_gameWidget, SIGNAL(died()), this, SLOT(died()) );
225 connect( m_gameWidget, SIGNAL(newPercent(int)), this, SLOT(newPercent(int)) );
226
227 // update displays
228 m_level.lifes = level+1;
229 LivesLabel->setText( tr( "Lives: %1" ).arg(m_level.lifes) );
230 FilledLabel->setText( tr( "Filled: 0%" ) );
231
232 m_level.time = (level+2)*30;
233 TimeLabel->setText( tr( "Time: %1" ).arg(m_level.time) );
234
235 m_level.score = 0;
236}
237
238void KJezzball::startLevel()
239{
240 if ( m_gameWidget )
241 {
242 m_timer->start( 1000 );
243 m_gameWidget->start();
244 }
245}
246
247void KJezzball::stopLevel()
248{
249 if ( m_gameWidget )
250 {
251 m_gameWidget->stop();
252 m_timer->stop();
253 }
254}
255
256void KJezzball::nextLevel()
257{
258 stopLevel();
259 m_nextLevelTimer->start( 100, TRUE );
260}
261
262void KJezzball::switchLevel()
263{
264 m_game.score += m_level.score;
265 ScoreLabel->setText( tr( "Score: %1" ).arg(m_game.score) );
266
267 QString score;
268 score.setNum( m_level.score );
269
270 QString level;
271 level.setNum( m_game.level );
272
273 QString foo = QString(
274 tr("Successfully cleared more than 75%.\n") +
275 tr("%1 points: 15 points per life\n").arg(m_level.lifes*15) +
276 tr("%1 points: Bonus\n").arg((m_gameWidget->percent()-75)*2*(m_game.level+5)) +
277 tr("%1 points: Total score\n").arg(score) +
278 tr("On to level %1.\nYou get %2 lives this time!")).arg(m_game.level+1).arg(m_game.level+2);
279
280 QMessageBox::information( this, "Success", foo );
281
282 m_game.level++;
283
284 createLevel( m_game.level );
285 startLevel();
286}
287
288void KJezzball::keyPressEvent( QKeyEvent *ev )
289{
290 if ( ev->key() == Key_Space ||
291 ev->key() == Key_Up ||
292 ev->key() == Key_Down ||
293 ev->key() == Key_Right ||
294 ev->key() == Key_Left )
295 {
296 m_gameWidget->changeCursor();
297 }
298 else
299 {
300 ev->ignore();
301 }
302}
diff --git a/noncore/games/zbounce/opie-zbounce.control b/noncore/games/zbounce/opie-zbounce.control
deleted file mode 100644
index d419eaf..0000000
--- a/noncore/games/zbounce/opie-zbounce.control
+++ b/dev/null
@@ -1,20 +0,0 @@
1Files: bin/zbounce apps/Games/zbounce.desktop pics/zbounce/zbounce.png \
2pics/zbounce/arrow0000.png pics/zbounce/ball0008.png pics/zbounce/ball0018.png \
3pics/zbounce/arrow0001.png pics/zbounce/ball0009.png pics/zbounce/ball0019.png \
4pics/zbounce/ball0000.png pics/zbounce/ball0010.png pics/zbounce/ball0020.png \
5pics/zbounce/ball0001.png pics/zbounce/ball0011.png pics/zbounce/ball0021.png \
6pics/zbounce/ball0002.png pics/zbounce/ball0012.png pics/zbounce/ball0022.png \
7pics/zbounce/ball0003.png pics/zbounce/ball0013.png pics/zbounce/ball0023.png \
8pics/zbounce/ball0004.png pics/zbounce/ball0014.png pics/zbounce/ball0024.png \
9pics/zbounce/ball0005.png pics/zbounce/ball0015.png pics/zbounce/tiles.png \
10pics/zbounce/ball0006.png pics/zbounce/ball0016.png \
11pics/zbounce/ball0007.png pics/zbounce/ball0017.png \
12Version: 0.6
13Depends: opie-base ($QPE_VERSION)
14Priority: optional
15Section: opie/games
16Maintainer: Martin Imobersteg <imm@gmx.ch>
17Architecture: arm
18License: GPL
19Description: ZBounce
20 A JezzGame like game for Qtopia.
diff --git a/noncore/games/zbounce/zbounce.pro b/noncore/games/zbounce/zbounce.pro
deleted file mode 100644
index 9852f04..0000000
--- a/noncore/games/zbounce/zbounce.pro
+++ b/dev/null
@@ -1,26 +0,0 @@
1 TEMPLATE= app
2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release
4 HEADERS = game.h kbounce.h
5 SOURCES = game.cpp kbounce.cpp main.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe
9DESTDIR = $(OPIEDIR)/bin
10 TARGET = zbounce
11
12TRANSLATIONS = ../../../i18n/de/zbounce.ts \
13 ../../../i18n/en/zbounce.ts \
14 ../../../i18n/es/zbounce.ts \
15 ../../../i18n/fr/zbounce.ts \
16 ../../../i18n/hu/zbounce.ts \
17 ../../../i18n/ja/zbounce.ts \
18 ../../../i18n/ko/zbounce.ts \
19 ../../../i18n/no/zbounce.ts \
20 ../../../i18n/pl/zbounce.ts \
21 ../../../i18n/pt/zbounce.ts \
22 ../../../i18n/pt_BR/zbounce.ts \
23 ../../../i18n/sl/zbounce.ts \
24 ../../../i18n/zh_CN/zbounce.ts \
25 ../../../i18n/zh_TW/zbounce.ts \
26 ../../../i18n/it/zbounce.ts