diff options
| -rw-r--r-- | tdepacman/bitfont.cpp | 2 | ||||
| -rw-r--r-- | tdepacman/board.cpp | 56 | ||||
| -rw-r--r-- | tdepacman/energizer.cpp | 4 | ||||
| -rw-r--r-- | tdepacman/fruit.cpp | 12 | ||||
| -rw-r--r-- | tdepacman/fruit.h | 2 | ||||
| -rw-r--r-- | tdepacman/keys.cpp | 2 | ||||
| -rw-r--r-- | tdepacman/monster.cpp | 8 | ||||
| -rw-r--r-- | tdepacman/pacman.cpp | 8 | ||||
| -rw-r--r-- | tdepacman/pacman.h | 4 | ||||
| -rw-r--r-- | tdepacman/painter.cpp | 24 | ||||
| -rw-r--r-- | tdepacman/painter.h | 6 | ||||
| -rw-r--r-- | tdepacman/referee.cpp | 124 | ||||
| -rw-r--r-- | tdepacman/referee.h | 10 | ||||
| -rw-r--r-- | tdepacman/score.cpp | 34 | ||||
| -rw-r--r-- | tdepacman/score.h | 2 | ||||
| -rw-r--r-- | tdepacman/status.cpp | 16 | ||||
| -rw-r--r-- | tdepacman/status.h | 4 | ||||
| -rw-r--r-- | tdepacman/tdepacmanview.cpp | 10 | ||||
| -rw-r--r-- | tdepacman/tdepacmanview.h | 2 |
19 files changed, 165 insertions, 165 deletions
diff --git a/tdepacman/bitfont.cpp b/tdepacman/bitfont.cpp index f1535fb..2bc1e7d 100644 --- a/tdepacman/bitfont.cpp +++ b/tdepacman/bitfont.cpp @@ -24,7 +24,7 @@ TQRect Bitfont::rect(TQString str) TQPixmap Bitfont::text(TQString str, TQColor fg, TQColor bg) { TQPixmap FG(str.length()*fontWidth, fontHeight); - TQBitmap MASK(str.length()*fontWidth, fontHeight, TRUE); + TQBitmap MASK(str.length()*fontWidth, fontHeight, true); const uchar *s = reinterpret_cast<const unsigned char *>(str.latin1()); for (uint i = 0; i < str.length(); i++) { diff --git a/tdepacman/board.cpp b/tdepacman/board.cpp index fc092c4..0c4a965 100644 --- a/tdepacman/board.cpp +++ b/tdepacman/board.cpp @@ -123,7 +123,7 @@ void Board::setup(const uchar *buf) bool Board::inBounds(int pos) { - return ( pos < 0 || pos > sz-1 ? FALSE : TRUE); + return (pos >= 0 && pos <= sz-1); } void Board::set(int pos, Square sq, int m) @@ -173,7 +173,7 @@ void Board::set(int pos, Square sq, int m) void Board::reset(int pos, Square sq, int m) { - bool found = FALSE; + bool found = false; if (inBounds(pos)) switch (sq) { case out : at(pos) = empty; break; @@ -183,7 +183,7 @@ void Board::reset(int pos, Square sq, int m) if (found) // energizer in the position array energizerPosition[e-1] = energizerPosition[e]; if (energizerPosition[e] == pos) - found = TRUE; + found = true; } energizerPosition[numEnergizers--] = OUT; break; @@ -215,84 +215,84 @@ int Board::position(Square sq, int m) bool Board::isOut(int pos) { if (inBounds(pos)) - return (at(pos) == OUT ? TRUE : FALSE); - return TRUE; + return (at(pos) == OUT); + return true; } bool Board::isEmpty(int pos) { if (inBounds(pos)) - return ((at(pos) & fixBits) == empty ? TRUE : FALSE); - return TRUE; + return ((at(pos) & fixBits) == empty); + return true; } bool Board::isBrick(int pos) { if (inBounds(pos)) - return ((at(pos) & fixBits) == brick ? TRUE : FALSE); - return FALSE; + return ((at(pos) & fixBits) == brick); + return false; } bool Board::isPrison(int pos) { if (inBounds(pos)) - return ((at(pos) & fixBits) == prison ? TRUE : FALSE); - return FALSE; + return ((at(pos) & fixBits) == prison); + return false; } bool Board::isGate(int pos) { if (inBounds(pos)) - return ((at(pos) & fixBits) == gate ? TRUE : FALSE); - return FALSE; + return ((at(pos) & fixBits) == gate); + return false; } bool Board::isTunnel(int pos) { if (inBounds(pos)) - return ((at(pos) & fixBits) == tunnel ? TRUE : FALSE); - return FALSE; + return ((at(pos) & fixBits) == tunnel); + return false; } bool Board::isPoint(int pos) { if (inBounds(pos) && at(pos) != OUT) - return ((at(pos) & pointBit) != 0 ? TRUE : FALSE); - return FALSE; + return ((at(pos) & pointBit) != 0); + return false; } bool Board::isEnergizer(int pos) { if (inBounds(pos) && at(pos) != OUT) - return ((at(pos) & energizerBit) != 0 ? TRUE : FALSE); - return FALSE; + return ((at(pos) & energizerBit) != 0); + return false; } bool Board::isFruit(int pos) { if (inBounds(pos) && at(pos) != OUT) - return ((at(pos) & fruitBit) != 0 ? TRUE : FALSE); - return FALSE; + return ((at(pos) & fruitBit) != 0); + return false; } bool Board::isPacman(int pos) { if (inBounds(pos) && at(pos) != OUT) - return ((at(pos) & pacmanBit) != 0 ? TRUE : FALSE); - return FALSE; + return ((at(pos) & pacmanBit) != 0); + return false; } bool Board::isMonster(int pos) { if (inBounds(pos) && at(pos) != OUT) - return ((at(pos) & monsterBits) != 0 ? TRUE : FALSE); - return FALSE; + return ((at(pos) & monsterBits) != 0); + return false; } bool Board::isWay(int pos, int dir, Square sq) { int p1 = move(pos, dir, 2); if (p1 == OUT) - return (sq == out ? TRUE : FALSE); + return (sq == out); int p2, p3; if (dir == N || dir == S) { p2 = move(p1, E); @@ -310,7 +310,7 @@ bool Board::isWay(int pos, int dir, Square sq) { case tunnel : return isTunnel(p1) & (isTunnel(p2) || isEmpty(p2)) & (isTunnel(p3) || isEmpty(p3)); - default : return FALSE; + default : return false; } } @@ -325,7 +325,7 @@ bool Board::isJump(int pos, int dir) { case S: return pos >= sz-BoardWidth; case SE: return pos >= sz-BoardWidth || x(pos) == BoardWidth-1; } - return FALSE; + return false; } int Board::move(int pos, int dir, int steps) diff --git a/tdepacman/energizer.cpp b/tdepacman/energizer.cpp index ca08f3b..2758541 100644 --- a/tdepacman/energizer.cpp +++ b/tdepacman/energizer.cpp @@ -44,12 +44,12 @@ int Energizer::position() bool Energizer::move() { if (actualPosition == OUT) - return FALSE; + return false; if (++actualPix >= maxPixmaps) actualPix = 0; - return TRUE; + return true; } int Energizer::pix() diff --git a/tdepacman/fruit.cpp b/tdepacman/fruit.cpp index e6ad2d5..0798288 100644 --- a/tdepacman/fruit.cpp +++ b/tdepacman/fruit.cpp @@ -105,21 +105,21 @@ bool Fruit::move(bool activate) timeLeft = waitDuration; actualDirection = X; } - return TRUE; + return true; } - return FALSE; + return false; } if (pause-- > 0) - return FALSE; + return false; else pause = pauseDuration; if (actualPosition == OUT) - return FALSE; + return false; if (actualDirection == X) - return TRUE; + return true; int d = actualDirection; @@ -164,7 +164,7 @@ bool Fruit::move(bool activate) setPosition(actualPosition); } - return TRUE; + return true; } int Fruit::pix() diff --git a/tdepacman/fruit.h b/tdepacman/fruit.h index fbbd9c0..8e334c8 100644 --- a/tdepacman/fruit.h +++ b/tdepacman/fruit.h @@ -19,7 +19,7 @@ public: fruitState state(); int position(); int direction(); - bool move(bool activate=FALSE); + bool move(bool activate=false); int pix(); private: diff --git a/tdepacman/keys.cpp b/tdepacman/keys.cpp index aea6571..62a037c 100644 --- a/tdepacman/keys.cpp +++ b/tdepacman/keys.cpp @@ -14,7 +14,7 @@ #include "keys.h" PKeys::PKeys( TQWidget *parent, const char *name) - : TQDialog( parent, name, TRUE, 0 ) + : TQDialog( parent, name, true, 0 ) { TDEStandardDirs *dirs = TDEGlobal::dirs(); diff --git a/tdepacman/monster.cpp b/tdepacman/monster.cpp index 2f402b4..996008d 100644 --- a/tdepacman/monster.cpp +++ b/tdepacman/monster.cpp @@ -125,17 +125,17 @@ bool Monster::move() } if (pause-- > 0) - return FALSE; + return false; else pause = pauseDuration; if (actualPosition == OUT) - return FALSE; + return false; if (actualDirection == X) { if (++feetPosition >= (maxBodyPixmaps/10)) feetPosition = 0; - return TRUE; + return true; } lastPosition = actualPosition; @@ -222,7 +222,7 @@ bool Monster::move() if (++feetPosition >= (maxBodyPixmaps/10)) feetPosition = 0; - return TRUE; + return true; } int Monster::body() diff --git a/tdepacman/pacman.cpp b/tdepacman/pacman.cpp index 40f60a8..f1152e5 100644 --- a/tdepacman/pacman.cpp +++ b/tdepacman/pacman.cpp @@ -4,7 +4,7 @@ Pacman::Pacman(Board *b) { board = b; - setDemo(FALSE); + setDemo(false); setAlive(0); actualPosition = lastPosition = OUT; mouthPosition = 0; @@ -80,12 +80,12 @@ int Pacman::direction() bool Pacman::move() { if (pause-- > 0) - return FALSE; + return false; else pause = pauseDuration; if (actualDirection == X || actualPosition == OUT) - return FALSE; + return false; lastPosition = actualPosition; @@ -128,7 +128,7 @@ bool Pacman::move() if (++mouthPosition >= (maxPixmaps/4)) mouthPosition = 0; } - return TRUE; + return true; } int Pacman::pix() diff --git a/tdepacman/pacman.h b/tdepacman/pacman.h index 6f1a7c1..8a8e415 100644 --- a/tdepacman/pacman.h +++ b/tdepacman/pacman.h @@ -12,11 +12,11 @@ enum pacmanState { alive }; class Pacman { public: Pacman(Board *b); - void init(bool Demo = FALSE); + void init(bool Demo = false); void setMaxPixmaps(int max); void setAlive(int ticks); void setPosition(int pos); - void setDirection(int dir, bool forced = FALSE); + void setDirection(int dir, bool forced = false); void setDemo(bool yes); pacmanState state(); int position(); diff --git a/tdepacman/painter.cpp b/tdepacman/painter.cpp index 2f44342..454a103 100644 --- a/tdepacman/painter.cpp +++ b/tdepacman/painter.cpp @@ -57,7 +57,7 @@ TQPtrList<TQPixmap> *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, { if (pixmaps == NULL) { pixmaps = new TQPtrList<TQPixmap>; - pixmaps->setAutoDelete(TRUE); + pixmaps->setAutoDelete(true); } if (!pixmaps->isEmpty()) @@ -86,8 +86,8 @@ TQPtrList<TQPixmap> *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, for (int x = 0; x < PIXMAP.width()/width; x++) { TQPixmap *pixmap = new TQPixmap(width, height); pixmaps->append(pixmap); - bitBlt(pixmap, 0, 0, &PIXMAP, x*width, 0, width, height, TQPixmap::CopyROP, TRUE); - bitBlt(&MASK, 0, 0, &BITMAP, x*width, 0, width, height, TQPixmap::CopyROP, TRUE); + bitBlt(pixmap, 0, 0, &PIXMAP, x*width, 0, width, height, TQPixmap::CopyROP, true); + bitBlt(&MASK, 0, 0, &BITMAP, x*width, 0, width, height, TQPixmap::CopyROP, true); pixmap->setMask(MASK); } @@ -99,7 +99,7 @@ TQPtrList<TQPixmap> *Painter::textPixmap(TQStrList &str, TQPtrList<TQPixmap> *pi { if (pixmaps == NULL) { pixmaps = new TQPtrList<TQPixmap>; - pixmaps->setAutoDelete(TRUE); + pixmaps->setAutoDelete(true); } if (!pixmaps->isEmpty()) @@ -118,7 +118,7 @@ TQPtrList<TQPixmap> *Painter::textPixmap(TQString str, TQPtrList<TQPixmap> *pixm { if (pixmaps == NULL) { pixmaps = new TQPtrList<TQPixmap>; - pixmaps->setAutoDelete(TRUE); + pixmaps->setAutoDelete(true); } if (!pixmaps->isEmpty()) @@ -656,7 +656,7 @@ TQString Painter::decodeHexOctString(TQString s) value = s.mid(pos+leadin, 3); ptr = value.latin1(); - while (*ptr != '\0' && (v = valids.find(*ptr++, 0, FALSE)) != -1) { + while (*ptr != '\0' && (v = valids.find(*ptr++, 0, false)) != -1) { c = (c * valids.length()) + v; len++; } @@ -866,14 +866,14 @@ void Painter::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confLevels(FALSE); + confLevels(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confLevels(FALSE); + confLevels(false); } kapp->config()->setGroup(oldgroup); @@ -885,16 +885,16 @@ void Painter::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confMisc(FALSE); - confScoring(FALSE); + confMisc(false); + confScoring(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confMisc(FALSE); - confScoring(FALSE); + confMisc(false); + confScoring(false); } if (*fruitScoreString.at(0) == '\0') diff --git a/tdepacman/painter.h b/tdepacman/painter.h index 09adcaa..775a788 100644 --- a/tdepacman/painter.h +++ b/tdepacman/painter.h @@ -59,9 +59,9 @@ protected: void fillPixmapName(TQStrList &); void confScheme(); - void confLevels(bool defGroup=TRUE); - void confMisc(bool defGroup=TRUE); - void confScoring(bool defGroup=TRUE); + void confLevels(bool defGroup=true); + void confMisc(bool defGroup=true); + void confScoring(bool defGroup=true); void initPixmaps(); void initRoomPixmap(); diff --git a/tdepacman/referee.cpp b/tdepacman/referee.cpp index 0a5b366..4384112 100644 --- a/tdepacman/referee.cpp +++ b/tdepacman/referee.cpp @@ -45,16 +45,16 @@ Referee::Referee( TQWidget *parent, const char *name, int Scheme, int Mode, Bitf fruit = new Fruit(board); monsters = new TQPtrList<Monster>; - monsters->setAutoDelete(TRUE); + monsters->setAutoDelete(true); monsterRect = new TQPtrList<TQRect>; - monsterRect->setAutoDelete(TRUE); + monsterRect->setAutoDelete(true); energizers = new TQPtrList<Energizer>; - energizers->setAutoDelete(TRUE); + energizers->setAutoDelete(true); energizerRect = new TQPtrList<TQRect>; - energizerRect->setAutoDelete(TRUE); + energizerRect->setAutoDelete(true); pacmanRect.setRect(0, 0, 0, 0); fruitRect.setRect(0, 0, 0, 0); @@ -166,7 +166,7 @@ void Referee::timerEvent( TQTimerEvent *e ) TQRect lastRect; int lastPix; - bool moved = FALSE; + bool moved = false; int eated = 0; if (e->timerId() == energizerTimer) { @@ -174,7 +174,7 @@ void Referee::timerEvent( TQTimerEvent *e ) lastRect = pix->rect(energizers->at(e)->position(), EnergizerPix); lastPix = energizers->at(e)->pix(); if (energizers->at(e)->move()) { - moved = TRUE; + moved = true; *energizerRect->at(e) = pix->rect(energizers->at(e)->position(), EnergizerPix); if (lastPix == energizers->at(e)->pix() && lastRect == pix->rect(energizers->at(e)->position(), EnergizerPix)) @@ -186,7 +186,7 @@ void Referee::timerEvent( TQTimerEvent *e ) for (int e = 0; e < board->energizers(); e++) if (!energizerRect->at(e)->isNull()) - repaint(*energizerRect->at(e), FALSE); + repaint(*energizerRect->at(e), false); return; } @@ -251,7 +251,7 @@ void Referee::timerEvent( TQTimerEvent *e ) } if (pos == fruit->position() && fruit->state() == active) { fruit->setEaten(fruitScoreDurTicks[level]); - initFruit(FALSE); + initFruit(false); score(fruitScore[fruit->pix()]); } } @@ -266,7 +266,7 @@ void Referee::timerEvent( TQTimerEvent *e ) if (fruit->move()) { if (pos == fruit->position() && fruit->state() == active) { fruit->setEaten(fruitScoreDurTicks[level]); - initFruit(FALSE); + initFruit(false); score(fruitScore[fruit->pix()]); } if (fruit->state() != active && fruit->pix() >= 0) @@ -291,7 +291,7 @@ void Referee::timerEvent( TQTimerEvent *e ) lastBodyPix = m->body(); lastEyesPix = m->eyes(); if (m->move()) { - moved = TRUE; + moved = true; *monsterRect->at(m->id()) = pix->rect(m->position(), MonsterPix); if (lastBodyPix == m->body() && lastEyesPix == m->eyes() && lastRect == pix->rect(m->position(), MonsterPix)) @@ -326,14 +326,14 @@ void Referee::timerEvent( TQTimerEvent *e ) } if (!pacmanRect.isNull()) - repaint(pacmanRect, FALSE); + repaint(pacmanRect, false); if (!fruitRect.isNull()) - repaint(fruitRect, FALSE); + repaint(fruitRect, false); for (int m = 0; m < board->monsters(); m++) if (!monsterRect->at(m)->isNull()) - repaint(*monsterRect->at(m), FALSE); + repaint(*monsterRect->at(m), false); if (board->points() == 0 && !gameState.testBit(Dying)) levelUp(); @@ -390,18 +390,18 @@ void Referee::repaintFigures() } if (!pacmanRect.isNull()) - repaint(pacmanRect, FALSE); + repaint(pacmanRect, false); if (!fruitRect.isNull()) - repaint(fruitRect, FALSE); + repaint(fruitRect, false); for (int m = 0; m < board->monsters(); m++) if (!monsterRect->at(m)->isNull()) - repaint(*monsterRect->at(m), FALSE); + repaint(*monsterRect->at(m), false); for (int e = 0; e < board->energizers(); e++) if (!energizerRect->at(e)->isNull()) - repaint(*energizerRect->at(e), FALSE); + repaint(*energizerRect->at(e), false); } @@ -634,14 +634,14 @@ void Referee::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confLevels(FALSE); + confLevels(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confLevels(FALSE); + confLevels(false); } kapp->config()->setGroup(oldgroup); @@ -654,18 +654,18 @@ void Referee::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confMisc(FALSE); - confTiming(FALSE); - confScoring(FALSE); + confMisc(false); + confTiming(false); + confScoring(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confMisc(FALSE); - confTiming(FALSE); - confScoring(FALSE); + confMisc(false); + confTiming(false); + confScoring(false); } fillMapName(); @@ -721,7 +721,7 @@ void Referee::keyPressEvent( TQKeyEvent *k ) #ifdef CHEATS else if (key == Key_L) { printf("levelUp()\n"); levelUp(); } - else if (key == Key_F) { printf("fruit->move(TRUE)\n"); fruit->move(TRUE); repaint(FALSE); } + else if (key == Key_F) { printf("fruit->move(true)\n"); fruit->move(true); repaint(false); } else if (key == Key_E) { printf("setLifes(++lifes)\n"); emit setLifes(++lifes); } #endif @@ -804,10 +804,10 @@ void Referee::pause() stop(); stopEnergizer(); gameState.setBit(Paused); - repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")), FALSE); + repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")), false); } else { gameState.clearBit(Paused); - repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")), FALSE); + repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")), false); if (pausedTimer) { pausedTimer = 0; start(); @@ -824,7 +824,7 @@ void Referee::intro() stopEnergizer(); bool paused = gameState.testBit(Paused); - gameState.fill(FALSE); + gameState.fill(false); gameState.setBit(Introducing); gameState.setBit(Init); @@ -863,7 +863,7 @@ void Referee::introMonster(int id) if (m->eyes() != -1) pix->draw(m->position(), RoomPix, EyesPix, m->eyes()); - repaint(pix->rect(m->position(), MonsterPix), FALSE); + repaint(pix->rect(m->position(), MonsterPix), false); m->setPosition(OUT); } @@ -872,43 +872,43 @@ void Referee::introPaint(int t) TQString pts; switch (t) { - case 0 : repaint(pix->draw(16, 6, RoomPix, i18n("CHARACTER"), WHITE, TQColor(), AlignLeft), FALSE); - repaint(pix->draw(36, 6, RoomPix, i18n("/"), WHITE, TQColor(), AlignLeft), FALSE); - repaint(pix->draw(40, 6, RoomPix, i18n("NICKNAME"), WHITE, TQColor(), AlignLeft), FALSE); + case 0 : repaint(pix->draw(16, 6, RoomPix, i18n("CHARACTER"), WHITE, TQColor(), AlignLeft), false); + repaint(pix->draw(36, 6, RoomPix, i18n("/"), WHITE, TQColor(), AlignLeft), false); + repaint(pix->draw(40, 6, RoomPix, i18n("NICKNAME"), WHITE, TQColor(), AlignLeft), false); break; case 1 : introMonster(0); break; - case 2 : repaint(pix->draw(16, 10, RoomPix, i18n("-SHADOW"), RED, TQColor(), AlignLeft), FALSE); + case 2 : repaint(pix->draw(16, 10, RoomPix, i18n("-SHADOW"), RED, TQColor(), AlignLeft), false); break; - case 3 : repaint(pix->draw(38, 10, RoomPix, i18n("\"BLINKY\""), RED, TQColor(), AlignLeft), FALSE); + case 3 : repaint(pix->draw(38, 10, RoomPix, i18n("\"BLINKY\""), RED, TQColor(), AlignLeft), false); break; case 4 : introMonster(1); break; - case 5 : repaint(pix->draw(16, 16, RoomPix, i18n("-SPEEDY"), PINK, TQColor(), AlignLeft), FALSE); + case 5 : repaint(pix->draw(16, 16, RoomPix, i18n("-SPEEDY"), PINK, TQColor(), AlignLeft), false); break; - case 6 : repaint(pix->draw(38, 16, RoomPix, i18n("\"PINKY\""), PINK, TQColor(), AlignLeft), FALSE); + case 6 : repaint(pix->draw(38, 16, RoomPix, i18n("\"PINKY\""), PINK, TQColor(), AlignLeft), false); break; case 7 : introMonster(2); break; - case 8 : repaint(pix->draw(16, 22, RoomPix, i18n("-BASHFUL"), CYAN, TQColor(), AlignLeft), FALSE); + case 8 : repaint(pix->draw(16, 22, RoomPix, i18n("-BASHFUL"), CYAN, TQColor(), AlignLeft), false); break; - case 9 : repaint(pix->draw(38, 22, RoomPix, i18n("\"INKY\""), CYAN, TQColor(), AlignLeft), FALSE); + case 9 : repaint(pix->draw(38, 22, RoomPix, i18n("\"INKY\""), CYAN, TQColor(), AlignLeft), false); break; case 10 : introMonster(3); break; - case 11 : repaint(pix->draw(16, 28, RoomPix, i18n("-POKEY"), ORANGE, TQColor(), AlignLeft), FALSE); + case 11 : repaint(pix->draw(16, 28, RoomPix, i18n("-POKEY"), ORANGE, TQColor(), AlignLeft), false); break; - case 12 : repaint(pix->draw(38, 28, RoomPix, i18n("\"CLYDE\""), ORANGE, TQColor(), AlignLeft), FALSE); + case 12 : repaint(pix->draw(38, 28, RoomPix, i18n("\"CLYDE\""), ORANGE, TQColor(), AlignLeft), false); break; case 13 : pts.sprintf("%d", pointScore); - repaint(pix->draw(28, 44, RoomPix, pts, WHITE, TQColor(), AlignRight), FALSE); - repaint(pix->draw(31, 44, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), FALSE); + repaint(pix->draw(28, 44, RoomPix, pts, WHITE, TQColor(), AlignRight), false); + repaint(pix->draw(31, 44, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), false); pts.sprintf("%d", energizerScore); - repaint(pix->draw(28, 48, RoomPix, pts, WHITE, TQColor(), AlignRight), FALSE); - repaint(pix->draw(31, 48, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), FALSE); + repaint(pix->draw(28, 48, RoomPix, pts, WHITE, TQColor(), AlignRight), false); + repaint(pix->draw(31, 48, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), false); break; case 14 : // "@ 1980 MIDWAY MFG.CO." - repaint(pix->draw(30, 58, RoomPix, "© 1998-2003 J.THÖNNISSEN", PINK), FALSE); + repaint(pix->draw(30, 58, RoomPix, "© 1998-2003 J.THÖNNISSEN", PINK), false); break; } } @@ -960,14 +960,14 @@ void Referee::introPlay() switch (timerCount) { case 13 : board->set(44*BoardWidth+22, Point); pix->drawPoint(44*BoardWidth+22); - repaint(pix->rect(44*BoardWidth+22, PointPix), FALSE); + repaint(pix->rect(44*BoardWidth+22, PointPix), false); energizers->at(0)->setPosition(48*BoardWidth+22); energizers->at(0)->setOn(); - repaint(pix->rect(48*BoardWidth+22, EnergizerPix), FALSE); + repaint(pix->rect(48*BoardWidth+22, EnergizerPix), false); break; case 14 : energizers->at(1)->setPosition(36*BoardWidth+10); energizers->at(1)->setOn(); - repaint(pix->rect(36*BoardWidth+10, EnergizerPix), FALSE); + repaint(pix->rect(36*BoardWidth+10, EnergizerPix), false); for (int pos = 8; pos < BoardWidth; pos++) { board->set(34*BoardWidth+pos, out); board->set(38*BoardWidth+pos, out); @@ -976,7 +976,7 @@ void Referee::introPlay() break; case 15 : gameState.clearBit(Init); initPacman(); - pacman->setDemo(TRUE); + pacman->setDemo(true); pacman->setPosition(37*BoardWidth-1); repaintFigures(); start(); @@ -1000,7 +1000,7 @@ void Referee::demo() stop(); stopEnergizer(); - gameState.fill(FALSE); + gameState.fill(false); gameState.setBit(Init); gameState.setBit(Demonstration); @@ -1028,7 +1028,7 @@ void Referee::play() stop(); stopEnergizer(); - gameState.fill(FALSE); + gameState.fill(false); gameState.setBit(Init); gameState.setBit(Playing); gameState.setBit(Player); @@ -1057,8 +1057,8 @@ void Referee::play() emit setLevel(level); emit setPoints(points); - repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), FALSE); - repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); + repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), false); + repaint(pix->rect(board->position(fruithome), i18n("READY!")), false); timerCount = 0; TQTimer::singleShot(playerDurMS, this, TQ_SLOT(ready())); @@ -1075,7 +1075,7 @@ void Referee::ready() emit setLifes(--lifes); gameState.clearBit(Player); gameState.clearBit(Init); - repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), FALSE); + repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), false); repaintFigures(); TQTimer::singleShot(playerDurMS, this, TQ_SLOT(ready())); return; @@ -1083,12 +1083,12 @@ void Referee::ready() if (gameState.testBit(Ready)) { gameState.clearBit(Ready); - repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); + repaint(pix->rect(board->position(fruithome), i18n("READY!")), false); start(); } else { gameState.setBit(Ready); gameState.clearBit(Init); - repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); + repaint(pix->rect(board->position(fruithome), i18n("READY!")), false); TQTimer::singleShot(readyDurMS, this, TQ_SLOT(ready())); } } @@ -1208,7 +1208,7 @@ void Referee::killed() if (!gameState.testBit(Dying)) { gameState.setBit(Dying); - pacman->setDirection(X, TRUE); + pacman->setDirection(X, true); for (Monster *m = monsters->first(); m != 0; m = monsters->next()) if (m) m->setDirection(X); @@ -1239,7 +1239,7 @@ void Referee::killedPlay() } if (timerCount <= pix->maxPixmaps(DyingPix)) { - repaint(pix->rect(pacman->position(), PacmanPix), FALSE); + repaint(pix->rect(pacman->position(), PacmanPix), false); if (timerCount >= pix->maxPixmaps(DyingPix)-1 || timerCount == 0) TQTimer::singleShot(dyingPostAnimationMS, this, TQ_SLOT(killedPlay())); else @@ -1253,9 +1253,9 @@ void Referee::killedPlay() gameState.clearBit(Playing); for (int e = 0; e < board->energizers(); e++) { energizers->at(e)->setOff(); - repaint(pix->rect(board->position(energizer, e), EnergizerPix), FALSE); + repaint(pix->rect(board->position(energizer, e), EnergizerPix), false); } - repaint(pix->rect(board->position(fruithome), i18n("GAME OVER")), FALSE); + repaint(pix->rect(board->position(fruithome), i18n("GAME OVER")), false); TQTimer::singleShot(gameOverDurMS, this, TQ_SLOT(hallOfFame())); } else { gameState.clearBit(Init); @@ -1275,7 +1275,7 @@ void Referee::initPacman() pacman->setMaxPixmaps(pix->maxPixmaps(PacmanPix)); pacman->setDemo(gameState.testBit(Demonstration)); pacman->setPosition(board->position(pacmanhome)); - pacman->setDirection(W, TRUE); + pacman->setDirection(W, true); pacman->setAlive(pacmanTicks[level]); } diff --git a/tdepacman/referee.h b/tdepacman/referee.h index b494d09..fbb6287 100644 --- a/tdepacman/referee.h +++ b/tdepacman/referee.h @@ -85,10 +85,10 @@ protected: void fillMapName(); void confScheme(); - void confLevels(bool defGroup=TRUE); - void confMisc(bool defGroup=TRUE); - void confTiming(bool defGroup=TRUE); - void confScoring(bool defGroup=TRUE); + void confLevels(bool defGroup=true); + void confMisc(bool defGroup=true); + void confTiming(bool defGroup=true); + void confScoring(bool defGroup=true); private: TQBitArray gameState; @@ -170,7 +170,7 @@ private: void initMonsters(); void initPacman(); - void initFruit(bool fullInitialization=TRUE); + void initFruit(bool fullInitialization=true); void initEnergizers(); void setOnEnergizers(); diff --git a/tdepacman/score.cpp b/tdepacman/score.cpp index 772a7d9..1bdd3f5 100644 --- a/tdepacman/score.cpp +++ b/tdepacman/score.cpp @@ -21,7 +21,7 @@ Score::Score(TQWidget *parent, const char *name, int Scheme, int Mode, Bitfont * { setFocusPolicy(TQWidget::StrongFocus); - paused = FALSE; + paused = false; lastScore = -1; lastPlayer = -1; @@ -30,7 +30,7 @@ Score::Score(TQWidget *parent, const char *name, int Scheme, int Mode, Bitfont * cursorBlinkMS = -1; cursor.x = -1; cursor.y = -1; - cursor.on = FALSE; + cursor.on = false; cursor.chr = TQChar('?'); initKeys(); @@ -160,14 +160,14 @@ void Score::timerEvent(TQTimerEvent *e) return; if (cursor.x != -1 && cursor.y != -1) - repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), FALSE); - scrollRepeat = FALSE; + repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), false); + scrollRepeat = false; if (lastPlayer == 0) - repaint(rect(1, 0, i18n(" 1UP ")), FALSE); + repaint(rect(1, 0, i18n(" 1UP ")), false); if (lastPlayer == 1) - repaint(rect(21, 0, i18n(" 2UP ")), FALSE); + repaint(rect(21, 0, i18n(" 2UP ")), false); } void Score::keyPressEvent(TQKeyEvent *k) @@ -236,15 +236,15 @@ void Score::keyPressEvent(TQKeyEvent *k) if (x != cursor.x || y != cursor.y) { if (cursor.x != -1) cursor.chr = hallOfFame[lastScore].name.at(cursor.x-14); - scrollRepeat = FALSE; - repaint(rect(x, y*1.25, cursor.chr), FALSE); + scrollRepeat = false; + repaint(rect(x, y*1.25, cursor.chr), false); } else hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr; if (key == UpKey || key == Key_Up || key == DownKey || key == Key_Down) - scrollRepeat = TRUE; + scrollRepeat = true; else - repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), FALSE); + repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), false); } void Score::initKeys() @@ -304,14 +304,14 @@ void Score::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confTiming(FALSE); + confTiming(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confTiming(FALSE); + confTiming(false); } if (cursorBlinkMS != oldCursorBlinkMS) { @@ -365,12 +365,12 @@ void Score::set(int score, int player) TQString s; s.sprintf("%6d0", playerScore[lastPlayer]/10); - repaint(rect(0, 1, s), FALSE); + repaint(rect(0, 1, s), false); if (score > HighScore) { HighScore = score; s.sprintf("%8d0", HighScore/10); - repaint(rect(8, 1, s), FALSE); + repaint(rect(8, 1, s), false); } } @@ -505,10 +505,10 @@ void Score::setPause(bool Paused) TQRect r = bitfont->rect(i18n("PAUSED")); r.moveCenter(TQPoint(this->width()/2, this->height()/2)); - repaint(r, TRUE); + repaint(r, true); // repaint 1UP or 2UP - repaint(FALSE); + repaint(false); } void Score::end() @@ -519,7 +519,7 @@ void Score::end() } // repaint 1UP or 2UP - repaint(FALSE); + repaint(false); // if lastPlayer != -1 we're already in playing mode if (lastPlayer == -1) diff --git a/tdepacman/score.h b/tdepacman/score.h index 031a242..8fc5ed5 100644 --- a/tdepacman/score.h +++ b/tdepacman/score.h @@ -57,7 +57,7 @@ protected: void focusOutEvent(TQFocusEvent *) { ; } void confScheme(); - void confTiming(bool defGroup=TRUE); + void confTiming(bool defGroup=true); private: Bitfont *bitfont; diff --git a/tdepacman/status.cpp b/tdepacman/status.cpp index e2f424c..4c5441e 100644 --- a/tdepacman/status.cpp +++ b/tdepacman/status.cpp @@ -30,7 +30,7 @@ TQPtrList<TQPixmap> *Status::loadPixmap(TQWidget *parent, TQString pixmapName, { if (pixmaps == NULL) { pixmaps = new TQPtrList<TQPixmap>; - pixmaps->setAutoDelete(TRUE); + pixmaps->setAutoDelete(true); } if (!pixmaps->isEmpty()) @@ -58,8 +58,8 @@ TQPtrList<TQPixmap> *Status::loadPixmap(TQWidget *parent, TQString pixmapName, for (int x = 0; x < PIXMAP.width()/width; x++) { TQPixmap *pixmap = new TQPixmap(width, height); pixmaps->append(pixmap); - bitBlt(pixmap, 0, 0, &PIXMAP, x*width, 0, width, height, CopyROP, TRUE); - bitBlt(&MASK, 0, 0, &BITMAP, x*width, 0, width, height, CopyROP, TRUE); + bitBlt(pixmap, 0, 0, &PIXMAP, x*width, 0, width, height, CopyROP, true); + bitBlt(&MASK, 0, 0, &BITMAP, x*width, 0, width, height, CopyROP, true); pixmap->setMask(MASK); } @@ -123,7 +123,7 @@ TQString Status::decodeHexOctString(TQString s) value = s.mid(pos+leadin, 3); ptr = value.latin1(); - while (*ptr != '\0' && (v = valids.find(*ptr++, 0, FALSE)) != -1) { + while (*ptr != '\0' && (v = valids.find(*ptr++, 0, false)) != -1) { c = (c * valids.length()) + v; len++; } @@ -262,14 +262,14 @@ void Status::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confLevels(FALSE); + confLevels(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confLevels(FALSE); + confLevels(false); } kapp->config()->setGroup(oldgroup); @@ -280,14 +280,14 @@ void Status::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confMisc(FALSE); + confMisc(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confMisc(FALSE); + confMisc(false); } fillPixmapName(lifesPixmapName); diff --git a/tdepacman/status.h b/tdepacman/status.h index 90536ca..09a7cc1 100644 --- a/tdepacman/status.h +++ b/tdepacman/status.h @@ -40,8 +40,8 @@ protected: void fillPixmapName(TQStrList &); void confScheme(); - void confLevels(bool defGroup=TRUE); - void confMisc(bool defGroup=TRUE); + void confLevels(bool defGroup=true); + void confMisc(bool defGroup=true); void initPixmaps(); diff --git a/tdepacman/tdepacmanview.cpp b/tdepacman/tdepacmanview.cpp index 45e5040..761cdf7 100644 --- a/tdepacman/tdepacmanview.cpp +++ b/tdepacman/tdepacmanview.cpp @@ -98,14 +98,14 @@ void TDEpacmanView::confScheme() newgroup.sprintf("Mode %d", mode); kapp->config()->setGroup(newgroup); - confMisc(FALSE); + confMisc(false); } if (scheme != -1) { newgroup.sprintf("Scheme %d", scheme); kapp->config()->setGroup(newgroup); - confMisc(FALSE); + confMisc(false); } if (lastFontName != fontName) { @@ -142,9 +142,9 @@ void TDEpacmanView::setScheme(int Scheme, int Mode) bitfont->height()*3 + referee->height() + status->height()); updateGeometry(); - score->repaint(FALSE); - referee->repaint(FALSE); - status->repaint(FALSE); + score->repaint(false); + referee->repaint(false); + status->repaint(false); } void TDEpacmanView::resizeEvent( TQResizeEvent * ) diff --git a/tdepacman/tdepacmanview.h b/tdepacman/tdepacmanview.h index 4a0dc10..3b3930b 100644 --- a/tdepacman/tdepacmanview.h +++ b/tdepacman/tdepacmanview.h @@ -51,7 +51,7 @@ public: protected: void confScheme(); - void confMisc(bool defGroup=TRUE); + void confMisc(bool defGroup=true); void resizeEvent( TQResizeEvent * ); private: |