Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool

1 files changed, 9 insertions, 1 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/run_state.js b/js/helper-classes/RDGE/src/core/script/run_state.js
index ad56d9ea..acdb6797 100644
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -30,6 +30,9 @@ RunState.prototype.Init = function()
                 this.userRunState.init();

         }

 

+        if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+                this.userRunState.onRunState();
+
 

         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 

@@ -94,6 +97,11 @@ RunState.prototype.ReInit = function()
         if(!this.initialized)

         {

                 this.Init();

+        }
+        else
+        {
+                if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+                        this.userRunState.onRunState();
         }

 }

 

@@ -117,7 +125,7 @@ RunState.prototype.Draw = function ()
         var width = this.renderer.vpWidth;

         var height = this.renderer.vpHeight;

         

-        this.renderer._clear();

+//      this.renderer._clear();

         

         this.userRunState.draw();