author | imm <imm> | 2002-09-22 18:30:29 (UTC) |
---|---|---|
committer | imm <imm> | 2002-09-22 18:30:29 (UTC) |
commit | 4904161b6b043e1397db4affd7930fd999ff742e (patch) (unidiff) | |
tree | bb46b289fb71af969cf48810c1795ad023252bf9 | |
parent | f8aeb3c2e6b32600329ebbaeb0b4b7a2f371eca2 (diff) | |
download | opie-4904161b6b043e1397db4affd7930fd999ff742e.zip opie-4904161b6b043e1397db4affd7930fd999ff742e.tar.gz opie-4904161b6b043e1397db4affd7930fd999ff742e.tar.bz2 |
better ?
-rw-r--r-- | noncore/games/kpacman/referee.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp index 81f331b..6d8f3fb 100644 --- a/noncore/games/kpacman/referee.cpp +++ b/noncore/games/kpacman/referee.cpp | |||
@@ -697,81 +697,67 @@ void Referee::confScheme() | |||
697 | 697 | ||
698 | void Referee::setScheme(int Scheme, int Mode, Bitfont *font) | 698 | void Referee::setScheme(int Scheme, int Mode, Bitfont *font) |
699 | { | 699 | { |
700 | mode = Mode; | 700 | mode = Mode; |
701 | scheme = Scheme; | 701 | scheme = Scheme; |
702 | 702 | ||
703 | confScheme(); | 703 | confScheme(); |
704 | 704 | ||
705 | pix->setScheme(scheme, mode, font); | 705 | pix->setScheme(scheme, mode, font); |
706 | 706 | ||
707 | pacman->setMaxPixmaps(pix->maxPixmaps(PacmanPix)); | 707 | pacman->setMaxPixmaps(pix->maxPixmaps(PacmanPix)); |
708 | fruit->setMaxPixmaps(pix->maxPixmaps(FruitPix)); | 708 | fruit->setMaxPixmaps(pix->maxPixmaps(FruitPix)); |
709 | 709 | ||
710 | for (Monster *m = monsters->first(); m != 0; m = monsters->next()) | 710 | for (Monster *m = monsters->first(); m != 0; m = monsters->next()) |
711 | if (m) | 711 | if (m) |
712 | m->setMaxPixmaps(pix->maxPixmaps(MonsterPix), pix->maxPixmaps(EyesPix)); | 712 | m->setMaxPixmaps(pix->maxPixmaps(MonsterPix), pix->maxPixmaps(EyesPix)); |
713 | 713 | ||
714 | for (Energizer *e = energizers->first(); e != 0; e = energizers->next()) | 714 | for (Energizer *e = energizers->first(); e != 0; e = energizers->next()) |
715 | if (e) | 715 | if (e) |
716 | e->setMaxPixmaps(pix->maxPixmaps(EnergizerPix)); | 716 | e->setMaxPixmaps(pix->maxPixmaps(EnergizerPix)); |
717 | 717 | ||
718 | if (gameState.testBit(Introducing)) | 718 | if (gameState.testBit(Introducing)) |
719 | for (int i = 0; i < (gameState.testBit(Init) ? timerCount : 15); i++) | 719 | for (int i = 0; i < (gameState.testBit(Init) ? timerCount : 15); i++) |
720 | introPaint(i); | 720 | introPaint(i); |
721 | 721 | ||
722 | setFixedSize(pix->levelPix().size()); | 722 | setFixedSize(pix->levelPix().size()); |
723 | repaint(); | 723 | repaint(); |
724 | } | 724 | } |
725 | 725 | ||
726 | void Referee::keyPressEvent( QKeyEvent *k ) | 726 | void Referee::keyPressEvent( QKeyEvent *k ) |
727 | { | 727 | { |
728 | uint key = k->key(); | 728 | uint key = k->key(); |
729 | #ifdef QWS | 729 | |
730 | // "OK" => new game | 730 | if ( !gameState.testBit(Playing) && ( key == Key_Up || key == Key_Down || key == Key_Left || key == Key_Right ) ) |
731 | if ( key == Key_F33 || key == Key_F2 || key == Key_Enter ) | ||
732 | play(); | ||
733 | else if ( !gameState.testBit(Playing) && | ||
734 | ( key == Key_Up || | ||
735 | key == Key_Down || | ||
736 | key == Key_Right || | ||
737 | key == Key_Left )) | ||
738 | play(); | 731 | play(); |
739 | // "Space" => pause | ||
740 | //else if ( key == Key_Space || key == Key_F3 ) | ||
741 | // pause(); | ||
742 | // "Menu" => hall of fame | ||
743 | //else if ( key == Key_F11 || key == Key_F4 ) | ||
744 | // toggleHallOfFame(); | ||
745 | #endif | ||
746 | 732 | ||
747 | if (gameState.testBit(Paused) || gameState.testBit(HallOfFame) || | 733 | if (gameState.testBit(Paused) || gameState.testBit(HallOfFame) || |
748 | gameState.testBit(Demonstration) || gameState.testBit(Dying) || | 734 | gameState.testBit(Demonstration) || gameState.testBit(Dying) || |
749 | gameState.testBit(Ready) || gameState.testBit(LevelDone) || | 735 | gameState.testBit(Ready) || gameState.testBit(LevelDone) || |
750 | !gameState.testBit(Playing)) | 736 | !gameState.testBit(Playing)) |
751 | return; | 737 | return; |
752 | 738 | ||
753 | if (key == UpKey) | 739 | if (key == UpKey) |
754 | pacman->setDirection(N); | 740 | pacman->setDirection(N); |
755 | else if (key == DownKey) | 741 | else if (key == DownKey) |
756 | pacman->setDirection(S); | 742 | pacman->setDirection(S); |
757 | else if (key == RightKey) | 743 | else if (key == RightKey) |
758 | pacman->setDirection(E); | 744 | pacman->setDirection(E); |
759 | else if (key == LeftKey) | 745 | else if (key == LeftKey) |
760 | pacman->setDirection(W); | 746 | pacman->setDirection(W); |
761 | 747 | ||
762 | #ifdef CHEATS | 748 | #ifdef CHEATS |
763 | else if (key == Key_L) { printf("levelUp()\n"); levelUp(); } | 749 | else if (key == Key_L) { printf("levelUp()\n"); levelUp(); } |
764 | else if (key == Key_F) { printf("fruit->move(TRUE)\n"); fruit->move(TRUE); repaint(FALSE); } | 750 | else if (key == Key_F) { printf("fruit->move(TRUE)\n"); fruit->move(TRUE); repaint(FALSE); } |
765 | else if (key == Key_E) { printf("setLifes(++lifes)\n"); emit setLifes(++lifes); } | 751 | else if (key == Key_E) { printf("setLifes(++lifes)\n"); emit setLifes(++lifes); } |
766 | #endif | 752 | #endif |
767 | 753 | ||
768 | else { | 754 | else { |
769 | k->ignore(); | 755 | k->ignore(); |
770 | return; | 756 | return; |
771 | } | 757 | } |
772 | k->accept(); | 758 | k->accept(); |
773 | } | 759 | } |
774 | 760 | ||
775 | void Referee::score(int p) | 761 | void Referee::score(int p) |
776 | { | 762 | { |
777 | if (!gameState.testBit(Playing)) | 763 | if (!gameState.testBit(Playing)) |