more little tweaks

AdamAtomic · May 1, 2011 · f5a3ff6 · f5a3ff6
1 parent 40ba84e
commit f5a3ff6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/org/flixel/FlxCamera.as b/org/flixel/FlxCamera.as
@@ -441,7 +441,7 @@ package org.flixel
  * @param OnComplete A function you want to run when the fade finishes.
  * @param Force Force the effect to reset.
  */
- public function fade(Color:uint=0xffffffff, Duration:Number=1, OnComplete:Function=null, Force:Boolean=false):void
+ public function fade(Color:uint=0xff000000, Duration:Number=1, OnComplete:Function=null, Force:Boolean=false):void
  {
  if(!Force && (_fxFadeAlpha > 0.0))
  return;

diff --git a/org/flixel/FlxG.as b/org/flixel/FlxG.as
@@ -38,7 +38,7 @@ package org.flixel
  * Assign a minor version to your library.
  * Appears after the decimal in the console.
  */
- static public var LIBRARY_MINOR_VERSION:uint = 51;
+ static public var LIBRARY_MINOR_VERSION:uint = 52;
 
  /**
  * Debugger overlay layout preset: Wide but low windows at the bottom of the screen.

diff --git a/org/flixel/system/input/Input.as b/org/flixel/system/input/Input.as
@@ -157,7 +157,7 @@ package org.flixel.system.input
  while(i < _total)
  {
  var o:Object = _map[i++];
- if((o != null) || (o.current > 0))
+ if((o != null) && (o.current > 0))
  return true;
  }
  return false;