Funny how much bugs one can introduce when importing Qtopia stuff.

Fixed a couple of possible sigsegv, uninitialized variables

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,6 +1,6 @@
 /**********************************************************************
-** 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
@@ -23,5 +23,5 @@
 #include "codes.h"
 
-#include <qpe/resource.h>
+#include <qtopia/resource.h>
 
 #include <qregexp.h>
@@ -38,5 +38,6 @@ Helicopter::Helicopter(QCanvas* canvas) :
     QString h0 = Resource::findPixmap("parashoot/helicopter0001");
     h0.replace(QRegExp("0001"),"%1");
-    helicopterarray->readPixmaps(h0,3 );
+    helicopterarray->readPixmaps(h0,4 );
+
     setSequence(helicopterarray);
     setAnimated(true);
@@ -58,7 +59,16 @@ 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();
+	}
    }
 }
@@ -84,8 +94,4 @@ void Helicopter::done()
 {
     hits++;
-    if (hits >= 2) {
-        setAnimated(false);
-        delete this;
-    }
 }