From 8e22cdc4203dc04e7fdfdd607f27c6b2a61f458b Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Fri, 22 Jun 2012 17:10:17 +0100
Subject: usable version

---
 gaunt01/src/bird.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'gaunt01/src/bird.h')

diff --git a/gaunt01/src/bird.h b/gaunt01/src/bird.h
index fdaf915..ba8f2cd 100644
--- a/gaunt01/src/bird.h
+++ b/gaunt01/src/bird.h
@@ -70,9 +70,10 @@ class bird
         int state;
         morphmesh model;
 
+	ofPlane* bounds;
+	ofVec2f centre;
 	ofRay pointer;
 	ofVec3f position;
-	ofVec2f centrePoint; //2d coords of centre of screen
 
 	ofVec3f edgepoint; //point where the bird will hit the edge of the screen
 	float edgelength,edgeangle;
@@ -83,9 +84,6 @@ class bird
 	vector<float> playdist;
 	vector<ofVec3f> playpos;
 
-	ofPlane* bounds;
-	ofVec2f centre;
-
 	bool leaving;
 	float centrehead;
 	
@@ -109,7 +107,7 @@ class bird
         float lastTime;
 
 	ofSoundPlayer*  aggressives;
-	ofSoundPlayer*  chirps;
+	ofSoundPlayer*  whistles;
 	ofSoundPlayer*  rattles;
         ofImage texture;
 
-- 
cgit v1.2.3