From 6ca702032d6844e211c67f18cf066e34fbbaf9d0 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Mon, 2 May 2011 19:14:55 +0200
Subject: fix animation zValue

---
 pacman-c++/actor.cpp  | 6 +++---
 pacman-c++/server.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pacman-c++')

diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp
index 472b05d..757003e 100644
--- a/pacman-c++/actor.cpp
+++ b/pacman-c++/actor.cpp
@@ -44,7 +44,6 @@ Actor::Actor(Color::Color color, bool local, QGraphicsItem *parent)
     int x = i * Constants::sprite_offset + Constants::sprite_margin;
     int y = Actor::None * Constants::sprite_offset + Constants::sprite_margin;
     img->setSprite(x, y, Constants::field_size.width, Constants::field_size.height);
-    img->setZValue(zValue());
     img->setVisible(false);
   }
 
@@ -58,6 +57,7 @@ Actor::Actor(Color::Color color, bool local, QGraphicsItem *parent)
   m_eating.append(setupEatingAnimation(Actor::Down));
 
   /* dieing animation */
+  qWarning() << "color=" << Util::colorToString(m_color) << "zValue=" << zValue() << "dieing.z=" << 100 - m_color;
   m_dieing = new QSequentialAnimationGroup(this);
   for (int i = 0; i < 11; i++)
   {
@@ -66,7 +66,6 @@ Actor::Actor(Color::Color color, bool local, QGraphicsItem *parent)
     int x = i * Constants::sprite_offset + Constants::sprite_margin;
     int y = 5 * Constants::sprite_offset + Constants::sprite_margin;
     img->setSprite(x, y, Constants::field_size.width, Constants::field_size.height);
-    img->setZValue(zValue() * 10);
     img->setVisible(false);
 
     QPropertyAnimation *fadein = new QPropertyAnimation(img, "visible", m_dieing);
@@ -99,7 +98,6 @@ QSequentialAnimationGroup *Actor::setupEatingAnimation(Actor::Movement direction
     int x = i * Constants::sprite_offset + Constants::sprite_margin;
     int y = direction * Constants::sprite_offset + Constants::sprite_margin;
     img->setSprite(x, y, Constants::field_size.width, Constants::field_size.height);
-    img->setZValue(zValue());
     img->setVisible(false);
 
     QPropertyAnimation *fadein = new QPropertyAnimation(img, "visible", eating);
@@ -160,6 +158,7 @@ void Actor::reset()
 
   stopEating();
   m_moving->stop();
+  setZValue(m_color * 10);
   m_dieing->stop();
   /* hide all pictures */
   for (int i = 0; i < m_images.size(); ++i)
@@ -290,6 +289,7 @@ void Actor::die()
 
   reset();
   m_images[m_direction]->setVisible(false);
+  setZValue(zValue() * 10);
   m_dieing->start();
   if (m_local)
     AudioManager::self()->play(Sound::Die);
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index a7ff89a..caf2fa5 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -254,7 +254,7 @@ invalid_direction:
       }
     }
     if (found.count() > 1)
-      qCritical() << "[Collision] found" << found << "fields with color=" << col;
+      qCritical() << "[Collision] found" << found.count() << "fields with color=" << col;
   }
 #endif
 
-- 
cgit v1.2.3