diff options
| author | manuel <manuel@mausz.at> | 2011-04-19 22:37:26 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-04-19 22:37:26 +0200 |
| commit | 9e9bc7cd492bf6f897bc26818674a3919431fb99 (patch) | |
| tree | 0e212a18abf1fae8a2a46129c2d6813d63218f55 /pacman-c++/sceneholder.cpp | |
| parent | 9ac2b59da5a900c000e2bdd52d72c5c874f75fbb (diff) | |
| parent | 2d7ef3fd487e9c9f05cadd42ca6916487f391b79 (diff) | |
| download | foop-9e9bc7cd492bf6f897bc26818674a3919431fb99.tar.gz foop-9e9bc7cd492bf6f897bc26818674a3919431fb99.tar.bz2 foop-9e9bc7cd492bf6f897bc26818674a3919431fb99.zip | |
Merge branch 'master' of ssh://manuel.mausz.at/foop
Conflicts:
pacman-c++/server.cpp
Diffstat (limited to 'pacman-c++/sceneholder.cpp')
| -rw-r--r-- | pacman-c++/sceneholder.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp index 3f92860..03abf7f 100644 --- a/pacman-c++/sceneholder.cpp +++ b/pacman-c++/sceneholder.cpp | |||
| @@ -57,9 +57,8 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x | |||
| 57 | { | 57 | { |
| 58 | GameEntity *oldItem = visualMap[x][y]; | 58 | GameEntity *oldItem = visualMap[x][y]; |
| 59 | /* special handling for purging field | 59 | /* special handling for purging field |
| 60 | * remove elements (in case it's not an actor) | ||
| 61 | */ | 60 | */ |
| 62 | if (oldItem != NULL && qgraphicsitem_cast<Actor *>(oldItem) == NULL) | 61 | if (oldItem != NULL) |
| 63 | { | 62 | { |
| 64 | visualMap[x][y] = NULL; | 63 | visualMap[x][y] = NULL; |
| 65 | Actor *actor = NULL; | 64 | Actor *actor = NULL; |
