# HG changeset patch
# User sheepluva
# Date 1319992313 -3600
# Node ID 27297c421bbcdf7031cd4b26385778867838f226
# Parent  e2c7771162aec6a84c45c62ee32bf9e17449e6f9
frontend flakes:
don't spawn flakes at locations that will cause them to never be within the visible frame

diff -r e2c7771162ae -r 27297c421bbc QTfrontend/ui/widget/bgwidget.cpp
--- a/QTfrontend/ui/widget/bgwidget.cpp	Sun Oct 30 15:31:30 2011 +0100
+++ b/QTfrontend/ui/widget/bgwidget.cpp	Sun Oct 30 17:31:53 2011 +0100
@@ -19,9 +19,10 @@
 
 #include "bgwidget.h"
 
-SpritePosition::SpritePosition(QWidget * parent, int sh)
+SpritePosition::SpritePosition(QWidget * parent, int sw, int sh)
 {
     wParent = parent;
+    iSpriteWidth = sw;
     iSpriteHeight = sh;
     reset();
 }
@@ -42,10 +43,26 @@
 
 void SpritePosition::reset()
 {
-    fY = -1 * iSpriteHeight;
-    fX = (qrand() % ((int)(wParent->width() * 1.5))) - wParent->width()/2;
+    // random movement values
     fYMov = ((qrand() % 400)+300) / 100.0f;
-    fXMov = fYMov * 0.2f+((qrand()%100)/100.0f * 0.6f); //so between 0.2 and 0.6, or 0.5 +/- 0.3
+    fXMov = fYMov * 0.2f+((qrand()%100)/100.0f * 0.6f); //so between 0.2 and 0.8, or 0.5 +/- 0.3
+
+    // random respawn locations
+    int tmp = fXMov * (wParent->height() / fYMov);
+    fX = (qrand() % (wParent->width() + tmp)) - tmp;
+
+    // adjust respawn location to be next to (but outside) the parent's limits
+    if (fX > -iSpriteWidth)
+    {
+        fY = -1 * iSpriteHeight;
+    }
+    else
+    {
+        fY = (-iSpriteWidth - fX) * (fYMov / fXMov);
+        fX = -iSpriteWidth;
+    }
+
+    // random initial angle
     iAngle = qrand() % 360;
 }
 
@@ -72,7 +89,7 @@
 
     setAutoFillBackground(false);
 
-    for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i] = new SpritePosition(this, sprite.height());
+    for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i] = new SpritePosition(this, sprite.width(), sprite.height());
 
     for (int i = 0; i < 90; i++)
     {
diff -r e2c7771162ae -r 27297c421bbc QTfrontend/ui/widget/bgwidget.h
--- a/QTfrontend/ui/widget/bgwidget.h	Sun Oct 30 15:31:30 2011 +0100
+++ b/QTfrontend/ui/widget/bgwidget.h	Sun Oct 30 17:31:53 2011 +0100
@@ -35,7 +35,7 @@
 class SpritePosition
 {
 public:
-    SpritePosition(QWidget * parent, int sh);
+    SpritePosition(QWidget * parent, int sw, int sh);
     ~SpritePosition();
 private:
     float fX;
@@ -45,6 +45,7 @@
     int iAngle;
     QWidget * wParent;
     int iSpriteHeight;
+    int iSpriteWidth;
 public:
     void move();
     void reset();