test remove pre/post update

src/org/flixel/FlxBasic.hx

@@ -99,24 +99,11 @@ class FlxBasic
 		#end
 	}
 
-	/**
-	 * Pre-update is called right before <code>update()</code> on each object in the game loop.
-	 */
-	public function preUpdate():Void
-	{
-		_ACTIVECOUNT++;
-	}
-
 	/**
 	 * Override this function to update your class's position and appearance.
 	 * This is where most of your game rules and behavioral code will go.
 	 */
-	public function update():Void { }
-
-	/**
-	 * Post-update is called right after <code>update()</code> on each object in the game loop.
-	 */
-	public function postUpdate():Void { }
+	public function update():Void { _ACTIVECOUNT++; }
 
 	/**
 	 * Override this function to control how the object is drawn.

src/org/flixel/FlxButton.hx

@@ -192,15 +192,12 @@ class FlxTypedButton<T:FlxSprite> extends FlxSprite
 		super.destroy();
 	}
 
+
 	/**
-	 * Since button uses its own mouse handler for thread reasons,
-	 * we run a little pre-check here to make sure that we only add
-	 * the mouse handler when it is actually safe to do so.
+	 * Called by the game loop automatically, handles mouseover and click detection.
 	 */
-	override public function preUpdate():Void
+	override public function update():Void
 	{
-		super.preUpdate();
-
 		if (!_initialized)
 		{
 			if (FlxG.stage != null)
@@ -214,13 +211,10 @@ class FlxTypedButton<T:FlxSprite> extends FlxSprite
 				_initialized = true;
 			}
 		}
-	}
+
+		super.update();
+
 
-	/**
-	 * Called by the game loop automatically, handles mouseover and click detection.
-	 */
-	override public function update():Void
-	{
 		updateButton(); //Basic button logic
 
 		//Default button appearance is to simply update

src/org/flixel/FlxG.hx

@@ -1877,4 +1877,4 @@ class FlxG
 		return tween;
 	}
 
-}
+}

src/org/flixel/FlxObject.hx

@@ -354,8 +354,23 @@ class FlxObject extends FlxBasic
 	 * tracking the last coordinates for collision purposes,
 	 * and checking if the object is moving along a path or not.
 	 */
-	override public function preUpdate():Void
+	//override public function preUpdate():Void
+	//{
+	//
+	//}
+
+	/**
+	 * Post-update is called right after <code>update()</code> on each object in the game loop.
+	 * In <code>FlxObject</code> this function handles integrating the objects motion
+	 * based on the velocity and acceleration settings, and tracking/clearing the <code>touching</code> flags.
+	 */
+	override public function update():Void
 	{
+
+
+
+		super.update();
+
 		FlxBasic._ACTIVECOUNT++;
 
 		if(_flickerTimer > 0)
@@ -375,22 +390,19 @@ class FlxObject extends FlxBasic
 		{
 			updatePathMotion();
 		}
-	}
-
-	/**
-	 * Post-update is called right after <code>update()</code> on each object in the game loop.
-	 * In <code>FlxObject</code> this function handles integrating the objects motion
-	 * based on the velocity and acceleration settings, and tracking/clearing the <code>touching</code> flags.
-	 */
-	override public function postUpdate():Void
-	{
+
+
+		super.update();
+
 		if (moves)
 		{
 			updateMotion();
 		}
 
 		wasTouching = touching;
 		touching = NONE;
+
+
 	}
 
 	/**

src/org/flixel/FlxParticle.hx

@@ -90,6 +90,8 @@ class FlxParticle extends FlxSprite
 				drag.x = 0;
 			}
 		}
+
+		super.update();
 	}
 
 	/**

src/org/flixel/FlxSprite.hx

@@ -621,9 +621,9 @@ class FlxSprite extends FlxObject
 	 * Automatically called after update() by the game loop,
 	 * this function just calls updateAnimation().
 	 */
-	override public function postUpdate():Void
+	override public function update():Void
 	{
-		super.postUpdate();
+		super.update();
 		updateAnimation();
 	}
 

src/org/flixel/FlxState.hx

@@ -233,15 +233,4 @@ class FlxState extends FlxGroup
 	{
 
 	}
-
-	/**
-	 * This function is inlined because it never gets called on FlxState objects.
-	 * Put your code in the update() function.
-	 */
-	override public inline function preUpdate():Void {}
-	/**
-	 * This function is inlined because it never gets called on FlxState objects.
-	 * Put your code in the update() function.
-	 */
-	override public inline function postUpdate():Void {}
 }

src/org/flixel/FlxTypedGroup.hx

@@ -91,7 +91,7 @@ class FlxTypedGroup<T:FlxBasic> extends FlxBasic
 	/**
 	 * Just making sure we don't increment the active objects count.
 	 */
-	override public function preUpdate():Void { }
+	//override public function preUpdate():Void { }
 
 	/**
 	 * Automatically goes through and calls update on everything you added.
@@ -105,15 +105,15 @@ class FlxTypedGroup<T:FlxBasic> extends FlxBasic
 			basic = members[i++];
 			if ((basic != null) && basic.exists && basic.active)
 			{
-				basic.preUpdate();
+
 				basic.update();
 
 				if (basic.hasTween) 
 				{
 					basic.updateTweens();
 				}
 
-				basic.postUpdate();
+
 			}
 		}