Skip to content

Small NextState corrections #3474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Small NextState corrections #3474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions flixel/util/typeLimit/NextState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import flixel.FlxState;
abstract NextState(Dynamic)
{
@:from
@:deprecated("use `MyState.new` or `()->new MyState()` instead of `new MyState()`)")
public static function fromState(state:FlxState):NextState
@:deprecated("use `MyState.new` or `()->new MyState()` instead of `new MyState()`")
public static inline function fromState(state:FlxState):NextState
{
return cast state;
}
Expand All @@ -51,8 +51,6 @@ abstract NextState(Dynamic)
{
if (this is FlxState)
return cast this;
else if (this is Class)
return Type.createInstance(this, []);
else
return cast this();
}
Expand All @@ -73,8 +71,8 @@ abstract NextState(Dynamic)

/**
* A utility type that allows methods to accept multiple types, when dealing with "future" `FlxStates`.
* Prior to haxeFlixel 6, the `FlxGame` constructor took a `FlxState` class which meant initial
* `FlxStates`could not have constructor args. In version 6.0.0 and higher, it now takes a function
* Prior to HaxeFlixel 6, the `FlxGame` constructor took a `FlxState` class which meant initial
* `FlxStates` could not have constructor args. In version 6.0.0 and higher, it now takes a function
* that returns a newly created instance.
*
* ## examples:
Expand Down Expand Up @@ -102,7 +100,8 @@ abstract NextState(Dynamic)
abstract InitialState(Dynamic) to NextState
{
@:from
public static function fromType(state:Class<FlxState>):InitialState
@:deprecated("use `MyState.new` or `()->new MyState()` instead of `MyState`")
public static inline function fromType(state:Class<FlxState>):InitialState
{
return cast state;
}
Expand Down