numerous problems

1 files changed, 4 insertions, 15 deletions

diff --git a/gaunt01/src/trapdoor.h b/gaunt01/src/trapdoor.h
index 6f8b509..7259d09 100644
--- a/gaunt01/src/trapdoor.h
+++ b/gaunt01/src/trapdoor.h
@@ -18,15 +18,13 @@ creaking sound player
 class trapdoor
 {
 	public:
-		trapdoor(ofVec2f _boundTR=ofVec2f(0,0),ofVec2f _boundBR=ofVec2f(0,0),ofVec2f _doorSize=ofVec2f(10,10));
+		trapdoor(ofVec2f pos=ofVec2f(0,0),float _doorSize=10);
 		virtual ~trapdoor();
 
 		bool checkUpdate(map<int,player>& players);
 		void draw();
 		void drawSplash(float angle);
 		void drawDebug();
-		void start();
-		void startPos(ofVec2f pos);
 
 		vector<ofVec2f> getCorners();
 		ofVec2f bounds2UV(ofVec2f pt);
@@ -36,22 +34,17 @@ class trapdoor
 		ofRectangle getInnerRect();
 		void trigger();
 		float getoffset();
-
 		float getFalldist();
 	
 		ofImage* splashFrames; //temp public
+		bool active;
 	protected:
 	private:
 		morphmesh surround;
 		morphmesh lid;
 
 		ofVec2f position;
-		ofVec2f boundTR;
-		ofVec2f boundBR;
-		ofVec2f size;
-
-		float startTime;
-		float triggerTime; //time threshold
+		float size;
 
 		ofRectangle boundingRect;
 		ofVec2f doorSize;
@@ -61,14 +54,10 @@ class trapdoor
 
 		ofImage texture;
 
-		ofSoundPlayer*  sounds;
-		
-
-		bool opening;
-
 		float triggeredTime;
 		vector<player*> caught;
 		vector<float> caughtTime;
+	
 
 };