From 6b8307251989bc528ca2e6d415a95985ca7aa902 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 17 May 2016 12:11:47 -0700 Subject: [PATCH] Fix application.preloader reference --- lime/app/Application.hx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lime/app/Application.hx b/lime/app/Application.hx index 5bab19c98..6e7587d63 100644 --- a/lime/app/Application.hx +++ b/lime/app/Application.hx @@ -28,7 +28,7 @@ class Application extends Module { public var config (default, null):Config; public var frameRate (get, set):Float; public var modules (default, null):Array; - public var preloader (default, null):Preloader; + public var preloader (get, null):Preloader; /** * Update events are dispatched each frame (usually just before rendering) @@ -93,7 +93,7 @@ class Application extends Module { } - module.setPreloader (preloader); + module.setPreloader (__preloader); } @@ -151,13 +151,13 @@ class Application extends Module { } - if (preloader == null || preloader.complete) { + if (__preloader == null || __preloader.complete) { - setPreloader (preloader); + setPreloader (__preloader); for (module in modules) { - setPreloader (preloader); + setPreloader (__preloader); } @@ -297,6 +297,13 @@ class Application extends Module { } + @:noCompletion private inline function get_preloader ():Preloader { + + return __preloader; + + } + + @:noCompletion private inline function get_renderer ():Renderer { return __renderers[0];