1 files changed, 17 insertions, 11 deletions

diff --git a/noncore/games/parashoot/helicopter.cpp b/noncore/games/parashoot/helicopter.cpp
index 0923124..036b21e 100644
--- a/noncore/games/parashoot/helicopter.cpp
+++ b/noncore/games/parashoot/helicopter.cpp
@@ -1,10 +1,10 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
@@ -19,13 +19,13 @@
 **********************************************************************/
 
 #include "helicopter.h"
 #include "man.h"
 #include "codes.h"
 
-#include <qpe/resource.h>
+#include <qtopia/resource.h>
 
 #include <qregexp.h>
 
 static QList<Helicopter> all;
 
 Helicopter::Helicopter(QCanvas* canvas) :
@@ -34,13 +34,14 @@ Helicopter::Helicopter(QCanvas* canvas) :
 {
     all.append(this);
     hits = 0;
     QCanvasPixmapArray* helicopterarray = new QCanvasPixmapArray();
     QString h0 = Resource::findPixmap("parashoot/helicopter0001");
     h0.replace(QRegExp("0001"),"%1");
-    helicopterarray->readPixmaps(h0,3 );
+    helicopterarray->readPixmaps(h0,4 );
+
     setSequence(helicopterarray);
     setAnimated(true);
     move(canvas->width(), 5);
     setVelocity(-2, 0);
     chikachika.playLoop();
     show();
@@ -54,15 +55,24 @@ Helicopter::~Helicopter()
 int fr = 0;
 
 void Helicopter::advance(int phase)
 {
    QCanvasSprite::advance(phase);
    if (phase == 0) {
-          setFrame(fr%3);
-          fr++;
-          checkCollision();
+        if (frame() == 3) {
+            delete this;
+            return;
+        }
+
+        if (hits >= 2) {
+            setFrame(3);
+        } else {
+            setFrame(fr%3);
+            fr++;
+            checkCollision();
+        }
    }
 }
 
 void Helicopter::checkCollision()
 {
     if (x() == 6) {
@@ -80,16 +90,12 @@ void Helicopter::dropman()
     takeOff();
 }
 
 void Helicopter::done()
 {
     hits++;
-    if (hits >= 2) {
-        setAnimated(false);
-        delete this;
-    }
 }
 
 void Helicopter::takeOff()
 {
     setVelocity(-1, 0);
 }