From: Wolfgang Becker <uafr@gmx.de>
Date: Sun, 14 May 2006 12:43:58 +0000 (+0000)
Subject: Prevent crash when tux dies while carrying iceblock.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7bbabd4064d99eaff49b7b7379cf23e705a56689;p=supertux.git

Prevent crash when tux dies while carrying iceblock.

SVN-Revision: 3517
---

diff --git a/src/object/player.cpp b/src/object/player.cpp
index de697975c..eefc7bb3f 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -190,7 +190,7 @@ Player::update(float elapsed_time)
 
   movement = physic.get_movement(elapsed_time);
 
-  if(grabbed_object != 0) {
+  if(grabbed_object != 0 && !dying ) {
     Vector pos = get_pos() + 
       Vector(dir == LEFT ? -16 : 16,
              bbox.get_height()*0.66666 - 32);