author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (unidiff) | |
tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/games | |
parent | 1c58d1407f9584fedcdae390a04e2b37e5853361 (diff) | |
download | opie-e16d333ec2e8509fc665921ca106c25325bae9e0.zip opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.gz opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.bz2 |
Merge from BRANCH_1_0
23 files changed, 35 insertions, 36 deletions
diff --git a/noncore/games/backgammon/backgammon.control b/noncore/games/backgammon/backgammon.control index b75bc60..6468181 100644 --- a/noncore/games/backgammon/backgammon.control +++ b/noncore/games/backgammon/backgammon.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: backgammon | 1 | Package: backgammon |
2 | Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html | 2 | Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Ralf Waspe <rwaspe@web.de> | 5 | Maintainer: Ralf Waspe <rwaspe@web.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Backgammon Game | 8 | Description: Backgammon Game |
10 | A Backgammon game for the Opie environment. | 9 | A Backgammon game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp index db1a058..06523f1 100644 --- a/noncore/games/backgammon/backgammon.cpp +++ b/noncore/games/backgammon/backgammon.cpp | |||
@@ -126,26 +126,24 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) | |||
126 | QPopupMenu* optionmenu=new QPopupMenu(this); | 126 | QPopupMenu* optionmenu=new QPopupMenu(this); |
127 | optionmenu->insertItem(tr( "Player" ),this,SLOT(playerselect())); | 127 | optionmenu->insertItem(tr( "Player" ),this,SLOT(playerselect())); |
128 | optionmenu->insertSeparator(); | 128 | optionmenu->insertSeparator(); |
129 | optionmenu->insertItem(tr( "AI" ),this,SLOT(modify_AI())); | 129 | optionmenu->insertItem(tr( "AI" ),this,SLOT(modify_AI())); |
130 | optionmenu->insertItem(tr( "Rules" ),this,SLOT(setrules())); | 130 | optionmenu->insertItem(tr( "Rules" ),this,SLOT(setrules())); |
131 | menuBar->insertItem(tr( "Options"),optionmenu); | 131 | menuBar->insertItem(tr( "Options"),optionmenu); |
132 | 132 | ||
133 | QWidget* mainarea=new QWidget(this); | 133 | QWidget* mainarea=new QWidget(this); |
134 | setCentralWidget(mainarea); | 134 | setCentralWidget(mainarea); |
135 | //the main area | 135 | //the main area |
136 | QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom); | 136 | QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom); |
137 | area=new QCanvas(235,235); | 137 | area=new QCanvas(235,235); |
138 | QColor bgColor=palette().color(QPalette::Normal,QColorGroup::Background); | ||
139 | area->setBackgroundColor(bgColor); | ||
140 | boardview=new BackGammonView(area,mainarea); | 138 | boardview=new BackGammonView(area,mainarea); |
141 | boardview->setMaximumHeight(240); | 139 | boardview->setMaximumHeight(240); |
142 | layout->addWidget(boardview); | 140 | layout->addWidget(boardview); |
143 | connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int))); | 141 | connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int))); |
144 | //status bar | 142 | //status bar |
145 | message=new QLabel("<b>Backgammon</b>",mainarea); | 143 | message=new QLabel("<b>Backgammon</b>",mainarea); |
146 | message->setAlignment(AlignHCenter); | 144 | message->setAlignment(AlignHCenter); |
147 | layout->addWidget(message); | 145 | layout->addWidget(message); |
148 | 146 | ||
149 | //the marker | 147 | //the marker |
150 | marker_current=new QCanvasRectangle(area); | 148 | marker_current=new QCanvasRectangle(area); |
151 | marker_current->setBrush(QColor(0,0,255)); | 149 | marker_current->setBrush(QColor(0,0,255)); |
diff --git a/noncore/games/backgammon/backgammon.h b/noncore/games/backgammon/backgammon.h index d803489..e3276f1 100644 --- a/noncore/games/backgammon/backgammon.h +++ b/noncore/games/backgammon/backgammon.h | |||
@@ -9,24 +9,25 @@ | |||
9 | 9 | ||
10 | #include <qlabel.h> | 10 | #include <qlabel.h> |
11 | #include <qmainwindow.h> | 11 | #include <qmainwindow.h> |
12 | //#include <qwidget.h> | 12 | //#include <qwidget.h> |
13 | 13 | ||
14 | 14 | ||
15 | 15 | ||
16 | 16 | ||
17 | class BackGammon : public QMainWindow | 17 | class BackGammon : public QMainWindow |
18 | { | 18 | { |
19 | Q_OBJECT | 19 | Q_OBJECT |
20 | private: | 20 | private: |
21 | //GUI | ||
21 | //the "status" bar | 22 | //the "status" bar |
22 | QLabel* message; | 23 | QLabel* message; |
23 | //the main drawing area | 24 | //the main drawing area |
24 | QCanvas* area; | 25 | QCanvas* area; |
25 | BackGammonView* boardview; | 26 | BackGammonView* boardview; |
26 | CanvasImageItem* board; | 27 | CanvasImageItem* board; |
27 | CanvasImageItem* table; | 28 | CanvasImageItem* table; |
28 | CanvasImageItem** p1; | 29 | CanvasImageItem** p1; |
29 | CanvasImageItem** p2; | 30 | CanvasImageItem** p2; |
30 | CanvasImageItem** p1_side; | 31 | CanvasImageItem** p1_side; |
31 | CanvasImageItem** p2_side; | 32 | CanvasImageItem** p2_side; |
32 | 33 | ||
diff --git a/noncore/games/bounce/kbounce.cpp b/noncore/games/bounce/kbounce.cpp index 5d8aba3..50f4ef6 100644 --- a/noncore/games/bounce/kbounce.cpp +++ b/noncore/games/bounce/kbounce.cpp | |||
@@ -104,34 +104,34 @@ void KJezzball::newGame() | |||
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 | ||
114 | void KJezzball::about() | 114 | void KJezzball::about() |
115 | { | 115 | { |
116 | QMessageBox::information( this, "About", | 116 | QMessageBox::information( this, tr("About"), |
117 | "Written by: Stefan Schimanski\n" | 117 | tr("Written by: Stefan Schimanski\n" |
118 | "Ported by: Martin Imobersteg\n" | 118 | "Ported by: Martin Imobersteg\n" |
119 | "\n" | 119 | "\n" |
120 | "Click to form walls.\n" | 120 | "Click to form walls.\n" |
121 | "Hit space to switch wall direction.\n" | 121 | "Hit space to switch wall direction.\n" |
122 | "Try to reduce total space by 75%.\n" | 122 | "Try to reduce total space by 75%.\n" |
123 | "\n" | 123 | "\n" |
124 | "This program is distributed under\n" | 124 | "This program is distributed under\n" |
125 | "the terms of the GPL v2." ); | 125 | "the terms of the GPL v2.") ); |
126 | } | 126 | } |
127 | 127 | ||
128 | void KJezzball::closeGame() | 128 | void KJezzball::closeGame() |
129 | { | 129 | { |
130 | if ( m_state!=Idle ) | 130 | if ( m_state!=Idle ) |
131 | { | 131 | { |
132 | stopLevel(); | 132 | stopLevel(); |
133 | m_state = Idle; | 133 | m_state = Idle; |
134 | } | 134 | } |
135 | } | 135 | } |
136 | 136 | ||
137 | void KJezzball::pauseGame() | 137 | void KJezzball::pauseGame() |
diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp index b870a59..97a17a1 100644 --- a/noncore/games/buzzword/buzzword.cpp +++ b/noncore/games/buzzword/buzzword.cpp | |||
@@ -1,14 +1,14 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2002 Martin Imobersteg <imm@gmx.ch> | 2 | * Copyright (C) 2002 Martin Imobersteg <imm@gmx.ch> |
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 General Public | 5 | * modify it under the terms of the GNU 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 |
@@ -93,51 +93,51 @@ void BuzzWord::drawGrid() | |||
93 | return; | 93 | return; |
94 | 94 | ||
95 | QTextStream t( &f ); | 95 | QTextStream t( &f ); |
96 | 96 | ||
97 | while (!t.atEnd()) | 97 | while (!t.atEnd()) |
98 | { | 98 | { |
99 | l << t.readLine(); | 99 | l << t.readLine(); |
100 | } | 100 | } |
101 | 101 | ||
102 | f.close(); | 102 | f.close(); |
103 | 103 | ||
104 | grid = new QGrid(gridVal, this); | 104 | grid = new QGrid(gridVal, this); |
105 | grid->setFixedSize(240,240); | 105 | //grid->setFixedSize( 480, 480 ); |
106 | 106 | ||
107 | for( int c = 0 ; c < gridVal ; c++ ) | 107 | for( int c = 0 ; c < gridVal ; c++ ) |
108 | { | 108 | { |
109 | for( int r = 0 ; r < gridVal ; r++ ) | 109 | for( int r = 0 ; r < gridVal ; r++ ) |
110 | { | 110 | { |
111 | uint pos = rand() % l. count(); | 111 | uint pos = rand() % l. count(); |
112 | 112 | ||
113 | QString word = QStringList::split(" ", l[pos]).join("\n"); | 113 | QString word = QStringList::split(" ", l[pos]).join("\n"); |
114 | BuzzItem* bi = new BuzzItem( c, r, word, grid ); | 114 | BuzzItem* bi = new BuzzItem( c, r, word, grid ); |
115 | connect( bi, SIGNAL(clicked(int, int)), this, SLOT(clicked(int,int)) ); | 115 | connect( bi, SIGNAL(clicked(int, int)), this, SLOT(clicked(int,int)) ); |
116 | map[c][r] = 0; | 116 | map[c][r] = 0; |
117 | 117 | ||
118 | l.remove( l.at( pos )); | 118 | l.remove( l.at( pos )); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | void BuzzWord::clicked(int row, int column) | 123 | void BuzzWord::clicked(int row, int column) |
124 | { | 124 | { |
125 | if ( ! gameOver ) | 125 | if ( ! gameOver ) |
126 | { | 126 | { |
127 | int rowTotal = 0; | 127 | int rowTotal = 0; |
128 | int columnTotal = 0; | 128 | int columnTotal = 0; |
129 | 129 | ||
130 | map[column][row] = 1; | 130 | map[column][row] = 1; |
131 | 131 | ||
132 | for( int c = 0 ; c < gridVal ; c++ ) | 132 | for( int c = 0 ; c < gridVal ; c++ ) |
133 | { | 133 | { |
134 | for( int r = 0 ; r < gridVal ; r++ ) | 134 | for( int r = 0 ; r < gridVal ; r++ ) |
135 | { | 135 | { |
136 | if ( map[c][r] == 1 ) | 136 | if ( map[c][r] == 1 ) |
137 | rowTotal++; | 137 | rowTotal++; |
138 | 138 | ||
139 | if ( rowTotal == 4 ) | 139 | if ( rowTotal == 4 ) |
140 | { | 140 | { |
141 | bingo(); | 141 | bingo(); |
142 | } | 142 | } |
143 | } | 143 | } |
diff --git a/noncore/games/fifteen/opie-fifteen.control b/noncore/games/fifteen/opie-fifteen.control index 662fd03..8fa355f 100644 --- a/noncore/games/fifteen/opie-fifteen.control +++ b/noncore/games/fifteen/opie-fifteen.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-fifteen | 1 | Package: opie-fifteen |
2 | Files: bin/fifteen apps/Games/fifteen.desktop pics/fifteen | 2 | Files: bin/fifteen apps/Games/fifteen.desktop pics/fifteen |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Arch: iPAQ | 7 | Arch: iPAQ |
8 | Version: $QPE_VERSION-$SUB_VERSION | ||
9 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
10 | Description: Fifteen pieces game | 9 | Description: Fifteen pieces game |
11 | A game for the Opie environment. | 10 | A game for the Opie environment. |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control index 061c02c..24929de 100644 --- a/noncore/games/go/opie-go.control +++ b/noncore/games/go/opie-go.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-go | 1 | Package: opie-go |
2 | Files: bin/go apps/Games/go.desktop pics/go | 2 | Files: bin/go apps/Games/go.desktop pics/go |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Warwick Allison <warwick@trolltech.com> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: The game of Go | 8 | Description: The game of Go |
10 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp index 812e9ea..df27c76 100644 --- a/noncore/games/kpacman/kpacman.cpp +++ b/noncore/games/kpacman/kpacman.cpp | |||
@@ -25,25 +25,25 @@ Kpacman::Kpacman(QWidget *parent, const char *name) | |||
25 | schemesPopup->setAutoDelete(TRUE); | 25 | schemesPopup->setAutoDelete(TRUE); |
26 | 26 | ||
27 | menu(); | 27 | menu(); |
28 | 28 | ||
29 | m_view = new QWidget( this, "m_view" ); | 29 | m_view = new QWidget( this, "m_view" ); |
30 | m_view->setBackgroundColor( black ); | 30 | m_view->setBackgroundColor( black ); |
31 | m_layout = new QGridLayout( m_view ); | 31 | m_layout = new QGridLayout( m_view ); |
32 | m_layout->setMargin( 7 ); | 32 | m_layout->setMargin( 7 ); |
33 | 33 | ||
34 | view = new KpacmanWidget( this, QString(name)+"widget"); | 34 | view = new KpacmanWidget( this, QString(name)+"widget"); |
35 | m_layout->addWidget( view, 0, 0 ); | 35 | m_layout->addWidget( view, 0, 0 ); |
36 | 36 | ||
37 | setCaption( "KPacman" ); | 37 | setCaption( tr("KPacman") ); |
38 | 38 | ||
39 | view->referee->setFocus(); | 39 | view->referee->setFocus(); |
40 | 40 | ||
41 | connect(view->referee, SIGNAL(setScore(int, int)), | 41 | connect(view->referee, SIGNAL(setScore(int, int)), |
42 | view->score, SLOT(setScore(int, int))); | 42 | view->score, SLOT(setScore(int, int))); |
43 | connect(view->referee, SIGNAL(setPoints(int)), | 43 | connect(view->referee, SIGNAL(setPoints(int)), |
44 | view->score, SLOT(set(int))); | 44 | view->score, SLOT(set(int))); |
45 | connect(view->referee, SIGNAL(setLifes(int)), | 45 | connect(view->referee, SIGNAL(setLifes(int)), |
46 | view->status, SLOT(setLifes(int))); | 46 | view->status, SLOT(setLifes(int))); |
47 | connect(view->referee, SIGNAL(setLevel(int)), | 47 | connect(view->referee, SIGNAL(setLevel(int)), |
48 | view->status, SLOT(setLevel(int))); | 48 | view->status, SLOT(setLevel(int))); |
49 | connect(view->referee, SIGNAL(forcedHallOfFame(bool)), | 49 | connect(view->referee, SIGNAL(forcedHallOfFame(bool)), |
diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control index 7623d6a..7b5ead6 100644 --- a/noncore/games/mindbreaker/opie-mindbreaker.control +++ b/noncore/games/mindbreaker/opie-mindbreaker.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-mindbreaker | 1 | Package: opie-mindbreaker |
2 | Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker | 2 | Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Game: crack the coloured code | 8 | Description: Game: crack the coloured code |
10 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control index 7236cf8..32f0352 100644 --- a/noncore/games/minesweep/opie-minesweep.control +++ b/noncore/games/minesweep/opie-minesweep.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-minesweep | 1 | Package: opie-minesweep |
2 | Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep | 2 | Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Game: find the mines | 8 | Description: Game: find the mines |
10 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/parashoot/opie-parashoot.control b/noncore/games/parashoot/opie-parashoot.control index ad955f5..758d24d 100644 --- a/noncore/games/parashoot/opie-parashoot.control +++ b/noncore/games/parashoot/opie-parashoot.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-parashoot | 1 | Package: opie-parashoot |
2 | Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot | 2 | Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Game: shoot the parachutists | 8 | Description: Game: shoot the parachutists |
10 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control index 49cc6b2..25a49b4 100644 --- a/noncore/games/qasteroids/opie-qasteroids.control +++ b/noncore/games/qasteroids/opie-qasteroids.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-qasteroids | 1 | Package: opie-qasteroids |
2 | Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/* | 2 | Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Jones <mjones@trolltech.com> | 5 | Maintainer: Martin Jones <mjones@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Game: shoot the asteroids | 8 | Description: Game: shoot the asteroids |
10 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.control b/noncore/games/sfcave-sdl/sfcave-sdl.control index c017280..9bf43ba 100644 --- a/noncore/games/sfcave-sdl/sfcave-sdl.control +++ b/noncore/games/sfcave-sdl/sfcave-sdl.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Files: bin/sfcave-sdl apps/Games/sfcave-sdl.desktop pics/sfcave-sdl sounds/sfcave-sdl | 1 | Files: bin/sfcave-sdl apps/Games/sfcave-sdl.desktop pics/sfcave-sdl sounds/sfcave-sdl |
2 | Package: sfcave-sdl | 2 | Package: sfcave-sdl |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: Games | 4 | Section: Games |
5 | Version: $QPE_VERSION-$SUB_VERSION | ||
6 | Architecture: arm | 5 | Architecture: arm |
7 | Maintainer: Andy Qua (andy.qua@blueyonder.co.uk) | 6 | Maintainer: Andy Qua (andy.qua@blueyonder.co.uk) |
8 | Depends: libSDL,libSDL_-mixer,libSDL-image,libSDL-gfx | 7 | Depends: libSDL,libSDL_-mixer,libSDL-image,libSDL-gfx |
9 | Description: SFCave SDL for the Zaurus. Fly though the cave avoiding the walls. | 8 | Description: SFCave SDL for the Zaurus. Fly though the cave avoiding the walls. |
10 | 9 | ||
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/sfcave/opie-sfcave.control b/noncore/games/sfcave/opie-sfcave.control index 1566959..0ff3e2c 100644 --- a/noncore/games/sfcave/opie-sfcave.control +++ b/noncore/games/sfcave/opie-sfcave.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-sfcave | 1 | Package: opie-sfcave |
2 | Files: bin/sfcave apps/Games/sfcave.desktop pics/sfcave | 2 | Files: bin/sfcave apps/Games/sfcave.desktop pics/sfcave |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Andy Qua <andy.qua@blueyonder.co.uk> | 5 | Maintainer: Andy Qua <andy.qua@blueyonder.co.uk> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: SFCave for the Zaurus. Fly the dot though the cave avoiding the walls. | 8 | Description: SFCave for the Zaurus. Fly the dot though the cave avoiding the walls. |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp index 0f312ac..68e0f14 100644 --- a/noncore/games/snake/interface.cpp +++ b/noncore/games/snake/interface.cpp | |||
@@ -91,25 +91,25 @@ void SnakeGame::welcomescreen() | |||
91 | QCanvasPixmapArray* titlearray = new QCanvasPixmapArray(Resource::findPixmap("snake/title")); | 91 | QCanvasPixmapArray* titlearray = new QCanvasPixmapArray(Resource::findPixmap("snake/title")); |
92 | QCanvasSprite* titlepic = new QCanvasSprite(titlearray, &canvas); | 92 | QCanvasSprite* titlepic = new QCanvasSprite(titlearray, &canvas); |
93 | titlepic->move(canvas.width()/2 - 33, canvas.height()/2-85); | 93 | titlepic->move(canvas.width()/2 - 33, canvas.height()/2-85); |
94 | titlepic->show(); | 94 | titlepic->show(); |
95 | QCanvasText* instr = new QCanvasText(tr("Use the arrow keys to guide the\n" | 95 | QCanvasText* instr = new QCanvasText(tr("Use the arrow keys to guide the\n" |
96 | "snake to eat the mouse. You must not\n" | 96 | "snake to eat the mouse. You must not\n" |
97 | "crash into the walls, edges or its tail."), | 97 | "crash into the walls, edges or its tail."), |
98 | &canvas); | 98 | &canvas); |
99 | w = instr->boundingRect().width(); | 99 | w = instr->boundingRect().width(); |
100 | instr->move(canvas.width()/2-w/2, canvas.height()/2-20); | 100 | instr->move(canvas.width()/2-w/2, canvas.height()/2-20); |
101 | instr->setColor(white); | 101 | instr->setColor(white); |
102 | instr->show(); | 102 | instr->show(); |
103 | QCanvasText* cont = new QCanvasText(tr("Press Any Key To Start"), &canvas); | 103 | QCanvasText* cont = new QCanvasText(tr("Press any key to start"), &canvas); |
104 | w = cont->boundingRect().width(); | 104 | w = cont->boundingRect().width(); |
105 | cont->move(canvas.width()/2-w/2, canvas.height()-20); | 105 | cont->move(canvas.width()/2-w/2, canvas.height()-20); |
106 | cont->setColor(yellow); | 106 | cont->setColor(yellow); |
107 | cont->show(); | 107 | cont->show(); |
108 | 108 | ||
109 | } | 109 | } |
110 | 110 | ||
111 | void SnakeGame::newGame() | 111 | void SnakeGame::newGame() |
112 | { | 112 | { |
113 | clear(); | 113 | clear(); |
114 | snake = new Snake(&canvas); | 114 | snake = new Snake(&canvas); |
115 | connect(snake, SIGNAL(dead()), this, SLOT(gameOver()) ); | 115 | connect(snake, SIGNAL(dead()), this, SLOT(gameOver()) ); |
@@ -187,25 +187,25 @@ void SnakeGame::gameOver() | |||
187 | int w = gameover->boundingRect().width(); | 187 | int w = gameover->boundingRect().width(); |
188 | gameover->move(canvas.width()/2 -w/2, canvas.height()/2 -50); | 188 | gameover->move(canvas.width()/2 -w/2, canvas.height()/2 -50); |
189 | gameover->show(); | 189 | gameover->show(); |
190 | gamestopped = true; | 190 | gamestopped = true; |
191 | waitover = false; | 191 | waitover = false; |
192 | pauseTimer->start(1500); | 192 | pauseTimer->start(1500); |
193 | } | 193 | } |
194 | 194 | ||
195 | void SnakeGame::wait() | 195 | void SnakeGame::wait() |
196 | { | 196 | { |
197 | waitover = true; | 197 | waitover = true; |
198 | pauseTimer->stop(); | 198 | pauseTimer->stop(); |
199 | QCanvasText* cont = new QCanvasText(tr("Press Any Key to Begin a New Game."), | 199 | QCanvasText* cont = new QCanvasText(tr("Press any key to begin a new game."), |
200 | &canvas); | 200 | &canvas); |
201 | cont->setZ(100); | 201 | cont->setZ(100); |
202 | cont->setColor(white); | 202 | cont->setColor(white); |
203 | int w = cont->boundingRect().width(); | 203 | int w = cont->boundingRect().width(); |
204 | cont->move(canvas.width()/2 -w/2, canvas.height()/2); | 204 | cont->move(canvas.width()/2 -w/2, canvas.height()/2); |
205 | cont->show(); | 205 | cont->show(); |
206 | } | 206 | } |
207 | 207 | ||
208 | void SnakeGame::keyPressEvent(QKeyEvent* event) | 208 | void SnakeGame::keyPressEvent(QKeyEvent* event) |
209 | { | 209 | { |
210 | if (gamestopped) { | 210 | if (gamestopped) { |
211 | if (waitover) | 211 | if (waitover) |
diff --git a/noncore/games/snake/opie-snake.control b/noncore/games/snake/opie-snake.control index 3ab6640..ef4fc61 100644 --- a/noncore/games/snake/opie-snake.control +++ b/noncore/games/snake/opie-snake.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-snake | 1 | Package: opie-snake |
2 | Files: bin/snake apps/Games/snake.desktop pics/snake | 2 | Files: bin/snake apps/Games/snake.desktop pics/snake |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Game: control the snake | 8 | Description: Game: control the snake |
10 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp index e836eb2..317a02d 100644 --- a/noncore/games/solitaire/canvascardwindow.cpp +++ b/noncore/games/solitaire/canvascardwindow.cpp | |||
@@ -61,55 +61,55 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) | |||
61 | 61 | ||
62 | QPopupMenu* file = new QPopupMenu; | 62 | QPopupMenu* file = new QPopupMenu; |
63 | file->insertItem(tr("Patience"), this, SLOT(initPatience()), CTRL+Key_F); | 63 | file->insertItem(tr("Patience"), this, SLOT(initPatience()), CTRL+Key_F); |
64 | file->insertItem(tr("Freecell"), this, SLOT(initFreecell()), CTRL+Key_F); | 64 | file->insertItem(tr("Freecell"), this, SLOT(initFreecell()), CTRL+Key_F); |
65 | file->insertItem(tr("Chicane"), this, SLOT(initChicane()), CTRL+Key_F); | 65 | file->insertItem(tr("Chicane"), this, SLOT(initChicane()), CTRL+Key_F); |
66 | file->insertItem(tr("Harp"), this, SLOT(initHarp()), CTRL+Key_F); | 66 | file->insertItem(tr("Harp"), this, SLOT(initHarp()), CTRL+Key_F); |
67 | file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub()), CTRL+Key_F); | 67 | file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub()), CTRL+Key_F); |
68 | menu->insertItem(tr("&Game"), file); | 68 | menu->insertItem(tr("&Game"), file); |
69 | 69 | ||
70 | menu->insertSeparator(); | 70 | menu->insertSeparator(); |
71 | 71 | ||
72 | settings = new QPopupMenu; | 72 | settings = new QPopupMenu; |
73 | settings->insertItem(tr("&Change Card Backs"), this, SLOT(changeCardBacks()), Key_F2); | 73 | settings->insertItem(tr("&Change card backs"), this, SLOT(changeCardBacks()), Key_F2); |
74 | snap_id = settings->insertItem(tr("&Snap To Position"), this, SLOT(snapToggle()), Key_F3); | 74 | snap_id = settings->insertItem(tr("&Snap to position"), this, SLOT(snapToggle()), Key_F3); |
75 | settings->setCheckable(TRUE); | 75 | settings->setCheckable(TRUE); |
76 | menu->insertItem(tr("&Settings"),settings); | 76 | menu->insertItem(tr("&Settings"),settings); |
77 | 77 | ||
78 | menu->insertSeparator(); | 78 | menu->insertSeparator(); |
79 | 79 | ||
80 | QPopupMenu* help = new QPopupMenu; | 80 | QPopupMenu* help = new QPopupMenu; |
81 | help->insertItem(tr("&About"), this, SLOT(help()), Key_F1); | 81 | help->insertItem(tr("&About"), this, SLOT(help()), Key_F1); |
82 | help->setItemChecked(dbf_id, TRUE); | 82 | help->setItemChecked(dbf_id, TRUE); |
83 | menu->insertItem(tr("&Help"),help); | 83 | menu->insertItem(tr("&Help"),help); |
84 | #else | 84 | #else |
85 | QMenuBar* menu = menuBar(); | 85 | QMenuBar* menu = menuBar(); |
86 | 86 | ||
87 | QPopupMenu* file = new QPopupMenu; | 87 | QPopupMenu* file = new QPopupMenu; |
88 | file->insertItem(tr("Patience"), this, SLOT(initPatience())); | 88 | file->insertItem(tr("Patience"), this, SLOT(initPatience())); |
89 | file->insertItem(tr("Freecell"), this, SLOT(initFreecell())); | 89 | file->insertItem(tr("Freecell"), this, SLOT(initFreecell())); |
90 | file->insertItem(tr("Chicane"), this, SLOT(initChicane())); | 90 | file->insertItem(tr("Chicane"), this, SLOT(initChicane())); |
91 | file->insertItem(tr("Harp"), this, SLOT(initHarp())); | 91 | file->insertItem(tr("Harp"), this, SLOT(initHarp())); |
92 | file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub())); | 92 | file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub())); |
93 | menu->insertItem(tr("Play"), file); | 93 | menu->insertItem(tr("Play"), file); |
94 | 94 | ||
95 | menu->insertSeparator(); | 95 | menu->insertSeparator(); |
96 | 96 | ||
97 | settings = new QPopupMenu; | 97 | settings = new QPopupMenu; |
98 | settings->setCheckable(TRUE); | 98 | settings->setCheckable(TRUE); |
99 | settings->insertItem(tr("Change Card Backs"), this, SLOT(changeCardBacks())); | 99 | settings->insertItem(tr("Change card backs"), this, SLOT(changeCardBacks())); |
100 | snap_id = settings->insertItem(tr("Snap To Position"), this, SLOT(snapToggle())); | 100 | snap_id = settings->insertItem(tr("Snap to position"), this, SLOT(snapToggle())); |
101 | QString m; | 101 | QString m; |
102 | 102 | ||
103 | drawId = settings->insertItem(tr("Turn One Card"), this, SLOT(drawnToggle())); | 103 | drawId = settings->insertItem(tr("Turn one card"), this, SLOT(drawnToggle())); |
104 | menu->insertItem(tr("Settings"),settings); | 104 | menu->insertItem(tr("Settings"),settings); |
105 | settings->setCheckable(TRUE); | 105 | settings->setCheckable(TRUE); |
106 | 106 | ||
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | menu->show(); | 109 | menu->show(); |
110 | 110 | ||
111 | Config cfg( "Patience" ); | 111 | Config cfg( "Patience" ); |
112 | cfg.setGroup( "GlobalSettings" ); | 112 | cfg.setGroup( "GlobalSettings" ); |
113 | snapOn = cfg.readBoolEntry( "SnapOn", TRUE); | 113 | snapOn = cfg.readBoolEntry( "SnapOn", TRUE); |
114 | settings->setItemChecked(snap_id, snapOn); | 114 | settings->setItemChecked(snap_id, snapOn); |
115 | 115 | ||
@@ -274,27 +274,27 @@ void CanvasCardWindow::drawnToggle() | |||
274 | { | 274 | { |
275 | drawThree=!drawThree; | 275 | drawThree=!drawThree; |
276 | Config cfg( "Patience" ); | 276 | Config cfg( "Patience" ); |
277 | cfg.setGroup( "GlobalSettings" ); | 277 | cfg.setGroup( "GlobalSettings" ); |
278 | cardGame->toggleCardsDrawn(); | 278 | cardGame->toggleCardsDrawn(); |
279 | updateDraw(); | 279 | updateDraw(); |
280 | cfg.writeEntry( "DrawThree", drawThree); | 280 | cfg.writeEntry( "DrawThree", drawThree); |
281 | cfg.write(); | 281 | cfg.write(); |
282 | } | 282 | } |
283 | 283 | ||
284 | void CanvasCardWindow::updateDraw() { | 284 | void CanvasCardWindow::updateDraw() { |
285 | if(cardGame->cardsDrawn() == 3){ | 285 | if(cardGame->cardsDrawn() == 3){ |
286 | settings->changeItem(drawId, tr("Turn One Card")); | 286 | settings->changeItem(drawId, tr("Turn one card")); |
287 | } else { | 287 | } else { |
288 | settings->changeItem(drawId, tr("Turn Three Cards")); | 288 | settings->changeItem(drawId, tr("Turn three cards")); |
289 | } | 289 | } |
290 | } | 290 | } |
291 | 291 | ||
292 | 292 | ||
293 | void CanvasCardWindow::setCardBacks() | 293 | void CanvasCardWindow::setCardBacks() |
294 | { | 294 | { |
295 | QCanvasItemList l = canvas.allItems(); | 295 | QCanvasItemList l = canvas.allItems(); |
296 | 296 | ||
297 | for (QCanvasItemList::Iterator it = l.begin(); it != l.end(); ++it) { | 297 | for (QCanvasItemList::Iterator it = l.begin(); it != l.end(); ++it) { |
298 | if ( (*it)->rtti() == canvasCardId ) | 298 | if ( (*it)->rtti() == canvasCardId ) |
299 | ((CanvasCard *)(*it))->setCardBack( cardBack ); | 299 | ((CanvasCard *)(*it))->setCardBack( cardBack ); |
300 | } | 300 | } |
diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control index 76e7208..5fa521f 100644 --- a/noncore/games/solitaire/opie-solitaire.control +++ b/noncore/games/solitaire/opie-solitaire.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-solitaire | 1 | Package: opie-solitaire |
2 | Files: bin/patience apps/Games/patience.desktop pics/cards | 2 | Files: bin/patience apps/Games/patience.desktop pics/cards |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Game: solitaire card games | 8 | Description: Game: solitaire card games |
10 | A solitaire game for the Opie environment. | 9 | A solitaire game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/tetrix/opie-tetrix.control b/noncore/games/tetrix/opie-tetrix.control index e335507..e901dbf 100644 --- a/noncore/games/tetrix/opie-tetrix.control +++ b/noncore/games/tetrix/opie-tetrix.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-tetrix | 1 | Package: opie-tetrix |
2 | Files: bin/tetrix apps/Games/tetrix.desktop pics/tetrix/* | 2 | Files: bin/tetrix apps/Games/tetrix.desktop pics/tetrix/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Arch: iPAQ | 7 | Arch: iPAQ |
8 | Version: $QPE_VERSION-$SUB_VERSION | ||
9 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
10 | Description: Game: control falling blocks | 9 | Description: Game: control falling blocks |
11 | A game for the Opie environment. | 10 | A game for the Opie environment. |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp index f2ab334..78fb3b7 100644 --- a/noncore/games/tictac/main.cpp +++ b/noncore/games/tictac/main.cpp | |||
@@ -16,16 +16,16 @@ | |||
16 | int main( int argc, char **argv ) | 16 | int main( int argc, char **argv ) |
17 | { | 17 | { |
18 | QPEApplication a( argc, argv ); | 18 | QPEApplication a( argc, argv ); |
19 | int n = 3; | 19 | int n = 3; |
20 | if ( argc == 2 ) // get board size n | 20 | if ( argc == 2 ) // get board size n |
21 | n = atoi(argv[1]); | 21 | n = atoi(argv[1]); |
22 | if ( n < 3 || n > 10 ) { // out of range | 22 | if ( n < 3 || n > 10 ) { // out of range |
23 | qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] ); | 23 | qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] ); |
24 | return 1; | 24 | return 1; |
25 | } | 25 | } |
26 | TicTacToe ttt( n ); // create game | 26 | TicTacToe ttt( n ); // create game |
27 | a.setMainWidget( &ttt ); | 27 | a.setMainWidget( &ttt ); |
28 | ttt.setCaption("TicTac"); | 28 | ttt.setCaption( QObject::tr("TicTac") ); |
29 | ttt.show(); // show widget | 29 | ttt.show(); // show widget |
30 | return a.exec(); // go | 30 | return a.exec(); // go |
31 | } | 31 | } |
diff --git a/noncore/games/tictac/opie-tictac.control b/noncore/games/tictac/opie-tictac.control index c4ee36c..0074505 100644 --- a/noncore/games/tictac/opie-tictac.control +++ b/noncore/games/tictac/opie-tictac.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-tictac | 1 | Package: opie-tictac |
2 | Files: bin/tictac apps/Games/tictac.desktop pics/tictac | 2 | Files: bin/tictac apps/Games/tictac.desktop pics/tictac |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: ljp <ljp@llornkcor.com> | 5 | Maintainer: ljp <ljp@llornkcor.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Tic Tac Toe game. | 8 | Description: Tic Tac Toe game. |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control index 3be8e8f..c7dc126 100644 --- a/noncore/games/wordgame/opie-wordgame.control +++ b/noncore/games/wordgame/opie-wordgame.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-wordgame | 1 | Package: opie-wordgame |
2 | Files: bin/wordgame apps/Games/wordgame.desktop pics/wordgame | 2 | Files: bin/wordgame apps/Games/wordgame.desktop pics/wordgame |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Crossword game | 8 | Description: Crossword game |
10 | A crossword game for the Opie environment. | 9 | A crossword game for the Opie environment. |
11 | Play against the computer or human opponents. | 10 | Play against the computer or human opponents. |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index d3160f4..d46e824 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp | |||
@@ -281,49 +281,49 @@ void WordGame::startGame(const QStringList& playerlist) | |||
281 | 281 | ||
282 | bool WordGame::loadRules(const QString &name) | 282 | bool WordGame::loadRules(const QString &name) |
283 | { | 283 | { |
284 | QString filename = Global::applicationFileName( "wordgame", name ); | 284 | QString filename = Global::applicationFileName( "wordgame", name ); |
285 | QFile file( filename ); | 285 | QFile file( filename ); |
286 | if ( !file.open( IO_ReadOnly ) ) | 286 | if ( !file.open( IO_ReadOnly ) ) |
287 | return FALSE; | 287 | return FALSE; |
288 | 288 | ||
289 | QTextStream ts( &file ); | 289 | QTextStream ts( &file ); |
290 | 290 | ||
291 | QString title = name; | 291 | QString title = name; |
292 | title.truncate( title.length() - 6 ); | 292 | title.truncate( title.length() - 6 ); |
293 | setCaption( title ); | 293 | //setCaption( title ); |
294 | 294 | ||
295 | QString shapepixmap; | 295 | QString shapepixmap; |
296 | ts >> shapepixmap; | 296 | ts >> shapepixmap; |
297 | int htiles,vtiles; | 297 | int htiles,vtiles; |
298 | ts >> htiles >> vtiles; | 298 | ts >> htiles >> vtiles; |
299 | 299 | ||
300 | if ( htiles < 3 || vtiles < 3 ) | 300 | if ( htiles < 3 || vtiles < 3 ) |
301 | return FALSE; | 301 | return FALSE; |
302 | 302 | ||
303 | QString rule_shapes; | 303 | QString rule_shapes; |
304 | for (int i=0; i<vtiles; i++) { | 304 | for (int i=0; i<vtiles; i++) { |
305 | QString line; | 305 | QString line; |
306 | ts >> line; | 306 | ts >> line; |
307 | rule_shapes += line; | 307 | rule_shapes += line; |
308 | } | 308 | } |
309 | static int rule_effects[12]; | 309 | static int rule_effects[12]; |
310 | int re=0,e; | 310 | int re=0,e; |
311 | ts >> e; | 311 | ts >> e; |
312 | while ( e && re < 10 ) { | 312 | while ( e && re < 10 ) { |
313 | rule_effects[re] = e; | 313 | rule_effects[re] = e; |
314 | if ( re++ < 10 ) ts >> e; | 314 | if ( re++ < 10 ) ts >> e; |
315 | } | 315 | } |
316 | 316 | ||
317 | QImage shim = Resource::loadImage("wordgame/wordgame_shapes.xpm"); | 317 | QImage shim = Resource::loadImage("wordgame/wordgame_shapes"); |
318 | shim = shim.smoothScale((re-1)*TileItem::smallWidth(),TileItem::smallHeight()); | 318 | shim = shim.smoothScale((re-1)*TileItem::smallWidth(),TileItem::smallHeight()); |
319 | QPixmap bgshapes; | 319 | QPixmap bgshapes; |
320 | bgshapes.convertFromImage(shim); | 320 | bgshapes.convertFromImage(shim); |
321 | 321 | ||
322 | rule_effects[re++] = 100; // default bonus | 322 | rule_effects[re++] = 100; // default bonus |
323 | board = new Board(bgshapes, htiles, vtiles, vbox); | 323 | board = new Board(bgshapes, htiles, vtiles, vbox); |
324 | board->setRules(rule_shapes, rule_effects); | 324 | board->setRules(rule_shapes, rule_effects); |
325 | connect(board, SIGNAL(temporaryScore(int)), scoreinfo, SLOT(showTemporaryScore(int))); | 325 | connect(board, SIGNAL(temporaryScore(int)), scoreinfo, SLOT(showTemporaryScore(int))); |
326 | 326 | ||
327 | bag = new Bag; | 327 | bag = new Bag; |
328 | 328 | ||
329 | int count; | 329 | int count; |