Merge pull request phaserjs#2151 from jaminscript/logic-fix

photonstorm · photonstorm · commit b3da35163a48 · 2016-02-01T19:16:02.000+02:00
Remove unnecessary variable
diff --git a/src/core/StateManager.js b/src/core/StateManager.js
@@ -431,20 +431,15 @@ Phaser.StateManager.prototype = {
 
         if (this.states[key])
         {
-            var valid = false;
-
             if (this.states[key]['preload'] || this.states[key]['create'] || this.states[key]['update'] || this.states[key]['render'])
             {
-                valid = true;
+                return true;
             }
-
-            if (valid === false)
+            else
             {
                 console.warn("Invalid Phaser State object given. Must contain at least a one of the required functions: preload, create, update or render");
                 return false;
             }
-
-            return true;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -431,20 +431,15 @@ Phaser.StateManager.prototype = {`
`431`	`431`
`432`	`432`	`if (this.states[key])`
`433`	`433`	`{`
`434`		`- var valid = false;`
`435`		`-`
`436`	`434`	`if (this.states[key]['preload'] \|\| this.states[key]['create'] \|\| this.states[key]['update'] \|\| this.states[key]['render'])`
`437`	`435`	`{`
`438`		`- valid = true;`
	`436`	`+ return true;`
`439`	`437`	`}`
`440`		`-`
`441`		`- if (valid === false)`
	`438`	`+ else`
`442`	`439`	`{`
`443`	`440`	`console.warn("Invalid Phaser State object given. Must contain at least a one of the required functions: preload, create, update or render");`
`444`	`441`	`return false;`
`445`	`442`	`}`
`446`		`-`
`447`		`- return true;`
`448`	`443`	`}`
`449`	`444`	`else`
`450`	`445`	`{`