summaryrefslogtreecommitdiff
path: root/noncore/games/kbill
authorzecke <zecke>2004-09-10 11:14:02 (UTC)
committer zecke <zecke>2004-09-10 11:14:02 (UTC)
commitb8baf551919868737c6f56a05e6efa1bad4d97ac (patch) (side-by-side diff)
tree402c587e55356aff7f13990e1efcf57775bb9670 /noncore/games/kbill
parent046bff8abb6727f5522748a2dc8a259d27b5979b (diff)
downloadopie-b8baf551919868737c6f56a05e6efa1bad4d97ac.zip
opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.tar.gz
opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.tar.bz2
Remove unused parameter
Diffstat (limited to 'noncore/games/kbill') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/kbill/Game.cc14
-rw-r--r--noncore/games/kbill/Game.h2
-rw-r--r--noncore/games/kbill/field.cpp2
-rw-r--r--noncore/games/kbill/inputbox.cpp10
-rw-r--r--noncore/games/kbill/kbill.h42
5 files changed, 36 insertions, 34 deletions
diff --git a/noncore/games/kbill/Game.cc b/noncore/games/kbill/Game.cc
index 624b50b..4cd5322 100644
--- a/noncore/games/kbill/Game.cc
+++ b/noncore/games/kbill/Game.cc
@@ -58,7 +58,7 @@ void Game::update_info() {
ui.draw_str(str, 5, scrheight-5);
efficiency += ((100*net.base-10*net.win)/net.units);
}
-
+
void Game::update_score (int action) {
switch (action){
case ENDLEVEL: score+=(level*efficiency/iteration); break;
@@ -72,7 +72,7 @@ void Game::warp_to_level (unsigned int lev) {
setup_level(lev);
}
else {
- if (lev<=0) return;
+ if (lev <=0) return;
start(lev);
}
}
@@ -99,7 +99,7 @@ void Game::button_press(int x, int y) {
else if (bill.list[i].state != bill.list[i].STRAY &&
bill.list[i].clicked(x, y))
{
- if (bill.list[i].state == bill.list[i].AT)
+ if (bill.list[i].state == bill.list[i].AT)
net.computers[bill.list[i].target_c].busy=0;
bill.list[i].index = -1;
bill.list[i].cels = bill.dcels;
@@ -131,10 +131,10 @@ void Game::button_release(int x, int y) {
&&
net.computers[i].compatible (bill.list[grabbed].cargo)
&&
- (net.computers[i].os == OS.WINGDOWS ||
+ (net.computers[i].os == OS.WINGDOWS ||
net.computers[i].os == OS.OFF))
{
- net.base++;
+ net.base++;
if (net.computers[i].os == OS.WINGDOWS)
net.win--;
else
@@ -145,12 +145,12 @@ void Game::button_release(int x, int y) {
return;
}
grabbed = EMPTY;
-}
+}
void Game::update() {
switch (state) {
case PLAYING:
- ui.clear();
+ ui.clear();
bucket.draw();
net.update();
net.draw();
diff --git a/noncore/games/kbill/Game.h b/noncore/games/kbill/Game.h
index 4473936..5c9c497 100644
--- a/noncore/games/kbill/Game.h
+++ b/noncore/games/kbill/Game.h
@@ -4,7 +4,7 @@
#include "objects.h"
class Game {
- unsigned state;
+ int state;
int efficiency;
public:
unsigned score, level, iteration;
diff --git a/noncore/games/kbill/field.cpp b/noncore/games/kbill/field.cpp
index a974ab2..0dd8d72 100644
--- a/noncore/games/kbill/field.cpp
+++ b/noncore/games/kbill/field.cpp
@@ -80,4 +80,4 @@ void Field::Timer(){
void Field::paintEvent(QPaintEvent *) {
bitBlt(this, 0, 0, pix);
-} \ No newline at end of file
+}
diff --git a/noncore/games/kbill/inputbox.cpp b/noncore/games/kbill/inputbox.cpp
index 5087fbb..7aaebe7 100644
--- a/noncore/games/kbill/inputbox.cpp
+++ b/noncore/games/kbill/inputbox.cpp
@@ -16,23 +16,23 @@
***************************************************************************/
#include "inputbox.h"
-InputBox::InputBox(QWidget *parent, const char *name, const char *caption, const char *text) : QDialog(parent, name, TRUE) {
+InputBox::InputBox(QWidget *parent, const char *name, const char *, const char *) : QDialog(parent, name, TRUE) {
// setCaption(caption);
-//
+//
// question = new QLabel(this);
// question->setText(text);
// question->setGeometry(10, 10, 240, 50);
-//
+//
// input = new QLineEdit(this);
// input->setGeometry(10, 60, 240, 30);
// input->setFocus();
// input->setMaxLength(19);
-//
+//
// ok = new QPushButton( "Ok", this );
// ok->setGeometry(10, 100, 100,30 );
// ok->setDefault(TRUE);
// connect( ok, SIGNAL(clicked()), SLOT(accept()) );
-//
+//
// cancel = new QPushButton( "Cancel", this );
// cancel->setGeometry(150, 100, 100,30 );
// connect( cancel, SIGNAL(clicked()), SLOT(reject()) );
diff --git a/noncore/games/kbill/kbill.h b/noncore/games/kbill/kbill.h
index fbc0c6c..da1a111 100644
--- a/noncore/games/kbill/kbill.h
+++ b/noncore/games/kbill/kbill.h
@@ -28,27 +28,29 @@
class KBill : public QMainWindow
{
- Q_OBJECT
- public:
+ Q_OBJECT
+public:
KBill();
- ~KBill();
- Field* getField();
- private:
- QMenuBar *menu;
- QPopupMenu *file, *help;
- Field *field;
- int pauseid;
- protected slots:
- void Quit();
- void About();
- void NewGame();
- void Pause();
- void WarpTo();
- void Story();
- void Rules();
- void ViewHighScores();
-
- friend class UI;
+ ~KBill();
+ Field* getField();
+private:
+ QMenuBar *menu;
+ QPopupMenu *file, *help;
+ Field *field;
+ int pauseid;
+
+protected slots:
+ void Quit();
+ void About();
+ void NewGame();
+ void Pause();
+ void WarpTo();
+ void Story();
+ void Rules();
+ void ViewHighScores();
+
+protected:
+ friend class UI;
};
#endif