diff options
author | Pushkar Joshi | 2012-03-16 11:52:13 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-16 11:52:13 -0700 |
commit | 1da989027e46102a9dc2aa2b5d764f58b97aa31b (patch) | |
tree | 496b8c7952c01b2caae76dda901b4173eedb11d2 /js/helper-classes/RDGE/src/core/script/run_state.js | |
parent | e574f722864a246bad40d3f5a4e59f7ccb206ea9 (diff) | |
parent | 3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff) | |
download | ninja-1da989027e46102a9dc2aa2b5d764f58b97aa31b.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/run_state.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/run_state.js | 16 |
1 files changed, 8 insertions, 8 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 acdb6797..a5981caa 100755 --- a/js/helper-classes/RDGE/src/core/script/run_state.js +++ b/js/helper-classes/RDGE/src/core/script/run_state.js | |||
@@ -30,9 +30,9 @@ RunState.prototype.Init = function() | |||
30 | this.userRunState.init(); | 30 | this.userRunState.init(); |
31 | } | 31 | } |
32 | 32 | ||
33 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) | 33 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) |
34 | this.userRunState.onRunState(); | 34 | this.userRunState.onRunState(); |
35 | 35 | ||
36 | 36 | ||
37 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | 37 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
38 | 38 | ||
@@ -97,11 +97,11 @@ RunState.prototype.ReInit = function() | |||
97 | if(!this.initialized) | 97 | if(!this.initialized) |
98 | { | 98 | { |
99 | this.Init(); | 99 | this.Init(); |
100 | } | 100 | } |
101 | else | 101 | else |
102 | { | 102 | { |
103 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) | 103 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) |
104 | this.userRunState.onRunState(); | 104 | this.userRunState.onRunState(); |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||