diff options
| author | manuel <manuel@mausz.at> | 2011-04-04 14:45:43 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-04-04 14:45:43 +0200 |
| commit | b310b66be264330e271f4929065cd61f0b0d8bf4 (patch) | |
| tree | 70545d73cc58ef7a441335fdc5d2f0f683ef6d49 /pacman-c++/actor.h | |
| parent | 471177aad38350840eed6452b1ad8723b61c330d (diff) | |
| parent | de2f8fbd228910b608e8dea5dc7c16d9f99495f8 (diff) | |
| download | foop-b310b66be264330e271f4929065cd61f0b0d8bf4.tar.gz foop-b310b66be264330e271f4929065cd61f0b0d8bf4.tar.bz2 foop-b310b66be264330e271f4929065cd61f0b0d8bf4.zip | |
Merge branch 'master' of ssh://manuel.mausz.at/foop
Conflicts:
pacman-c++/main.cpp
pacman-c++/pacman.qrc
Diffstat (limited to 'pacman-c++/actor.h')
| -rw-r--r-- | pacman-c++/actor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pacman-c++/actor.h b/pacman-c++/actor.h index 16a0c72..f5844bb 100644 --- a/pacman-c++/actor.h +++ b/pacman-c++/actor.h | |||
| @@ -18,7 +18,8 @@ public: | |||
| 18 | enum Type { | 18 | enum Type { |
| 19 | Player1 = 1, // red | 19 | Player1 = 1, // red |
| 20 | Player2, // blue | 20 | Player2, // blue |
| 21 | Player3, // yellow | 21 | Player3, // green |
| 22 | Player4, // yellow | ||
| 22 | }; | 23 | }; |
| 23 | 24 | ||
| 24 | Actor(Type type); | 25 | Actor(Type type); |