diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/FNF DUSTTALE.js b/FNF DUSTTALE.js index e8af7d6..e18212b 100644 --- a/FNF DUSTTALE.js +++ b/FNF DUSTTALE.js @@ -1,4 +1,5 @@ -(function ($hx_exports, $global) { "use strict"; var $hx_script = (function (exports, global) { (function ($hx_exports, $global) { "use strict"; +(function ($hx_exports, $global) { "use strict"; var $hx_script = (function (exports, global) { // Generated by Haxe 4.1.5 +(function ($hx_exports, $global) { "use strict"; $hx_exports["lime"] = $hx_exports["lime"] || {}; var $hxClasses = {},$estr = function() { return js_Boot.__string_rec(this,''); },$hxEnums = $hxEnums || {},$_; function $extend(from, fields) { @@ -823,29 +824,12 @@ var flixel_FlxObject = function(X,Y,Width,Height) { X = 0; } var _this = flixel_math_FlxRect._pool.get(); - var X1 = 0; - var Y1 = 0; - var Width1 = 0; - var Height1 = 0; - if(Height1 == null) { - Height1 = 0; - } - if(Width1 == null) { - Width1 = 0; - } - if(Y1 == null) { - Y1 = 0; - } - if(X1 == null) { - X1 = 0; - } - _this.x = X1; - _this.y = Y1; - _this.width = Width1; - _this.height = Height1; - var rect = _this; - rect._inPool = false; - this._rect = rect; + _this.x = 0; + _this.y = 0; + _this.width = 0; + _this.height = 0; + _this._inPool = false; + this._rect = _this; var point = flixel_math_FlxPoint._pool.get().set(0,0); point._inPool = false; this._point = point; @@ -992,7 +976,8 @@ flixel_FlxObject.separateX = function(Object1,Object2) { if(!obj1immovable && !obj2immovable) { overlap *= 0.5; Object1.set_x(Object1.x - overlap); - Object2.set_x(Object2.x + overlap); + var _g = Object2; + _g.set_x(_g.x + overlap); var obj1velocity = Math.sqrt(obj2v * obj2v * Object2.mass / Object1.mass) * (obj2v > 0 ? 1 : -1); var obj2velocity = Math.sqrt(obj1v * obj1v * Object1.mass / Object2.mass) * (obj1v > 0 ? 1 : -1); var average = (obj1velocity + obj2velocity) * 0.5; @@ -1004,7 +989,8 @@ flixel_FlxObject.separateX = function(Object1,Object2) { Object1.set_x(Object1.x - overlap); Object1.velocity.set_x(obj2v - obj1v * Object1.elasticity); } else if(!obj2immovable) { - Object2.set_x(Object2.x + overlap); + var _g = Object2; + _g.set_x(_g.x + overlap); Object2.velocity.set_x(obj1v - obj2v * Object2.elasticity); } return true; @@ -1122,7 +1108,8 @@ flixel_FlxObject.separateY = function(Object1,Object2) { if(!obj1immovable && !obj2immovable) { overlap *= 0.5; Object1.set_y(Object1.y - overlap); - Object2.set_y(Object2.y + overlap); + var _g = Object2; + _g.set_y(_g.y + overlap); var obj1velocity = Math.sqrt(obj2v * obj2v * Object2.mass / Object1.mass) * (obj2v > 0 ? 1 : -1); var obj2velocity = Math.sqrt(obj1v * obj1v * Object1.mass / Object2.mass) * (obj1v > 0 ? 1 : -1); var average = (obj1velocity + obj2velocity) * 0.5; @@ -1134,13 +1121,16 @@ flixel_FlxObject.separateY = function(Object1,Object2) { Object1.set_y(Object1.y - overlap); Object1.velocity.set_y(obj2v - obj1v * Object1.elasticity); if(Object1.collisonXDrag && Object2.active && Object2.moves && obj1delta > obj2delta) { - Object1.set_x(Object1.x + (Object2.x - Object2.last.x)); + var _g = Object1; + _g.set_x(_g.x + (Object2.x - Object2.last.x)); } } else if(!obj2immovable) { - Object2.set_y(Object2.y + overlap); + var _g = Object2; + _g.set_y(_g.y + overlap); Object2.velocity.set_y(obj1v - obj2v * Object2.elasticity); if(Object2.collisonXDrag && Object1.active && Object1.moves && obj1delta < obj2delta) { - Object2.set_x(Object2.x + (Object1.x - Object1.last.x)); + var _g = Object2; + _g.set_x(_g.x + (Object1.x - Object1.last.x)); } } return true; @@ -1282,22 +1272,25 @@ flixel_FlxObject.prototype = $extend(flixel_FlxBasic.prototype,{ ,updateMotion: function(elapsed) { var velocityDelta = 0.5 * (flixel_math_FlxVelocity.computeVelocity(this.angularVelocity,this.angularAcceleration,this.angularDrag,this.maxAngular,elapsed) - this.angularVelocity); this.angularVelocity += velocityDelta; - this.set_angle(this.angle + this.angularVelocity * elapsed); + var _g = this; + _g.set_angle(_g.angle + this.angularVelocity * elapsed); this.angularVelocity += velocityDelta; velocityDelta = 0.5 * (flixel_math_FlxVelocity.computeVelocity(this.velocity.x,this.acceleration.x,this.drag.x,this.maxVelocity.x,elapsed) - this.velocity.x); - var fh = this.velocity; - fh.set_x(fh.x + velocityDelta); + var _g = this.velocity; + _g.set_x(_g.x + velocityDelta); var delta = this.velocity.x * elapsed; - var fh = this.velocity; - fh.set_x(fh.x + velocityDelta); - this.set_x(this.x + delta); + var _g = this.velocity; + _g.set_x(_g.x + velocityDelta); + var _g = this; + _g.set_x(_g.x + delta); velocityDelta = 0.5 * (flixel_math_FlxVelocity.computeVelocity(this.velocity.y,this.acceleration.y,this.drag.y,this.maxVelocity.y,elapsed) - this.velocity.y); - var fh = this.velocity; - fh.set_y(fh.y + velocityDelta); + var _g = this.velocity; + _g.set_y(_g.y + velocityDelta); delta = this.velocity.y * elapsed; - var fh = this.velocity; - fh.set_y(fh.y + velocityDelta); - this.set_y(this.y + delta); + var _g = this.velocity; + _g.set_y(_g.y + velocityDelta); + var _g = this; + _g.set_y(_g.y + delta); } ,draw: function() { } @@ -1432,8 +1425,10 @@ flixel_FlxObject.prototype = $extend(flixel_FlxBasic.prototype,{ if(X == null) { X = 0; } - point.set_x(point.x - X); - point.set_y(point.y - Y); + var _g = point; + _g.set_x(_g.x - X); + var _g = point; + _g.set_y(_g.y - Y); return point; } ,getPosition: function(point) { @@ -2224,8 +2219,10 @@ flixel_FlxSprite.prototype = $extend(flixel_FlxObject.prototype,{ if(X == null) { X = 0; } - _this.set_x(_this.x + X); - _this.set_y(_this.y + Y); + var _g = _this; + _g.set_x(_g.x + X); + var _g = _this; + _g.set_y(_g.y + Y); this._matrix.translate(this._point.x,this._point.y); if(this.isPixelPerfectRender(camera)) { this._matrix.tx = Math.floor(this._matrix.tx); @@ -2290,8 +2287,10 @@ flixel_FlxSprite.prototype = $extend(flixel_FlxObject.prototype,{ this.offset.set_x((this.frameWidth - this.get_width()) * 0.5); this.offset.set_y((this.frameHeight - this.get_height()) * 0.5); if(AdjustPosition) { - this.set_x(this.x + this.offset.x); - this.set_y(this.y + this.offset.y); + var _g = this; + _g.set_x(_g.x + this.offset.x); + var _g = this; + _g.set_y(_g.y + this.offset.y); } } ,centerOrigin: function() { @@ -2708,10 +2707,12 @@ flixel_FlxSprite.prototype = $extend(flixel_FlxObject.prototype,{ ,set_graphic: function(Value) { var oldGraphic = this.graphic; if(this.graphic != Value && Value != null) { - Value.set_useCount(Value.get_useCount() + 1); + var _g = Value; + _g.set_useCount(_g.get_useCount() + 1); } if(oldGraphic != null && oldGraphic != Value) { - oldGraphic.set_useCount(oldGraphic.get_useCount() - 1); + var _g = oldGraphic; + _g.set_useCount(_g.get_useCount() - 1); } return this.graphic = Value; } @@ -2861,21 +2862,32 @@ flixel_group_FlxTypedSpriteGroup.prototype = $extend(flixel_FlxSprite.prototype, } } } - ,transformChildren_flixel_math_FlxPoint: function(Function1,Value) { + ,multiTransformChildren_Float: function(FunctionArray,ValueArray) { if(this._skipTransformChildren || this.group == null) { return; } + var numProps = FunctionArray.length; + if(numProps > ValueArray.length) { + return; + } + var lambda; var _g = 0; var _g1 = this._sprites; while(_g < _g1.length) { var sprite = _g1[_g]; ++_g; - if(sprite != null) { - Function1(sprite,Value); + if(sprite != null && sprite.exists) { + var _g2 = 0; + var _g3 = numProps; + while(_g2 < _g3) { + var i = _g2++; + lambda = FunctionArray[i]; + lambda(sprite,ValueArray[i]); + } } } } - ,transformChildren_Array_flixel_FlxCamera: function(Function1,Value) { + ,transformChildren_flixel_math_FlxPoint: function(Function1,Value) { if(this._skipTransformChildren || this.group == null) { return; } @@ -2903,32 +2915,21 @@ flixel_group_FlxTypedSpriteGroup.prototype = $extend(flixel_FlxSprite.prototype, } } } - ,multiTransformChildren_Float: function(FunctionArray,ValueArray) { + ,transformChildren_Float: function(Function1,Value) { if(this._skipTransformChildren || this.group == null) { return; } - var numProps = FunctionArray.length; - if(numProps > ValueArray.length) { - return; - } - var lambda; var _g = 0; var _g1 = this._sprites; while(_g < _g1.length) { var sprite = _g1[_g]; ++_g; - if(sprite != null && sprite.exists) { - var _g2 = 0; - var _g3 = numProps; - while(_g2 < _g3) { - var i = _g2++; - lambda = FunctionArray[i]; - lambda(sprite,ValueArray[i]); - } + if(sprite != null) { + Function1(sprite,Value); } } } - ,transformChildren_Float: function(Function1,Value) { + ,transformChildren_Array_flixel_FlxCamera: function(Function1,Value) { if(this._skipTransformChildren || this.group == null) { return; } @@ -3097,9 +3098,12 @@ flixel_group_FlxTypedSpriteGroup.prototype = $extend(flixel_FlxSprite.prototype, } ,preAdd: function(Sprite) { var sprite = Sprite; - sprite.set_x(sprite.x + this.x); - sprite.set_y(sprite.y + this.y); - sprite.set_alpha(sprite.alpha * this.alpha); + var _g = sprite; + _g.set_x(_g.x + this.x); + var _g = sprite; + _g.set_y(_g.y + this.y); + var _g = sprite; + _g.set_alpha(_g.alpha * this.alpha); var _this = sprite.scrollFactor; var point = this.scrollFactor; _this.set_x(point.x); @@ -3170,8 +3174,10 @@ flixel_group_FlxTypedSpriteGroup.prototype = $extend(flixel_FlxSprite.prototype, Splice = false; } var sprite = Sprite; - sprite.set_x(sprite.x - this.x); - sprite.set_y(sprite.y - this.y); + var _g = sprite; + _g.set_x(_g.x - this.x); + var _g = sprite; + _g.set_y(_g.y - this.y); sprite.set_cameras(null); return this.group.remove(Sprite,Splice); } @@ -3504,17 +3510,21 @@ flixel_group_FlxTypedSpriteGroup.prototype = $extend(flixel_FlxSprite.prototype, return this.group.members; } ,xTransform: function(Sprite,X) { - Sprite.set_x(Sprite.x + X); + var _g = Sprite; + _g.set_x(_g.x + X); } ,yTransform: function(Sprite,Y) { - Sprite.set_y(Sprite.y + Y); + var _g = Sprite; + _g.set_y(_g.y + Y); } ,angleTransform: function(Sprite,Angle) { - Sprite.set_angle(Sprite.angle + Angle); + var _g = Sprite; + _g.set_angle(_g.angle + Angle); } ,alphaTransform: function(Sprite,Alpha) { if(Sprite.alpha != 0 || Alpha == 0) { - Sprite.set_alpha(Sprite.alpha * Alpha); + var _g = Sprite; + _g.set_alpha(_g.alpha * Alpha); } else { Sprite.set_alpha(1 / Alpha); } @@ -3891,7 +3901,8 @@ Alphabet.prototype = $extend(flixel_group_FlxTypedSpriteGroup.prototype,{ } else { letter.createLetter(_gthis.splitWords[loopNum]); } - letter.set_x(letter.x + 90); + var _g = letter; + _g.set_x(_g.x + 90); } var Chance = 40; if(Chance == null) { @@ -3947,7 +3958,8 @@ AlphaCharacter.prototype = $extend(flixel_FlxSprite.prototype,{ this.animation.play(letter); this.updateHitbox(); this.set_y(110 - this.get_height()); - this.set_y(this.y + this.row * 60); + var _g = this; + _g.set_y(_g.y + this.row * 60); } ,createNumber: function(letter) { this.animation.addByPrefix(letter,letter,24); @@ -3967,7 +3979,8 @@ AlphaCharacter.prototype = $extend(flixel_FlxSprite.prototype,{ case "\"": this.animation.addByPrefix(letter,"\"",24); this.animation.play(letter); - this.set_y(this.y); + var _g = this; + _g.set_y(_g.y); break; case "#": this.animation.addByPrefix(letter,"#",24); @@ -3988,7 +4001,8 @@ AlphaCharacter.prototype = $extend(flixel_FlxSprite.prototype,{ case "'": this.animation.addByPrefix(letter,"apostraphie",24); this.animation.play(letter); - this.set_y(this.y); + var _g = this; + _g.set_y(_g.y); break; case "(": this.animation.addByPrefix(letter,"(",24); @@ -4009,7 +4023,8 @@ AlphaCharacter.prototype = $extend(flixel_FlxSprite.prototype,{ case ".": this.animation.addByPrefix(letter,"period",24); this.animation.play(letter); - this.set_y(this.y + 50); + var _g = this; + _g.set_y(_g.y + 50); break; case "?": this.animation.addByPrefix(letter,"question mark",24); @@ -4022,12 +4037,14 @@ AlphaCharacter.prototype = $extend(flixel_FlxSprite.prototype,{ case "^": this.animation.addByPrefix(letter,"^",24); this.animation.play(letter); - this.set_y(this.y); + var _g = this; + _g.set_y(_g.y); break; case "_": this.animation.addByPrefix(letter,"_",24); this.animation.play(letter); - this.set_y(this.y + 50); + var _g = this; + _g.set_y(_g.y + 50); break; } this.updateHitbox(); @@ -4942,7 +4959,7 @@ ApplicationMain.main = function() { ApplicationMain.create = function(config) { var app = new openfl_display_Application(); ManifestResources.init(config); - app.meta.h["build"] = "13"; + app.meta.h["build"] = "18"; app.meta.h["company"] = "WassabiSoja"; app.meta.h["file"] = "FNF DUSTTALE"; app.meta.h["name"] = "Friday Night Funkin': DUSTTALE"; @@ -5128,22 +5145,15 @@ openfl_events_EventDispatcher.prototype = { } if(list.length == 0) { var _this = this.__eventMap; - var key = type; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,type)) { + delete(_this.h[type]); } var _this = this.__iterators; - var key = type; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,type)) { + delete(_this.h[type]); } } - var h = this.__eventMap.h; - var inlStringMapValueIterator_h = h; - var inlStringMapValueIterator_keys = Object.keys(h); - var inlStringMapValueIterator_length = inlStringMapValueIterator_keys.length; - var inlStringMapValueIterator_current = 0; - if(inlStringMapValueIterator_current >= inlStringMapValueIterator_length) { + if(!haxe_ds_StringMap.valueIterator(this.__eventMap.h).hasNext()) { this.__eventMap = null; this.__iterators = null; } @@ -5362,18 +5372,7 @@ openfl_Vector.sort = function(this1,sortBehavior) { this1.sort(sortBehavior); }; openfl_Vector.splice = function(this1,startIndex,deleteCount) { - var $l=arguments.length; - var items = new Array($l>3?$l-3:0); - for(var $i=3;$i<$l;++$i){items[$i-3]=arguments[$i];} - this1.__tempIndex = startIndex; - var _g_current = 0; - var _g_args = items; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - return this1.splice(this1.__tempIndex,deleteCount); + return this1.splice(startIndex,deleteCount); }; openfl_Vector.toString = function(this1) { if(this1 != null) { @@ -7813,8 +7812,10 @@ var Character = function(x,y,character,isPlayer) { this.setGraphicSize(this.get_width() * 6 | 0); this.updateHitbox(); this.playAnim("idle"); - this.set_width(this.get_width() - 100); - this.set_height(this.get_height() - 100); + var _g = this; + _g.set_width(_g.get_width() - 100); + var _g = this; + _g.set_height(_g.get_height() - 100); this.set_antialiasing(false); this.set_flipX(true); break; @@ -8484,30 +8485,27 @@ Conductor.changeBPM = function(newBpm) { Conductor.prototype = { __class__: Conductor }; -var Device = $hxEnums["Device"] = { __ename__:"Device",__constructs__:null - ,Keys: {_hx_name:"Keys",_hx_index:0,__enum__:"Device",toString:$estr} - ,Gamepad: ($_=function(id) { return {_hx_index:1,id:id,__enum__:"Device",toString:$estr}; },$_._hx_name="Gamepad",$_.__params__ = ["id"],$_) -}; -Device.__constructs__ = [Device.Keys,Device.Gamepad]; -var Control = $hxEnums["Control"] = { __ename__:"Control",__constructs__:null - ,UP: {_hx_name:"UP",_hx_index:0,__enum__:"Control",toString:$estr} - ,LEFT: {_hx_name:"LEFT",_hx_index:1,__enum__:"Control",toString:$estr} - ,RIGHT: {_hx_name:"RIGHT",_hx_index:2,__enum__:"Control",toString:$estr} - ,DOWN: {_hx_name:"DOWN",_hx_index:3,__enum__:"Control",toString:$estr} - ,RESET: {_hx_name:"RESET",_hx_index:4,__enum__:"Control",toString:$estr} - ,ACCEPT: {_hx_name:"ACCEPT",_hx_index:5,__enum__:"Control",toString:$estr} - ,BACK: {_hx_name:"BACK",_hx_index:6,__enum__:"Control",toString:$estr} - ,PAUSE: {_hx_name:"PAUSE",_hx_index:7,__enum__:"Control",toString:$estr} - ,CHEAT: {_hx_name:"CHEAT",_hx_index:8,__enum__:"Control",toString:$estr} -}; -Control.__constructs__ = [Control.UP,Control.LEFT,Control.RIGHT,Control.DOWN,Control.RESET,Control.ACCEPT,Control.BACK,Control.PAUSE,Control.CHEAT]; -var KeyboardScheme = $hxEnums["KeyboardScheme"] = { __ename__:"KeyboardScheme",__constructs__:null - ,Solo: {_hx_name:"Solo",_hx_index:0,__enum__:"KeyboardScheme",toString:$estr} - ,Duo: ($_=function(first) { return {_hx_index:1,first:first,__enum__:"KeyboardScheme",toString:$estr}; },$_._hx_name="Duo",$_.__params__ = ["first"],$_) - ,None: {_hx_name:"None",_hx_index:2,__enum__:"KeyboardScheme",toString:$estr} - ,Custom: {_hx_name:"Custom",_hx_index:3,__enum__:"KeyboardScheme",toString:$estr} -}; -KeyboardScheme.__constructs__ = [KeyboardScheme.Solo,KeyboardScheme.Duo,KeyboardScheme.None,KeyboardScheme.Custom]; +var Device = $hxEnums["Device"] = { __ename__ : "Device", __constructs__ : ["Keys","Gamepad"] + ,Keys: {_hx_index:0,__enum__:"Device",toString:$estr} + ,Gamepad: ($_=function(id) { return {_hx_index:1,id:id,__enum__:"Device",toString:$estr}; },$_.__params__ = ["id"],$_) +}; +var Control = $hxEnums["Control"] = { __ename__ : "Control", __constructs__ : ["UP","LEFT","RIGHT","DOWN","RESET","ACCEPT","BACK","PAUSE","CHEAT"] + ,UP: {_hx_index:0,__enum__:"Control",toString:$estr} + ,LEFT: {_hx_index:1,__enum__:"Control",toString:$estr} + ,RIGHT: {_hx_index:2,__enum__:"Control",toString:$estr} + ,DOWN: {_hx_index:3,__enum__:"Control",toString:$estr} + ,RESET: {_hx_index:4,__enum__:"Control",toString:$estr} + ,ACCEPT: {_hx_index:5,__enum__:"Control",toString:$estr} + ,BACK: {_hx_index:6,__enum__:"Control",toString:$estr} + ,PAUSE: {_hx_index:7,__enum__:"Control",toString:$estr} + ,CHEAT: {_hx_index:8,__enum__:"Control",toString:$estr} +}; +var KeyboardScheme = $hxEnums["KeyboardScheme"] = { __ename__ : "KeyboardScheme", __constructs__ : ["Solo","Duo","None","Custom"] + ,Solo: {_hx_index:0,__enum__:"KeyboardScheme",toString:$estr} + ,Duo: ($_=function(first) { return {_hx_index:1,first:first,__enum__:"KeyboardScheme",toString:$estr}; },$_.__params__ = ["first"],$_) + ,None: {_hx_index:2,__enum__:"KeyboardScheme",toString:$estr} + ,Custom: {_hx_index:3,__enum__:"KeyboardScheme",toString:$estr} +}; var flixel_input_actions_FlxActionSet = function(Name,DigitalActions,AnalogActions) { this.active = true; this.name = ""; @@ -8981,22 +8979,16 @@ Controls.prototype = $extend(flixel_input_actions_FlxActionSet.prototype,{ } } ,copyFrom: function(controls,device) { - var h = controls.byName.h; - var _g_h = h; - var _g_keys = Object.keys(h); - var _g_length = _g_keys.length; - var _g_current = 0; - while(_g_current < _g_length) { - var key = _g_keys[_g_current++]; - var _g1_key = key; - var _g1_value = _g_h[key]; - var name = _g1_key; - var action = _g1_value; - var _g = 0; - var _g1 = action.inputs; - while(_g < _g1.length) { - var input = _g1[_g]; - ++_g; + var _g = haxe_ds_StringMap.kvIterator(controls.byName.h); + while(_g.hasNext()) { + var _g1 = _g.next(); + var name = _g1.key; + var action = _g1.value; + var _g2 = 0; + var _g3 = action.inputs; + while(_g2 < _g3.length) { + var input = _g3[_g2]; + ++_g2; if(device == null || Controls.isDevice(input,device)) { this.byName.h[name].add(input); } @@ -10391,169 +10383,165 @@ Controls.prototype = $extend(flixel_input_actions_FlxActionSet.prototype,{ HxOverrides.remove(this.gamepadsAdded,id); } this.gamepadsAdded.push(id); - var map = buttonMap; - var _g_map = map; - var _g_keys = map.keys(); - while(_g_keys.hasNext()) { - var key = _g_keys.next(); - var _g1_value = _g_map.get(key); - var _g1_key = key; - var control = _g1_key; - var buttons = _g1_value; + var _g = new haxe_iterators_MapKeyValueIterator(buttonMap); + while(_g.hasNext()) { + var _g1 = _g.next(); + var control = _g1.key; + var buttons = _g1.value; var id1 = id; var buttons1 = buttons; switch(control._hx_index) { case 0: var action = this._up; var state = 1; - var _g = 0; - while(_g < buttons1.length) { - var button = buttons1[_g]; - ++_g; + var _g2 = 0; + while(_g2 < buttons1.length) { + var button = buttons1[_g2]; + ++_g2; action.addGamepad(button,state,id1); } var action1 = this._upP; var state1 = 2; - var _g1 = 0; - while(_g1 < buttons1.length) { - var button1 = buttons1[_g1]; - ++_g1; + var _g3 = 0; + while(_g3 < buttons1.length) { + var button1 = buttons1[_g3]; + ++_g3; action1.addGamepad(button1,state1,id1); } var action2 = this._upR; var state2 = -1; - var _g2 = 0; - while(_g2 < buttons1.length) { - var button2 = buttons1[_g2]; - ++_g2; + var _g4 = 0; + while(_g4 < buttons1.length) { + var button2 = buttons1[_g4]; + ++_g4; action2.addGamepad(button2,state2,id1); } break; case 1: var action3 = this._left; var state3 = 1; - var _g3 = 0; - while(_g3 < buttons1.length) { - var button3 = buttons1[_g3]; - ++_g3; + var _g5 = 0; + while(_g5 < buttons1.length) { + var button3 = buttons1[_g5]; + ++_g5; action3.addGamepad(button3,state3,id1); } var action4 = this._leftP; var state4 = 2; - var _g4 = 0; - while(_g4 < buttons1.length) { - var button4 = buttons1[_g4]; - ++_g4; + var _g6 = 0; + while(_g6 < buttons1.length) { + var button4 = buttons1[_g6]; + ++_g6; action4.addGamepad(button4,state4,id1); } var action5 = this._leftR; var state5 = -1; - var _g5 = 0; - while(_g5 < buttons1.length) { - var button5 = buttons1[_g5]; - ++_g5; + var _g7 = 0; + while(_g7 < buttons1.length) { + var button5 = buttons1[_g7]; + ++_g7; action5.addGamepad(button5,state5,id1); } break; case 2: var action6 = this._right; var state6 = 1; - var _g6 = 0; - while(_g6 < buttons1.length) { - var button6 = buttons1[_g6]; - ++_g6; + var _g8 = 0; + while(_g8 < buttons1.length) { + var button6 = buttons1[_g8]; + ++_g8; action6.addGamepad(button6,state6,id1); } var action7 = this._rightP; var state7 = 2; - var _g7 = 0; - while(_g7 < buttons1.length) { - var button7 = buttons1[_g7]; - ++_g7; + var _g9 = 0; + while(_g9 < buttons1.length) { + var button7 = buttons1[_g9]; + ++_g9; action7.addGamepad(button7,state7,id1); } var action8 = this._rightR; var state8 = -1; - var _g8 = 0; - while(_g8 < buttons1.length) { - var button8 = buttons1[_g8]; - ++_g8; + var _g10 = 0; + while(_g10 < buttons1.length) { + var button8 = buttons1[_g10]; + ++_g10; action8.addGamepad(button8,state8,id1); } break; case 3: var action9 = this._down; var state9 = 1; - var _g9 = 0; - while(_g9 < buttons1.length) { - var button9 = buttons1[_g9]; - ++_g9; + var _g11 = 0; + while(_g11 < buttons1.length) { + var button9 = buttons1[_g11]; + ++_g11; action9.addGamepad(button9,state9,id1); } var action10 = this._downP; var state10 = 2; - var _g10 = 0; - while(_g10 < buttons1.length) { - var button10 = buttons1[_g10]; - ++_g10; + var _g12 = 0; + while(_g12 < buttons1.length) { + var button10 = buttons1[_g12]; + ++_g12; action10.addGamepad(button10,state10,id1); } var action11 = this._downR; var state11 = -1; - var _g11 = 0; - while(_g11 < buttons1.length) { - var button11 = buttons1[_g11]; - ++_g11; + var _g13 = 0; + while(_g13 < buttons1.length) { + var button11 = buttons1[_g13]; + ++_g13; action11.addGamepad(button11,state11,id1); } break; case 4: var action12 = this._reset; var state12 = 2; - var _g12 = 0; - while(_g12 < buttons1.length) { - var button12 = buttons1[_g12]; - ++_g12; + var _g14 = 0; + while(_g14 < buttons1.length) { + var button12 = buttons1[_g14]; + ++_g14; action12.addGamepad(button12,state12,id1); } break; case 5: var action13 = this._accept; var state13 = 2; - var _g13 = 0; - while(_g13 < buttons1.length) { - var button13 = buttons1[_g13]; - ++_g13; + var _g15 = 0; + while(_g15 < buttons1.length) { + var button13 = buttons1[_g15]; + ++_g15; action13.addGamepad(button13,state13,id1); } break; case 6: var action14 = this._back; var state14 = 2; - var _g14 = 0; - while(_g14 < buttons1.length) { - var button14 = buttons1[_g14]; - ++_g14; + var _g16 = 0; + while(_g16 < buttons1.length) { + var button14 = buttons1[_g16]; + ++_g16; action14.addGamepad(button14,state14,id1); } break; case 7: var action15 = this._pause; var state15 = 2; - var _g15 = 0; - while(_g15 < buttons1.length) { - var button15 = buttons1[_g15]; - ++_g15; + var _g17 = 0; + while(_g17 < buttons1.length) { + var button15 = buttons1[_g17]; + ++_g17; action15.addGamepad(button15,state15,id1); } break; case 8: var action16 = this._cheat; var state16 = 2; - var _g16 = 0; - while(_g16 < buttons1.length) { - var button16 = buttons1[_g16]; - ++_g16; + var _g18 = 0; + while(_g18 < buttons1.length) { + var button16 = buttons1[_g18]; + ++_g18; action16.addGamepad(button16,state16,id1); } break; @@ -10562,169 +10550,165 @@ Controls.prototype = $extend(flixel_input_actions_FlxActionSet.prototype,{ } ,addGamepadLiteral: function(id,buttonMap) { this.gamepadsAdded.push(id); - var map = buttonMap; - var _g_map = map; - var _g_keys = map.keys(); - while(_g_keys.hasNext()) { - var key = _g_keys.next(); - var _g1_value = _g_map.get(key); - var _g1_key = key; - var control = _g1_key; - var buttons = _g1_value; + var _g = new haxe_iterators_MapKeyValueIterator(buttonMap); + while(_g.hasNext()) { + var _g1 = _g.next(); + var control = _g1.key; + var buttons = _g1.value; var id1 = id; var buttons1 = buttons; switch(control._hx_index) { case 0: var action = this._up; var state = 1; - var _g = 0; - while(_g < buttons1.length) { - var button = buttons1[_g]; - ++_g; + var _g2 = 0; + while(_g2 < buttons1.length) { + var button = buttons1[_g2]; + ++_g2; action.addGamepad(button,state,id1); } var action1 = this._upP; var state1 = 2; - var _g1 = 0; - while(_g1 < buttons1.length) { - var button1 = buttons1[_g1]; - ++_g1; + var _g3 = 0; + while(_g3 < buttons1.length) { + var button1 = buttons1[_g3]; + ++_g3; action1.addGamepad(button1,state1,id1); } var action2 = this._upR; var state2 = -1; - var _g2 = 0; - while(_g2 < buttons1.length) { - var button2 = buttons1[_g2]; - ++_g2; + var _g4 = 0; + while(_g4 < buttons1.length) { + var button2 = buttons1[_g4]; + ++_g4; action2.addGamepad(button2,state2,id1); } break; case 1: var action3 = this._left; var state3 = 1; - var _g3 = 0; - while(_g3 < buttons1.length) { - var button3 = buttons1[_g3]; - ++_g3; + var _g5 = 0; + while(_g5 < buttons1.length) { + var button3 = buttons1[_g5]; + ++_g5; action3.addGamepad(button3,state3,id1); } var action4 = this._leftP; var state4 = 2; - var _g4 = 0; - while(_g4 < buttons1.length) { - var button4 = buttons1[_g4]; - ++_g4; + var _g6 = 0; + while(_g6 < buttons1.length) { + var button4 = buttons1[_g6]; + ++_g6; action4.addGamepad(button4,state4,id1); } var action5 = this._leftR; var state5 = -1; - var _g5 = 0; - while(_g5 < buttons1.length) { - var button5 = buttons1[_g5]; - ++_g5; + var _g7 = 0; + while(_g7 < buttons1.length) { + var button5 = buttons1[_g7]; + ++_g7; action5.addGamepad(button5,state5,id1); } break; case 2: var action6 = this._right; var state6 = 1; - var _g6 = 0; - while(_g6 < buttons1.length) { - var button6 = buttons1[_g6]; - ++_g6; + var _g8 = 0; + while(_g8 < buttons1.length) { + var button6 = buttons1[_g8]; + ++_g8; action6.addGamepad(button6,state6,id1); } var action7 = this._rightP; var state7 = 2; - var _g7 = 0; - while(_g7 < buttons1.length) { - var button7 = buttons1[_g7]; - ++_g7; + var _g9 = 0; + while(_g9 < buttons1.length) { + var button7 = buttons1[_g9]; + ++_g9; action7.addGamepad(button7,state7,id1); } var action8 = this._rightR; var state8 = -1; - var _g8 = 0; - while(_g8 < buttons1.length) { - var button8 = buttons1[_g8]; - ++_g8; + var _g10 = 0; + while(_g10 < buttons1.length) { + var button8 = buttons1[_g10]; + ++_g10; action8.addGamepad(button8,state8,id1); } break; case 3: var action9 = this._down; var state9 = 1; - var _g9 = 0; - while(_g9 < buttons1.length) { - var button9 = buttons1[_g9]; - ++_g9; + var _g11 = 0; + while(_g11 < buttons1.length) { + var button9 = buttons1[_g11]; + ++_g11; action9.addGamepad(button9,state9,id1); } var action10 = this._downP; var state10 = 2; - var _g10 = 0; - while(_g10 < buttons1.length) { - var button10 = buttons1[_g10]; - ++_g10; + var _g12 = 0; + while(_g12 < buttons1.length) { + var button10 = buttons1[_g12]; + ++_g12; action10.addGamepad(button10,state10,id1); } var action11 = this._downR; var state11 = -1; - var _g11 = 0; - while(_g11 < buttons1.length) { - var button11 = buttons1[_g11]; - ++_g11; + var _g13 = 0; + while(_g13 < buttons1.length) { + var button11 = buttons1[_g13]; + ++_g13; action11.addGamepad(button11,state11,id1); } break; case 4: var action12 = this._reset; var state12 = 2; - var _g12 = 0; - while(_g12 < buttons1.length) { - var button12 = buttons1[_g12]; - ++_g12; + var _g14 = 0; + while(_g14 < buttons1.length) { + var button12 = buttons1[_g14]; + ++_g14; action12.addGamepad(button12,state12,id1); } break; case 5: var action13 = this._accept; var state13 = 2; - var _g13 = 0; - while(_g13 < buttons1.length) { - var button13 = buttons1[_g13]; - ++_g13; + var _g15 = 0; + while(_g15 < buttons1.length) { + var button13 = buttons1[_g15]; + ++_g15; action13.addGamepad(button13,state13,id1); } break; case 6: var action14 = this._back; var state14 = 2; - var _g14 = 0; - while(_g14 < buttons1.length) { - var button14 = buttons1[_g14]; - ++_g14; + var _g16 = 0; + while(_g16 < buttons1.length) { + var button14 = buttons1[_g16]; + ++_g16; action14.addGamepad(button14,state14,id1); } break; case 7: var action15 = this._pause; var state15 = 2; - var _g15 = 0; - while(_g15 < buttons1.length) { - var button15 = buttons1[_g15]; - ++_g15; + var _g17 = 0; + while(_g17 < buttons1.length) { + var button15 = buttons1[_g17]; + ++_g17; action15.addGamepad(button15,state15,id1); } break; case 8: var action16 = this._cheat; var state16 = 2; - var _g16 = 0; - while(_g16 < buttons1.length) { - var button16 = buttons1[_g16]; - ++_g16; + var _g18 = 0; + while(_g18 < buttons1.length) { + var button16 = buttons1[_g18]; + ++_g18; action16.addGamepad(button16,state16,id1); } break; @@ -10761,169 +10745,165 @@ Controls.prototype = $extend(flixel_input_actions_FlxActionSet.prototype,{ _g.set(Control.PAUSE,[7]); _g.set(Control.RESET,[3]); this.gamepadsAdded.push(id); - var map = _g; - var _g_map = map; - var _g_keys = map.keys(); - while(_g_keys.hasNext()) { - var key = _g_keys.next(); - var _g1_value = _g_map.get(key); - var _g1_key = key; - var control = _g1_key; - var buttons = _g1_value; + var _g1 = new haxe_iterators_MapKeyValueIterator(_g); + while(_g1.hasNext()) { + var _g = _g1.next(); + var control = _g.key; + var buttons = _g.value; var id1 = id; var buttons1 = buttons; switch(control._hx_index) { case 0: var action = this._up; var state = 1; - var _g = 0; - while(_g < buttons1.length) { - var button = buttons1[_g]; - ++_g; + var _g2 = 0; + while(_g2 < buttons1.length) { + var button = buttons1[_g2]; + ++_g2; action.addGamepad(button,state,id1); } var action1 = this._upP; var state1 = 2; - var _g1 = 0; - while(_g1 < buttons1.length) { - var button1 = buttons1[_g1]; - ++_g1; + var _g3 = 0; + while(_g3 < buttons1.length) { + var button1 = buttons1[_g3]; + ++_g3; action1.addGamepad(button1,state1,id1); } var action2 = this._upR; var state2 = -1; - var _g2 = 0; - while(_g2 < buttons1.length) { - var button2 = buttons1[_g2]; - ++_g2; + var _g4 = 0; + while(_g4 < buttons1.length) { + var button2 = buttons1[_g4]; + ++_g4; action2.addGamepad(button2,state2,id1); } break; case 1: var action3 = this._left; var state3 = 1; - var _g3 = 0; - while(_g3 < buttons1.length) { - var button3 = buttons1[_g3]; - ++_g3; + var _g5 = 0; + while(_g5 < buttons1.length) { + var button3 = buttons1[_g5]; + ++_g5; action3.addGamepad(button3,state3,id1); } var action4 = this._leftP; var state4 = 2; - var _g4 = 0; - while(_g4 < buttons1.length) { - var button4 = buttons1[_g4]; - ++_g4; + var _g6 = 0; + while(_g6 < buttons1.length) { + var button4 = buttons1[_g6]; + ++_g6; action4.addGamepad(button4,state4,id1); } var action5 = this._leftR; var state5 = -1; - var _g5 = 0; - while(_g5 < buttons1.length) { - var button5 = buttons1[_g5]; - ++_g5; + var _g7 = 0; + while(_g7 < buttons1.length) { + var button5 = buttons1[_g7]; + ++_g7; action5.addGamepad(button5,state5,id1); } break; case 2: var action6 = this._right; var state6 = 1; - var _g6 = 0; - while(_g6 < buttons1.length) { - var button6 = buttons1[_g6]; - ++_g6; + var _g8 = 0; + while(_g8 < buttons1.length) { + var button6 = buttons1[_g8]; + ++_g8; action6.addGamepad(button6,state6,id1); } var action7 = this._rightP; var state7 = 2; - var _g7 = 0; - while(_g7 < buttons1.length) { - var button7 = buttons1[_g7]; - ++_g7; + var _g9 = 0; + while(_g9 < buttons1.length) { + var button7 = buttons1[_g9]; + ++_g9; action7.addGamepad(button7,state7,id1); } var action8 = this._rightR; var state8 = -1; - var _g8 = 0; - while(_g8 < buttons1.length) { - var button8 = buttons1[_g8]; - ++_g8; + var _g10 = 0; + while(_g10 < buttons1.length) { + var button8 = buttons1[_g10]; + ++_g10; action8.addGamepad(button8,state8,id1); } break; case 3: var action9 = this._down; var state9 = 1; - var _g9 = 0; - while(_g9 < buttons1.length) { - var button9 = buttons1[_g9]; - ++_g9; + var _g11 = 0; + while(_g11 < buttons1.length) { + var button9 = buttons1[_g11]; + ++_g11; action9.addGamepad(button9,state9,id1); } var action10 = this._downP; var state10 = 2; - var _g10 = 0; - while(_g10 < buttons1.length) { - var button10 = buttons1[_g10]; - ++_g10; + var _g12 = 0; + while(_g12 < buttons1.length) { + var button10 = buttons1[_g12]; + ++_g12; action10.addGamepad(button10,state10,id1); } var action11 = this._downR; var state11 = -1; - var _g11 = 0; - while(_g11 < buttons1.length) { - var button11 = buttons1[_g11]; - ++_g11; + var _g13 = 0; + while(_g13 < buttons1.length) { + var button11 = buttons1[_g13]; + ++_g13; action11.addGamepad(button11,state11,id1); } break; case 4: var action12 = this._reset; var state12 = 2; - var _g12 = 0; - while(_g12 < buttons1.length) { - var button12 = buttons1[_g12]; - ++_g12; + var _g14 = 0; + while(_g14 < buttons1.length) { + var button12 = buttons1[_g14]; + ++_g14; action12.addGamepad(button12,state12,id1); } break; case 5: var action13 = this._accept; var state13 = 2; - var _g13 = 0; - while(_g13 < buttons1.length) { - var button13 = buttons1[_g13]; - ++_g13; + var _g15 = 0; + while(_g15 < buttons1.length) { + var button13 = buttons1[_g15]; + ++_g15; action13.addGamepad(button13,state13,id1); } break; case 6: var action14 = this._back; var state14 = 2; - var _g14 = 0; - while(_g14 < buttons1.length) { - var button14 = buttons1[_g14]; - ++_g14; + var _g16 = 0; + while(_g16 < buttons1.length) { + var button14 = buttons1[_g16]; + ++_g16; action14.addGamepad(button14,state14,id1); } break; case 7: var action15 = this._pause; var state15 = 2; - var _g15 = 0; - while(_g15 < buttons1.length) { - var button15 = buttons1[_g15]; - ++_g15; + var _g17 = 0; + while(_g17 < buttons1.length) { + var button15 = buttons1[_g17]; + ++_g17; action15.addGamepad(button15,state15,id1); } break; case 8: var action16 = this._cheat; var state16 = 2; - var _g16 = 0; - while(_g16 < buttons1.length) { - var button16 = buttons1[_g16]; - ++_g16; + var _g18 = 0; + while(_g18 < buttons1.length) { + var button16 = buttons1[_g18]; + ++_g18; action16.addGamepad(button16,state16,id1); } break; @@ -12140,16 +12120,12 @@ flixel_addons_ui_FlxUIState.prototype = $extend(flixel_addons_transition_FlxTran } ,_cleanupUIVars: function() { if(this._ui_vars != null) { - var h = this._ui_vars.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this._ui_vars.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = this._ui_vars; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._ui_vars = null; @@ -12275,10 +12251,6 @@ flixel_addons_ui_FlxUIState.prototype = $extend(flixel_addons_transition_FlxTran var MusicBeatState = function(TransIn,TransOut) { this.skippedFrames = 0; var color = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color &= -16711681; color |= 9699328; color &= -65281; @@ -12286,12 +12258,8 @@ var MusicBeatState = function(TransIn,TransOut) { color &= -256; color |= 211; color &= 16777215; - color |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color |= -16777216; var color1 = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color1 &= -16711681; color1 |= 4915200; color1 &= -65281; @@ -12299,12 +12267,8 @@ var MusicBeatState = function(TransIn,TransOut) { color1 &= -256; color1 |= 130; color1 &= 16777215; - color1 |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color1 |= -16777216; var color2 = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color2 &= -16711681; color2 |= 0; color2 &= -65281; @@ -12312,12 +12276,8 @@ var MusicBeatState = function(TransIn,TransOut) { color2 &= -256; color2 |= 255; color2 &= 16777215; - color2 |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color2 |= -16777216; var color3 = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color3 &= -16711681; color3 |= 0; color3 &= -65281; @@ -12325,12 +12285,8 @@ var MusicBeatState = function(TransIn,TransOut) { color3 &= -256; color3 |= 0; color3 &= 16777215; - color3 |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color3 |= -16777216; var color4 = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color4 &= -16711681; color4 |= 16711680; color4 &= -65281; @@ -12338,12 +12294,8 @@ var MusicBeatState = function(TransIn,TransOut) { color4 &= -256; color4 |= 0; color4 &= 16777215; - color4 |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color4 |= -16777216; var color5 = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color5 &= -16711681; color5 |= 16711680; color5 &= -65281; @@ -12351,12 +12303,8 @@ var MusicBeatState = function(TransIn,TransOut) { color5 &= -256; color5 |= 0; color5 &= 16777215; - color5 |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color5 |= -16777216; var color6 = flixel_util_FlxColor._new(); - var Alpha = 255; - if(Alpha == null) { - Alpha = 255; - } color6 &= -16711681; color6 |= 16711680; color6 &= -65281; @@ -12364,7 +12312,7 @@ var MusicBeatState = function(TransIn,TransOut) { color6 &= -256; color6 |= 0; color6 &= 16777215; - color6 |= (Alpha > 255 ? 255 : Alpha < 0 ? 0 : Alpha) << 24; + color6 |= -16777216; this.array = [color,color1,color2,color3,color4,color5,color6]; this.curBeat = 0; this.curStep = 0; @@ -12644,16 +12592,16 @@ var DialogueBox = function(talkingRight,dialogueList) { if(tmp) { _this.set_y((flixel_FlxG.height - _this.get_height()) / 2); } - var fh = this.portraitLeft; - fh.set_x(fh.x - 170); - var fh = this.portraitLeft; - fh.set_y(fh.y + 595); - var fh = this.portraitRight; - fh.set_x(fh.x + 200); - var fh = this.portraitRight; - fh.set_y(fh.y + 600); - var fh = this.box; - fh.set_y(fh.y + 800); + var _g = this.portraitLeft; + _g.set_x(_g.x - 170); + var _g = this.portraitLeft; + _g.set_y(_g.y + 595); + var _g = this.portraitRight; + _g.set_x(_g.x + 200); + var _g = this.portraitRight; + _g.set_y(_g.y + 600); + var _g = this.box; + _g.set_y(_g.y + 800); this.starThing = new flixel_text_FlxText(260,1050,flixel_FlxG.width * 0.6 | 0,"*",32); this.starThing.set_antialiasing(true); this.starThing.setFormat("assets/fonts/" + "DTM-Mono.otf",40,-1); @@ -13087,6 +13035,7 @@ FreeplayState.prototype = $extend(MusicBeatState.prototype,{ ,curPlaying: null ,iconArray: null ,create: function() { + flixel_FlxG.save.data.unlockedRealityCheck = true; flixel_FlxG.save.data.unlockedWoundedShooting = true; flixel_FlxG.save.data.genocideEnding = true; flixel_FlxG.save.data.pacifistEnding = true; @@ -13177,8 +13126,8 @@ FreeplayState.prototype = $extend(MusicBeatState.prototype,{ } else if(this.songs[this.curSelected].songName == "Wounded Shooting" && !flixel_FlxG.save.data.unlockedWoundedShooting) { flixel_FlxG.sound.music.set_volume(0); } else if(flixel_FlxG.sound.music._volume < 0.7) { - var fh = flixel_FlxG.sound.music; - fh.set_volume(fh._volume + 0.5 * flixel_FlxG.elapsed); + var _g = flixel_FlxG.sound.music; + _g.set_volume(_g._volume + 0.5 * flixel_FlxG.elapsed); } var a = this.lerpScore; this.lerpScore = Math.floor(a + 0.4 * (this.intendedScore - a)); @@ -13299,7 +13248,7 @@ FreeplayState.prototype = $extend(MusicBeatState.prototype,{ if(_this.keyManager.checkStatusUnsafe(80,_this.status) && this.ableToPress) { var songFormat = StringTools.replace("Cringe"," ","-"); var poop = Highscore.formatSong("Cringe",this.curDifficulty); - haxe_Log.trace(poop,{ fileName : "source/FreeplayState.hx", lineNumber : 266, className : "FreeplayState", methodName : "update"}); + haxe_Log.trace(poop,{ fileName : "source/FreeplayState.hx", lineNumber : 267, className : "FreeplayState", methodName : "update"}); PlayState.SONG = Song.loadFromJson(poop,"Cringe"); PlayState.isStoryMode = false; PlayState.storyDifficulty = this.curDifficulty; @@ -13318,7 +13267,7 @@ FreeplayState.prototype = $extend(MusicBeatState.prototype,{ songFormat = "Philly"; break; } - haxe_Log.trace(this.songs[this.curSelected].songName,{ fileName : "source/FreeplayState.hx", lineNumber : 283, className : "FreeplayState", methodName : "update"}); + haxe_Log.trace(this.songs[this.curSelected].songName,{ fileName : "source/FreeplayState.hx", lineNumber : 284, className : "FreeplayState", methodName : "update"}); if(this.songs[this.curSelected].songName == "Last Hope" && flixel_FlxG.save.data.pacifistEnding == false) { this.ableToPress = false; this.blackBox = new flixel_FlxSprite(0,0).makeGraphic(flixel_FlxG.width,flixel_FlxG.height,-16777216); @@ -13505,12 +13454,12 @@ FreeplayState.prototype = $extend(MusicBeatState.prototype,{ }); } else { var poop = Highscore.formatSong(songFormat,this.curDifficulty); - haxe_Log.trace(poop,{ fileName : "source/FreeplayState.hx", lineNumber : 409, className : "FreeplayState", methodName : "update"}); + haxe_Log.trace(poop,{ fileName : "source/FreeplayState.hx", lineNumber : 410, className : "FreeplayState", methodName : "update"}); PlayState.SONG = Song.loadFromJson(poop,this.songs[this.curSelected].songName); PlayState.isStoryMode = false; PlayState.storyDifficulty = this.curDifficulty; PlayState.storyWeek = this.songs[this.curSelected].week; - haxe_Log.trace("CUR WEEK" + PlayState.storyWeek,{ fileName : "source/FreeplayState.hx", lineNumber : 415, className : "FreeplayState", methodName : "update"}); + haxe_Log.trace("CUR WEEK" + PlayState.storyWeek,{ fileName : "source/FreeplayState.hx", lineNumber : 416, className : "FreeplayState", methodName : "update"}); var nextState = LoadingState.getNextState(new PlayState(),false); if(flixel_FlxG.game._state.switchTo(nextState)) { flixel_FlxG.game._requestedState = nextState; @@ -13963,10 +13912,10 @@ GameplayCustomizeState.prototype = $extend(MusicBeatState.prototype,{ MusicBeatState.prototype.beatHit.call(this); this.bf.playAnim("idle"); this.dad.dance(); - var fh = flixel_FlxG.camera; - fh.set_zoom(fh.zoom + 0.015); - var fh = this.camHUD; - fh.set_zoom(fh.zoom + 0.010); + var _g = flixel_FlxG.camera; + _g.set_zoom(_g.zoom + 0.015); + var _g = this.camHUD; + _g.set_zoom(_g.zoom + 0.010); haxe_Log.trace("beat",{ fileName : "source/GameplayCustomizeState.hx", lineNumber : 197, className : "GameplayCustomizeState", methodName : "beatHit"}); } ,generateStaticArrows: function(player) { @@ -13983,25 +13932,29 @@ GameplayCustomizeState.prototype = $extend(MusicBeatState.prototype,{ babyArrow.setGraphicSize(babyArrow.get_width() * 0.7 | 0); switch(Math.abs(i)) { case 0: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 0); + var _g1 = babyArrow; + _g1.set_x(_g1.x + Note.swagWidth * 0); babyArrow.animation.addByPrefix("static","arrowLEFT"); babyArrow.animation.addByPrefix("pressed","left press",24,false); babyArrow.animation.addByPrefix("confirm","left confirm",24,false); break; case 1: - babyArrow.set_x(babyArrow.x + Note.swagWidth); + var _g2 = babyArrow; + _g2.set_x(_g2.x + Note.swagWidth); babyArrow.animation.addByPrefix("static","arrowDOWN"); babyArrow.animation.addByPrefix("pressed","down press",24,false); babyArrow.animation.addByPrefix("confirm","down confirm",24,false); break; case 2: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 2); + var _g3 = babyArrow; + _g3.set_x(_g3.x + Note.swagWidth * 2); babyArrow.animation.addByPrefix("static","arrowUP"); babyArrow.animation.addByPrefix("pressed","up press",24,false); babyArrow.animation.addByPrefix("confirm","up confirm",24,false); break; case 3: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 3); + var _g4 = babyArrow; + _g4.set_x(_g4.x + Note.swagWidth * 3); babyArrow.animation.addByPrefix("static","arrowRIGHT"); babyArrow.animation.addByPrefix("pressed","right press",24,false); babyArrow.animation.addByPrefix("confirm","right confirm",24,false); @@ -14014,8 +13967,10 @@ GameplayCustomizeState.prototype = $extend(MusicBeatState.prototype,{ this.playerStrums.add(babyArrow); } babyArrow.animation.play("static"); - babyArrow.set_x(babyArrow.x + 50); - babyArrow.set_x(babyArrow.x + flixel_FlxG.width / 2 * player); + var _g5 = babyArrow; + _g5.set_x(_g5.x + 50); + var _g6 = babyArrow; + _g6.set_x(_g6.x + flixel_FlxG.width / 2 * player); this.strumLineNotes.add(babyArrow); } } @@ -14708,6 +14663,14 @@ HitGraph.prototype = $extend(openfl_display_Sprite.prototype,{ var HxOverrides = function() { }; $hxClasses["HxOverrides"] = HxOverrides; HxOverrides.__name__ = "HxOverrides"; +HxOverrides.dateStr = function(date) { + var m = date.getMonth() + 1; + var d = date.getDate(); + var h = date.getHours(); + var mi = date.getMinutes(); + var s = date.getSeconds(); + return date.getFullYear() + "-" + (m < 10 ? "0" + m : "" + m) + "-" + (d < 10 ? "0" + d : "" + d) + " " + (h < 10 ? "0" + h : "" + h) + ":" + (mi < 10 ? "0" + mi : "" + mi) + ":" + (s < 10 ? "0" + s : "" + s); +}; HxOverrides.strDate = function(s) { switch(s.length) { case 8: @@ -15222,33 +15185,33 @@ KeyBindMenu.prototype = $extend(flixel_FlxSubState.prototype,{ if(KeyBinds.gamepad) { var textStart = 0 == this.curSelected ? "> " : " "; haxe_Log.trace(this.gpKeys[0],{ fileName : "source/KeyBindMenu.hx", lineNumber : 259, className : "KeyBindMenu", methodName : "textUpdate"}); - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[0] + ": " + this.gpKeys[0] + "\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[0] + ": " + this.gpKeys[0] + "\n")); var textStart = 1 == this.curSelected ? "> " : " "; haxe_Log.trace(this.gpKeys[1],{ fileName : "source/KeyBindMenu.hx", lineNumber : 259, className : "KeyBindMenu", methodName : "textUpdate"}); - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[1] + ": " + this.gpKeys[1] + "\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[1] + ": " + this.gpKeys[1] + "\n")); var textStart = 2 == this.curSelected ? "> " : " "; haxe_Log.trace(this.gpKeys[2],{ fileName : "source/KeyBindMenu.hx", lineNumber : 259, className : "KeyBindMenu", methodName : "textUpdate"}); - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[2] + ": " + this.gpKeys[2] + "\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[2] + ": " + this.gpKeys[2] + "\n")); var textStart = 3 == this.curSelected ? "> " : " "; haxe_Log.trace(this.gpKeys[3],{ fileName : "source/KeyBindMenu.hx", lineNumber : 259, className : "KeyBindMenu", methodName : "textUpdate"}); - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[3] + ": " + this.gpKeys[3] + "\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[3] + ": " + this.gpKeys[3] + "\n")); } else { var textStart = 0 == this.curSelected ? "> " : " "; - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[0] + ": " + (this.keys[0] != this.keyText[0] ? this.keys[0] + " / " : "") + this.keyText[0] + " ARROW\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[0] + ": " + (this.keys[0] != this.keyText[0] ? this.keys[0] + " / " : "") + this.keyText[0] + " ARROW\n")); var textStart = 1 == this.curSelected ? "> " : " "; - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[1] + ": " + (this.keys[1] != this.keyText[1] ? this.keys[1] + " / " : "") + this.keyText[1] + " ARROW\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[1] + ": " + (this.keys[1] != this.keyText[1] ? this.keys[1] + " / " : "") + this.keyText[1] + " ARROW\n")); var textStart = 2 == this.curSelected ? "> " : " "; - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[2] + ": " + (this.keys[2] != this.keyText[2] ? this.keys[2] + " / " : "") + this.keyText[2] + " ARROW\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[2] + ": " + (this.keys[2] != this.keyText[2] ? this.keys[2] + " / " : "") + this.keyText[2] + " ARROW\n")); var textStart = 3 == this.curSelected ? "> " : " "; - var fh = this.keyTextDisplay; - fh.set_text(fh.text + (textStart + this.keyText[3] + ": " + (this.keys[3] != this.keyText[3] ? this.keys[3] + " / " : "") + this.keyText[3] + " ARROW\n")); + var _g = this.keyTextDisplay; + _g.set_text(_g.text + (textStart + this.keyText[3] + ": " + (this.keys[3] != this.keyText[3] ? this.keys[3] + " / " : "") + this.keyText[3] + " ARROW\n")); } var _this = this.keyTextDisplay; var axes = flixel_util_FlxAxes.XY; @@ -15936,14 +15899,10 @@ MultiCallback.prototype = { } ,getUnfired: function() { var _g = []; - var h = this.unfired.h; - var id_h = h; - var id_keys = Object.keys(h); - var id_length = id_keys.length; - var id_current = 0; - while(id_current < id_length) { - var id = id_keys[id_current++]; - _g.push(id); + var id = haxe_ds_StringMap.keysIterator(this.unfired.h); + while(id.hasNext()) { + var id1 = id.next(); + _g.push(id1); } return _g; } @@ -16135,8 +16094,8 @@ MainMenuState.prototype = $extend(MusicBeatState.prototype,{ ,update: function(elapsed) { var _gthis = this; if(flixel_FlxG.sound.music._volume < 0.8) { - var fh = flixel_FlxG.sound.music; - fh.set_volume(fh._volume + 0.5 * flixel_FlxG.elapsed); + var _g = flixel_FlxG.sound.music; + _g.set_volume(_g._volume + 0.5 * flixel_FlxG.elapsed); } if(!this.selectedSomethin) { if(this.optionShit[this.curSelected] == "story") { @@ -17147,8 +17106,10 @@ var Note = function(strumTime,noteData,prevNote,sustainNote,noteType) { this.noteType = noteType; this.prevNote = prevNote; this.isSustainNote = sustainNote; - this.set_x(this.x + 50); - this.set_y(this.y - 2000); + var _g = this; + _g.set_x(_g.x + 50); + var _g = this; + _g.set_y(_g.y - 2000); this.strumTime = strumTime; if(this.strumTime < 0) { this.strumTime = 0; @@ -17293,19 +17254,23 @@ var Note = function(strumTime,noteData,prevNote,sustainNote,noteType) { } switch(noteData) { case 0: - this.set_x(this.x + Note.swagWidth * 0); + var _g = this; + _g.set_x(_g.x + Note.swagWidth * 0); this.animation.play("purpleScroll"); break; case 1: - this.set_x(this.x + Note.swagWidth); + var _g = this; + _g.set_x(_g.x + Note.swagWidth); this.animation.play("blueScroll"); break; case 2: - this.set_x(this.x + Note.swagWidth * 2); + var _g = this; + _g.set_x(_g.x + Note.swagWidth * 2); this.animation.play("greenScroll"); break; case 3: - this.set_x(this.x + Note.swagWidth * 3); + var _g = this; + _g.set_x(_g.x + Note.swagWidth * 3); this.animation.play("redScroll"); break; } @@ -17314,7 +17279,8 @@ var Note = function(strumTime,noteData,prevNote,sustainNote,noteType) { } if(this.isSustainNote && prevNote != null) { this.set_alpha(0.6); - this.set_x(this.x + this.get_width() / 2); + var _g = this; + _g.set_x(_g.x + this.get_width() / 2); switch(noteData) { case 0: this.animation.play("purpleholdend"); @@ -17330,9 +17296,11 @@ var Note = function(strumTime,noteData,prevNote,sustainNote,noteType) { break; } this.updateHitbox(); - this.set_x(this.x - this.get_width() / 2); + var _g = this; + _g.set_x(_g.x - this.get_width() / 2); if(StringTools.startsWith(PlayState.curStage,"school")) { - this.set_x(this.x + 30); + var _g = this; + _g.set_x(_g.x + 30); } if(prevNote.isSustainNote) { switch(prevNote.noteData) { @@ -17351,22 +17319,22 @@ var Note = function(strumTime,noteData,prevNote,sustainNote,noteType) { } if(flixel_FlxG.save.data.scrollSpeed != 1) { if(flixel_FlxG.save.data.downscroll) { - var fh = prevNote.scale; - fh.set_y(fh.y * (Conductor.stepCrochet / 120 * 1.9 * flixel_FlxG.save.data.scrollSpeed)); + var _g = prevNote.scale; + _g.set_y(_g.y * (Conductor.stepCrochet / 120 * 1.9 * flixel_FlxG.save.data.scrollSpeed)); prevNote.set_alpha(0.6); } else { - var fh = prevNote.scale; - fh.set_y(fh.y * (Conductor.stepCrochet / 100 * 2.8 * flixel_FlxG.save.data.scrollSpeed)); + var _g = prevNote.scale; + _g.set_y(_g.y * (Conductor.stepCrochet / 100 * 2.8 * flixel_FlxG.save.data.scrollSpeed)); prevNote.set_alpha(0.6); } } else if(flixel_FlxG.save.data.downscroll) { - var fh = prevNote.scale; - fh.set_y(fh.y * (Conductor.stepCrochet / 120 * 1.9 * PlayState.SONG.speed)); + var _g = prevNote.scale; + _g.set_y(_g.y * (Conductor.stepCrochet / 120 * 1.9 * PlayState.SONG.speed)); prevNote.set_alpha(0.6); prevNote.updateHitbox(); } else { - var fh = prevNote.scale; - fh.set_y(fh.y * (Conductor.stepCrochet / 100 * 2.8 * PlayState.SONG.speed)); + var _g = prevNote.scale; + _g.set_y(_g.y * (Conductor.stepCrochet / 100 * 2.8 * PlayState.SONG.speed)); prevNote.set_alpha(0.6); prevNote.updateHitbox(); } @@ -18479,13 +18447,15 @@ var PauseSubState = function(x,y) { bg.scrollFactor.set(); this.add(bg); var levelInfo = new flixel_text_FlxText(20,15,0,"",32); - levelInfo.set_text(levelInfo.text + PlayState.SONG.song); + var _g = levelInfo; + _g.set_text(_g.text + PlayState.SONG.song); levelInfo.scrollFactor.set(); levelInfo.setFormat("assets/fonts/" + "vcr.ttf",32); levelInfo.updateHitbox(); this.add(levelInfo); var levelDifficulty = new flixel_text_FlxText(20,47,0,"",32); - levelDifficulty.set_text(levelDifficulty.text + CoolUtil.difficultyFromInt(PlayState.storyDifficulty).toUpperCase()); + var _g = levelDifficulty; + _g.set_text(_g.text + CoolUtil.difficultyFromInt(PlayState.storyDifficulty).toUpperCase()); levelDifficulty.scrollFactor.set(); levelDifficulty.setFormat("assets/fonts/" + "vcr.ttf",32); levelDifficulty.updateHitbox(); @@ -18526,8 +18496,8 @@ PauseSubState.prototype = $extend(MusicBeatSubstate.prototype,{ ,offsetChanged: null ,update: function(elapsed) { if(this.pauseMusic._volume < 0.5) { - var fh = this.pauseMusic; - fh.set_volume(fh._volume + 0.01 * elapsed); + var _g = this.pauseMusic; + _g.set_volume(_g._volume + 0.01 * elapsed); } MusicBeatSubstate.prototype.update.call(this,elapsed); if(PlayState.instance.useVideo) { @@ -19887,36 +19857,39 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ camPos.set(PlayState.dad.getGraphicMidpoint().x + 300,PlayState.dad.getGraphicMidpoint().y); break; case "dad": - camPos.set_x(camPos.x + 400); + var _g = camPos; + _g.set_x(_g.x + 400); break; case "gf": PlayState.dad.setPosition(PlayState.gf.x,PlayState.gf.y); PlayState.gf.set_visible(false); if(PlayState.isStoryMode) { - camPos.set_x(camPos.x + 600); + var _g = camPos; + _g.set_x(_g.x + 600); this.tweenCamIn(); } break; case "monster": - var fh = PlayState.dad; - fh.set_y(fh.y + 100); + var _g = PlayState.dad; + _g.set_y(_g.y + 100); break; case "monster-christmas": - var fh = PlayState.dad; - fh.set_y(fh.y + 130); + var _g = PlayState.dad; + _g.set_y(_g.y + 130); break; case "paps": PlayState.dad.setPosition(-29.3,-86); camPos.set(PlayState.dad.getGraphicMidpoint().x + 300,PlayState.dad.getGraphicMidpoint().y); break; case "parents-christmas": - var fh = PlayState.dad; - fh.set_x(fh.x - 500); + var _g = PlayState.dad; + _g.set_x(_g.x - 500); break; case "pico": - camPos.set_x(camPos.x + 600); - var fh = PlayState.dad; - fh.set_y(fh.y + 300); + var _g = camPos; + _g.set_x(_g.x + 600); + var _g = PlayState.dad; + _g.set_y(_g.y + 300); break; case "sans": PlayState.dad.setPosition(162.4,76.65); @@ -19935,29 +19908,29 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ camPos.set(PlayState.dad.getGraphicMidpoint().x + 200,PlayState.dad.getGraphicMidpoint().y - 50); break; case "senpai": - var fh = PlayState.dad; - fh.set_x(fh.x + 150); - var fh = PlayState.dad; - fh.set_y(fh.y + 360); + var _g = PlayState.dad; + _g.set_x(_g.x + 150); + var _g = PlayState.dad; + _g.set_y(_g.y + 360); camPos.set(PlayState.dad.getGraphicMidpoint().x + 300,PlayState.dad.getGraphicMidpoint().y); break; case "senpai-angry": - var fh = PlayState.dad; - fh.set_x(fh.x + 150); - var fh = PlayState.dad; - fh.set_y(fh.y + 360); + var _g = PlayState.dad; + _g.set_x(_g.x + 150); + var _g = PlayState.dad; + _g.set_y(_g.y + 360); camPos.set(PlayState.dad.getGraphicMidpoint().x + 300,PlayState.dad.getGraphicMidpoint().y); break; case "spirit": - var fh = PlayState.dad; - fh.set_x(fh.x - 150); - var fh = PlayState.dad; - fh.set_y(fh.y + 100); + var _g = PlayState.dad; + _g.set_x(_g.x - 150); + var _g = PlayState.dad; + _g.set_y(_g.y + 100); camPos.set(PlayState.dad.getGraphicMidpoint().x + 300,PlayState.dad.getGraphicMidpoint().y); break; case "spooky": - var fh = PlayState.dad; - fh.set_y(fh.y + 200); + var _g = PlayState.dad; + _g.set_y(_g.y + 200); break; } PlayState.boyfriend = new Boyfriend(770,450,PlayState.SONG.player1); @@ -19975,48 +19948,48 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ PlayState.gf.setPosition(638.2,125.6); break; case "limo": - var fh = PlayState.boyfriend; - fh.set_y(fh.y - 220); - var fh = PlayState.boyfriend; - fh.set_x(fh.x + 260); + var _g = PlayState.boyfriend; + _g.set_y(_g.y - 220); + var _g = PlayState.boyfriend; + _g.set_x(_g.x + 260); if(flixel_FlxG.save.data.distractions) { this.resetFastCar(); this.add(this.fastCar); } break; case "mall": - var fh = PlayState.boyfriend; - fh.set_x(fh.x + 200); + var _g = PlayState.boyfriend; + _g.set_x(_g.x + 200); break; case "mallEvil": - var fh = PlayState.boyfriend; - fh.set_x(fh.x + 320); - var fh = PlayState.dad; - fh.set_y(fh.y - 80); + var _g = PlayState.boyfriend; + _g.set_x(_g.x + 320); + var _g = PlayState.dad; + _g.set_y(_g.y - 80); break; case "school": - var fh = PlayState.boyfriend; - fh.set_x(fh.x + 200); - var fh = PlayState.boyfriend; - fh.set_y(fh.y + 220); - var fh = PlayState.gf; - fh.set_x(fh.x + 180); - var fh = PlayState.gf; - fh.set_y(fh.y + 300); + var _g = PlayState.boyfriend; + _g.set_x(_g.x + 200); + var _g = PlayState.boyfriend; + _g.set_y(_g.y + 220); + var _g = PlayState.gf; + _g.set_x(_g.x + 180); + var _g = PlayState.gf; + _g.set_y(_g.y + 300); break; case "schoolEvil": if(flixel_FlxG.save.data.distractions) { var evilTrail = new flixel_addons_effects_FlxTrail(PlayState.dad,null,4,24,0.3,0.069); this.add(evilTrail); } - var fh = PlayState.boyfriend; - fh.set_x(fh.x + 200); - var fh = PlayState.boyfriend; - fh.set_y(fh.y + 220); - var fh = PlayState.gf; - fh.set_x(fh.x + 180); - var fh = PlayState.gf; - fh.set_y(fh.y + 300); + var _g = PlayState.boyfriend; + _g.set_x(_g.x + 200); + var _g = PlayState.boyfriend; + _g.set_y(_g.y + 220); + var _g = PlayState.gf; + _g.set_x(_g.x + 180); + var _g = PlayState.gf; + _g.set_y(_g.y + 300); break; case "snowdin_cave": if(PlayState.boyfriend.curCharacter == "pico") { @@ -20160,7 +20133,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ this.add(PlayState.songPosBar); var songName = new flixel_text_FlxText(PlayState.songPosBG.x + PlayState.songPosBG.get_width() / 2 - PlayState.SONG.song.length * 5,PlayState.songPosBG.y,0,PlayState.SONG.song,16); if(PlayStateChangeables.useDownscroll) { - songName.set_y(songName.y - 3); + var _g = songName; + _g.set_y(_g.y - 3); } songName.setFormat("assets/fonts/" + "vcr.ttf",16,-1,"right",flixel_text_FlxTextBorderStyle.OUTLINE,-16777216); songName.scrollFactor.set(); @@ -20410,15 +20384,11 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ introAssets_h["schoolEvil"] = ["weeb/pixelUI/ready-pixel","weeb/pixelUI/set-pixel","weeb/pixelUI/date-pixel"]; var introAlts = introAssets_h["default"]; var altSuffix = ""; - var h = introAssets_h; - var value_h = h; - var value_keys = Object.keys(h); - var value_length = value_keys.length; - var value_current = 0; - while(value_current < value_length) { - var value = value_keys[value_current++]; - if(value == PlayState.curStage) { - introAlts = introAssets_h[value]; + var value = haxe_ds_StringMap.keysIterator(introAssets_h); + while(value.hasNext()) { + var value1 = value.next(); + if(value1 == PlayState.curStage) { + introAlts = introAssets_h[value1]; altSuffix = "-pixel"; } } @@ -20457,7 +20427,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ ready.set_y((flixel_FlxG.height - ready.get_height()) / 2); } _gthis.add(ready); - flixel_tweens_FlxTween.tween(ready,{ y : ready.set_y(ready.y + 100), alpha : 0},Conductor.crochet / 1000,{ ease : flixel_tweens_FlxEase.cubeInOut, onComplete : function(twn) { + var _g = ready; + flixel_tweens_FlxTween.tween(ready,{ y : _g.set_y(_g.y + 100), alpha : 0},Conductor.crochet / 1000,{ ease : flixel_tweens_FlxEase.cubeInOut, onComplete : function(twn) { ready.destroy(); }}); flixel_FlxG.sound.play(Paths.sound("intro2" + altSuffix),0.6); @@ -20492,7 +20463,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ set.set_y((flixel_FlxG.height - set.get_height()) / 2); } _gthis.add(set); - flixel_tweens_FlxTween.tween(set,{ y : set.set_y(set.y + 100), alpha : 0},Conductor.crochet / 1000,{ ease : flixel_tweens_FlxEase.cubeInOut, onComplete : function(twn) { + var _g = set; + flixel_tweens_FlxTween.tween(set,{ y : _g.set_y(_g.y + 100), alpha : 0},Conductor.crochet / 1000,{ ease : flixel_tweens_FlxEase.cubeInOut, onComplete : function(twn) { set.destroy(); }}); flixel_FlxG.sound.play(Paths.sound("intro1" + altSuffix),0.6); @@ -20528,7 +20500,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ go.set_y((flixel_FlxG.height - go.get_height()) / 2); } _gthis.add(go); - flixel_tweens_FlxTween.tween(go,{ y : go.set_y(go.y + 100), alpha : 0},Conductor.crochet / 1000,{ ease : flixel_tweens_FlxEase.cubeInOut, onComplete : function(twn) { + var _g = go; + flixel_tweens_FlxTween.tween(go,{ y : _g.set_y(_g.y + 100), alpha : 0},Conductor.crochet / 1000,{ ease : flixel_tweens_FlxEase.cubeInOut, onComplete : function(twn) { go.destroy(); }}); flixel_FlxG.sound.play(Paths.sound("introGo" + altSuffix),0.6); @@ -20543,19 +20516,13 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ ,lastReportedPlayheadPosition: null ,songTime: null ,getKey: function(charCode) { - var h = flixel_input_keyboard_FlxKey.fromStringMap.h; - var _g_h = h; - var _g_keys = Object.keys(h); - var _g_length = _g_keys.length; - var _g_current = 0; - while(_g_current < _g_length) { - var key = _g_keys[_g_current++]; - var _g1_key = key; - var _g1_value = _g_h[key]; - var key1 = _g1_key; - var value = _g1_value; + var _g = haxe_ds_StringMap.kvIterator(flixel_input_keyboard_FlxKey.fromStringMap.h); + while(_g.hasNext()) { + var _g1 = _g.next(); + var key = _g1.key; + var value = _g1.value; if(charCode == value) { - return key1; + return key; } } return null; @@ -21096,7 +21063,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ this.add(PlayState.songPosBar); var songName = new flixel_text_FlxText(PlayState.songPosBG.x + PlayState.songPosBG.get_width() / 2 - PlayState.SONG.song.length * 5,PlayState.songPosBG.y,0,PlayState.SONG.song,16); if(PlayStateChangeables.useDownscroll) { - songName.set_y(songName.y - 3); + var _g = songName; + _g.set_y(_g.y - 3); } songName.setFormat("assets/fonts/" + "vcr.ttf",16,-1,"right",flixel_text_FlxTextBorderStyle.OUTLINE,-16777216); songName.scrollFactor.set(); @@ -21197,12 +21165,14 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ this.unspawnNotes.push(sustainNote); sustainNote.mustPress = gottaHitNote; if(sustainNote.mustPress) { - sustainNote.set_x(sustainNote.x + flixel_FlxG.width / 2); + var _g5 = sustainNote; + _g5.set_x(_g5.x + flixel_FlxG.width / 2); } } swagNote.mustPress = gottaHitNote; if(swagNote.mustPress) { - swagNote.set_x(swagNote.x + flixel_FlxG.width / 2); + var _g6 = swagNote; + _g6.set_x(_g6.x + flixel_FlxG.width / 2); } } ++daBeats; @@ -21252,25 +21222,29 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ babyArrow.setGraphicSize(babyArrow.get_width() * 0.7 | 0); switch(Math.abs(i)) { case 0: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 0); + var _g1 = babyArrow; + _g1.set_x(_g1.x + Note.swagWidth * 0); babyArrow.animation.addByPrefix("static","arrowLEFT"); babyArrow.animation.addByPrefix("pressed","left press",24,false); babyArrow.animation.addByPrefix("confirm","left confirm",24,false); break; case 1: - babyArrow.set_x(babyArrow.x + Note.swagWidth); + var _g2 = babyArrow; + _g2.set_x(_g2.x + Note.swagWidth); babyArrow.animation.addByPrefix("static","arrowDOWN"); babyArrow.animation.addByPrefix("pressed","down press",24,false); babyArrow.animation.addByPrefix("confirm","down confirm",24,false); break; case 2: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 2); + var _g3 = babyArrow; + _g3.set_x(_g3.x + Note.swagWidth * 2); babyArrow.animation.addByPrefix("static","arrowUP"); babyArrow.animation.addByPrefix("pressed","up press",24,false); babyArrow.animation.addByPrefix("confirm","up confirm",24,false); break; case 3: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 3); + var _g4 = babyArrow; + _g4.set_x(_g4.x + Note.swagWidth * 3); babyArrow.animation.addByPrefix("static","arrowRIGHT"); babyArrow.animation.addByPrefix("pressed","right press",24,false); babyArrow.animation.addByPrefix("confirm","right confirm",24,false); @@ -21288,25 +21262,29 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ babyArrow.set_antialiasing(false); switch(Math.abs(i)) { case 0: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 0); + var _g5 = babyArrow; + _g5.set_x(_g5.x + Note.swagWidth * 0); babyArrow.animation.add("static",[0]); babyArrow.animation.add("pressed",[4,8],12,false); babyArrow.animation.add("confirm",[12,16],24,false); break; case 1: - babyArrow.set_x(babyArrow.x + Note.swagWidth); + var _g6 = babyArrow; + _g6.set_x(_g6.x + Note.swagWidth); babyArrow.animation.add("static",[1]); babyArrow.animation.add("pressed",[5,9],12,false); babyArrow.animation.add("confirm",[13,17],24,false); break; case 2: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 2); + var _g7 = babyArrow; + _g7.set_x(_g7.x + Note.swagWidth * 2); babyArrow.animation.add("static",[2]); babyArrow.animation.add("pressed",[6,10],12,false); babyArrow.animation.add("confirm",[14,18],12,false); break; case 3: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 3); + var _g8 = babyArrow; + _g8.set_x(_g8.x + Note.swagWidth * 3); babyArrow.animation.add("static",[3]); babyArrow.animation.add("pressed",[7,11],12,false); babyArrow.animation.add("confirm",[15,19],24,false); @@ -21324,25 +21302,29 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ babyArrow.setGraphicSize(babyArrow.get_width() * 0.7 | 0); switch(Math.abs(i)) { case 0: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 0); + var _g9 = babyArrow; + _g9.set_x(_g9.x + Note.swagWidth * 0); babyArrow.animation.addByPrefix("static","arrowLEFT"); babyArrow.animation.addByPrefix("pressed","left press",24,false); babyArrow.animation.addByPrefix("confirm","left confirm",24,false); break; case 1: - babyArrow.set_x(babyArrow.x + Note.swagWidth); + var _g10 = babyArrow; + _g10.set_x(_g10.x + Note.swagWidth); babyArrow.animation.addByPrefix("static","arrowDOWN"); babyArrow.animation.addByPrefix("pressed","down press",24,false); babyArrow.animation.addByPrefix("confirm","down confirm",24,false); break; case 2: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 2); + var _g11 = babyArrow; + _g11.set_x(_g11.x + Note.swagWidth * 2); babyArrow.animation.addByPrefix("static","arrowUP"); babyArrow.animation.addByPrefix("pressed","up press",24,false); babyArrow.animation.addByPrefix("confirm","up confirm",24,false); break; case 3: - babyArrow.set_x(babyArrow.x + Note.swagWidth * 3); + var _g12 = babyArrow; + _g12.set_x(_g12.x + Note.swagWidth * 3); babyArrow.animation.addByPrefix("static","arrowRIGHT"); babyArrow.animation.addByPrefix("pressed","right press",24,false); babyArrow.animation.addByPrefix("confirm","right confirm",24,false); @@ -21352,7 +21334,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ babyArrow.updateHitbox(); babyArrow.scrollFactor.set(); if(!PlayState.isStoryMode) { - babyArrow.set_y(babyArrow.y - 10); + var _g13 = babyArrow; + _g13.set_y(_g13.y - 10); babyArrow.set_alpha(0); flixel_tweens_FlxTween.tween(babyArrow,{ y : babyArrow.y + 10, alpha : 1},1,{ ease : flixel_tweens_FlxEase.circOut, startDelay : 0.5 + 0.2 * i}); } @@ -21366,10 +21349,13 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ break; } babyArrow.animation.play("static"); - babyArrow.set_x(babyArrow.x + 50); - babyArrow.set_x(babyArrow.x + flixel_FlxG.width / 2 * player); + var _g14 = babyArrow; + _g14.set_x(_g14.x + 50); + var _g15 = babyArrow; + _g15.set_x(_g15.x + flixel_FlxG.width / 2 * player); if(PlayStateChangeables.Optimize) { - babyArrow.set_x(babyArrow.x - 275); + var _g16 = babyArrow; + _g16.set_x(_g16.x - 275); } PlayState.cpuStrums.forEach(function(spr) { spr.centerOffsets(); @@ -21491,8 +21477,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ PlayState.hit.set_visible(true); new flixel_util_FlxTimer().start(0.5,function(swagTimer) { new flixel_util_FlxTimer().start(0.01,function(swagTimer) { - var fh = PlayState.hit; - fh.set_alpha(fh.alpha - 0.01); + var _g = PlayState.hit; + _g.set_alpha(_g.alpha - 0.01); if(PlayState.hit.alpha > 0) { swagTimer.reset(); } @@ -21504,8 +21490,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ PlayState.isAttacking = true; new flixel_util_FlxTimer().start(0.5,function(swagTimer) { new flixel_util_FlxTimer().start(0.01,function(swagTimer) { - var fh = PlayState.miss; - fh.set_alpha(fh.alpha - 0.01); + var _g = PlayState.miss; + _g.set_alpha(_g.alpha - 0.01); if(PlayState.miss.alpha > 0) { swagTimer.reset(); } @@ -21904,9 +21890,11 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ } if(daNote.isSustainNote) { if(StringTools.endsWith(daNote.animation._curAnim.name,"end") && daNote.prevNote != null) { - daNote.set_y(daNote.y + daNote.prevNote.get_height()); + var _g = daNote; + _g.set_y(_g.y + daNote.prevNote.get_height()); } else { - daNote.set_y(daNote.y + daNote.get_height() / 2); + var _g = daNote; + _g.set_y(_g.y + daNote.get_height() / 2); } if(!PlayStateChangeables.botPlay) { if((!daNote.mustPress || daNote.wasGoodHit || daNote.prevNote.wasGoodHit && !daNote.canBeHit) && daNote.y - daNote.offset.y * daNote.scale.y + daNote.get_height() >= _gthis.strumLine.y + Note.swagWidth / 2) { @@ -21929,7 +21917,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ daNote.set_y(PlayState.strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].y - 0.45 * (Conductor.songPosition - daNote.strumTime) * flixel_math_FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed,2)); } if(daNote.isSustainNote) { - daNote.set_y(daNote.y - daNote.get_height() / 2); + var _g = daNote; + _g.set_y(_g.y - daNote.get_height() / 2); if(!PlayStateChangeables.botPlay) { if((!daNote.mustPress || daNote.wasGoodHit || daNote.prevNote.wasGoodHit && !daNote.canBeHit) && daNote.y + daNote.offset.y * daNote.scale.y <= _gthis.strumLine.y + Note.swagWidth / 2) { var swagRect = new flixel_math_FlxRect(0,0,daNote.get_width() / daNote.scale.x,daNote.get_height() / daNote.scale.y); @@ -21977,10 +21966,10 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ } if(spr.animation._curAnim.name == "confirm" && !StringTools.startsWith(PlayState.curStage,"school")) { spr.centerOffsets(); - var fh = spr.offset; - fh.set_x(fh.x - 13); - var fh = spr.offset; - fh.set_y(fh.y - 13); + var _g = spr.offset; + _g.set_x(_g.x - 13); + var _g = spr.offset; + _g.set_y(_g.y - 13); } else { spr.centerOffsets(); } @@ -22011,7 +22000,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ daNote.set_alpha(PlayState.strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].alpha); } if(daNote.isSustainNote) { - daNote.set_x(daNote.x + (daNote.get_width() / 2 + 17)); + var _g = daNote; + _g.set_x(_g.x + (daNote.get_width() / 2 + 17)); } if((daNote.mustPress && daNote.tooLate && !PlayStateChangeables.useDownscroll || daNote.mustPress && daNote.tooLate && PlayStateChangeables.useDownscroll) && daNote.mustPress) { if(daNote.isSustainNote && daNote.wasGoodHit) { @@ -22282,7 +22272,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ coolText.set_y((flixel_FlxG.height - coolText.get_height()) / 2); } coolText.set_x(flixel_FlxG.width * 0.55); - coolText.set_y(coolText.y - 350); + var _g = coolText; + _g.set_y(_g.y - 350); coolText.set_cameras([this.camHUD]); var rating = new flixel_FlxSprite(); var score = 350; @@ -22411,17 +22402,18 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ if(tmp) { rating.set_y((flixel_FlxG.height - rating.get_height()) / 2); } - rating.set_y(rating.y - 50); + var _g = rating; + _g.set_y(_g.y - 50); rating.set_x(coolText.x - 125); if(flixel_FlxG.save.data.changedHit) { rating.set_x(flixel_FlxG.save.data.changedHitX); rating.set_y(flixel_FlxG.save.data.changedHitY); } rating.acceleration.set_y(550); - var fh = rating.velocity; - fh.set_y(fh.y - flixel_FlxG.random.int(140,175)); - var fh = rating.velocity; - fh.set_x(fh.x - flixel_FlxG.random.int(0,10)); + var _g = rating.velocity; + _g.set_y(_g.y - flixel_FlxG.random.int(140,175)); + var _g = rating.velocity; + _g.set_x(_g.x - flixel_FlxG.random.int(0,10)); var msTiming = HelperFunctions.truncateFloat(noteDiff,3); if(PlayStateChangeables.botPlay && !PlayState.loadRep) { msTiming = 0; @@ -22502,8 +22494,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ comboSpr.set_x(rating.x); comboSpr.set_y(rating.y + 100); comboSpr.acceleration.set_y(600); - var fh = comboSpr.velocity; - fh.set_y(fh.y - 150); + var _g = comboSpr.velocity; + _g.set_y(_g.y - 150); var _this = this.currentTimingShown; var axes = flixel_util_FlxAxes.XY; var tmp; @@ -22531,12 +22523,12 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ this.currentTimingShown.set_x(comboSpr.x + 100); this.currentTimingShown.set_y(rating.y + 100); this.currentTimingShown.acceleration.set_y(600); - var fh = this.currentTimingShown.velocity; - fh.set_y(fh.y - 150); - var fh = comboSpr.velocity; - fh.set_x(fh.x + flixel_FlxG.random.int(1,10)); - var fh = this.currentTimingShown.velocity; - fh.set_x(fh.x + comboSpr.velocity.x); + var _g = this.currentTimingShown.velocity; + _g.set_y(_g.y - 150); + var _g = comboSpr.velocity; + _g.set_x(_g.x + flixel_FlxG.random.int(1,10)); + var _g = this.currentTimingShown.velocity; + _g.set_x(_g.x + comboSpr.velocity.x); if(!PlayStateChangeables.botPlay || PlayState.loadRep) { this.add(rating); } @@ -22613,8 +22605,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ } numScore[0].updateHitbox(); numScore[0].acceleration.set_y(flixel_FlxG.random.int(200,300)); - var fh = numScore[0].velocity; - fh.set_y(fh.y - flixel_FlxG.random.int(140,160)); + var _g1 = numScore[0].velocity; + _g1.set_y(_g1.y - flixel_FlxG.random.int(140,160)); numScore[0].velocity.set_x(flixel_FlxG.random.float(-5,5)); this.add(numScore[0]); flixel_tweens_FlxTween.tween(numScore[0],{ alpha : 0},0.2,{ onComplete : (function(numScore) { @@ -22627,8 +22619,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ coolText.set_text(Std.string(seperatedScore)); flixel_tweens_FlxTween.tween(rating,{ alpha : 0},0.2,{ startDelay : Conductor.crochet * 0.001, onUpdate : function(tween) { if(_gthis.currentTimingShown != null) { - var fh = _gthis.currentTimingShown; - fh.set_alpha(fh.alpha - 0.02); + var _g = _gthis.currentTimingShown; + _g.set_alpha(_g.alpha - 0.02); } _gthis.timeShown++; }}); @@ -22803,10 +22795,10 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ } if(spr.animation._curAnim.name == "confirm" && !StringTools.startsWith(PlayState.curStage,"school")) { spr.centerOffsets(); - var fh = spr.offset; - fh.set_x(fh.x - 13); - var fh = spr.offset; - fh.set_y(fh.y - 13); + var _g = spr.offset; + _g.set_x(_g.x - 13); + var _g = spr.offset; + _g.set_y(_g.y - 13); } else { spr.centerOffsets(); } @@ -23029,16 +23021,16 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ haxe_Log.trace("done",{ fileName : "source/PlayState.hx", lineNumber : 4421, className : "PlayState", methodName : "PhantomEffect"}); new flixel_util_FlxTimer().start(10,function(swagTimer) { new flixel_util_FlxTimer().start(0.01,function(swagTimer) { - var fh = _gthis.camHUD; - fh.set_alpha(fh.alpha + 0.01); + var _g = _gthis.camHUD; + _g.set_alpha(_g.alpha + 0.01); if(_gthis.camHUD.alpha != 1) { swagTimer.reset(); } }); }); } else { - var fh = _gthis.camHUD; - fh.set_alpha(fh.alpha - 0.01); + var _g = _gthis.camHUD; + _g.set_alpha(_g.alpha - 0.01); swagTimer.reset(); haxe_Log.trace("repeat",{ fileName : "source/PlayState.hx", lineNumber : 4438, className : "PlayState", methodName : "PhantomEffect"}); } @@ -23230,8 +23222,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ PlayState.gf.playAnim("hairBlow"); } if(this.startedMoving) { - var fh = this.phillyTrain; - fh.set_x(fh.x - 400); + var _g = this.phillyTrain; + _g.set_x(_g.x - 400); if(this.phillyTrain.x < -2000 && !this.trainFinishing) { this.phillyTrain.set_x(-1150); this.trainCars -= 1; @@ -23630,10 +23622,10 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ break; case 1800: new flixel_util_FlxTimer().start(0.1,function(swagTimer) { - var fh = PlayState.dad; - fh.set_alpha(fh.alpha - 0.01); - var fh = _gthis.iconP2; - fh.set_alpha(fh.alpha - 0.01); + var _g = PlayState.dad; + _g.set_alpha(_g.alpha - 0.01); + var _g = _gthis.iconP2; + _g.set_alpha(_g.alpha - 0.01); swagTimer.reset(); }); break; @@ -23688,8 +23680,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ PlayState.blackthing.set_visible(true); new flixel_util_FlxTimer().start(0.1,function(swagTimer) { if(PlayState.blackthing.alpha < 1) { - var fh = PlayState.blackthing; - fh.set_alpha(fh.alpha + 0.03); + var _g = PlayState.blackthing; + _g.set_alpha(_g.alpha + 0.03); swagTimer.reset(); } }); @@ -23704,8 +23696,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ this.add(PlayState.dad); PlayState.papyrus.setPosition(-298.7,-275.95); new flixel_util_FlxTimer().start(0.1,function(swagTimer) { - var fh = PlayState.papyrus; - fh.set_alpha(fh.alpha + 0.1); + var _g = PlayState.papyrus; + _g.set_alpha(_g.alpha + 0.1); if(PlayState.papyrus.alpha < 0.7) { swagTimer.reset(); } @@ -23714,8 +23706,8 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ case 1821: new flixel_util_FlxTimer().start(0.1,function(swagTimer) { if(PlayState.blackthing.alpha > 0) { - var fh = PlayState.blackthing; - fh.set_alpha(fh.alpha - 0.1); + var _g = PlayState.blackthing; + _g.set_alpha(_g.alpha - 0.1); swagTimer.reset(); } }); @@ -23809,16 +23801,16 @@ PlayState.prototype = $extend(MusicBeatState.prototype,{ this.wiggleShit.update(Conductor.crochet); if(flixel_FlxG.save.data.camzoom) { if(this.curSong.toLowerCase() == "milf" && this.curBeat >= 168 && this.curBeat < 200 && this.camZooming && flixel_FlxG.camera.zoom < 1.35) { - var fh = flixel_FlxG.camera; - fh.set_zoom(fh.zoom + 0.015); - var fh = this.camHUD; - fh.set_zoom(fh.zoom + 0.03); + var _g1 = flixel_FlxG.camera; + _g1.set_zoom(_g1.zoom + 0.015); + var _g1 = this.camHUD; + _g1.set_zoom(_g1.zoom + 0.03); } if(this.camZooming && flixel_FlxG.camera.zoom < 1.35 && this.curBeat % 4 == 0) { - var fh = flixel_FlxG.camera; - fh.set_zoom(fh.zoom + 0.015); - var fh = this.camHUD; - fh.set_zoom(fh.zoom + 0.03); + var _g1 = flixel_FlxG.camera; + _g1.set_zoom(_g1.zoom + 0.015); + var _g1 = this.camHUD; + _g1.set_zoom(_g1.zoom + 0.03); } } this.iconP1.setGraphicSize(this.iconP1.get_width() + 30 | 0); @@ -24395,8 +24387,8 @@ ResultsScreen.prototype = $extend(flixel_FlxSubState.prototype,{ ,frames: null ,update: function(elapsed) { if(this.music._volume < 0.5) { - var fh = this.music; - fh.set_volume(fh._volume + 0.01 * elapsed); + var _g = this.music; + _g.set_volume(_g._volume + 0.01 * elapsed); } if(PlayerSettings.player1.controls._accept.check()) { var _this = this.music; @@ -24726,7 +24718,8 @@ StoryMenuState.prototype = $extend(MusicBeatState.prototype,{ while(_g < _g1) { var i = _g++; var weekThing = new MenuItem(0,yellowBG.y + yellowBG.get_height() + 10,i); - weekThing.set_y(weekThing.y + (weekThing.get_height() + 20) * i); + var _g2 = weekThing; + _g2.set_y(_g2.y + (weekThing.get_height() + 20) * i); weekThing.targetY = i; this.grpWeekText.add(weekThing); var axes = flixel_util_FlxAxes.X; @@ -24868,10 +24861,10 @@ StoryMenuState.prototype = $extend(MusicBeatState.prototype,{ if(tmp) { _this.set_y((flixel_FlxG.height - _this.get_height()) / 2); } - var fh = this.leftArrow; - fh.set_y(fh.y + 170); - var fh = this.leftArrow; - fh.set_x(fh.x - 240); + var _g = this.leftArrow; + _g.set_y(_g.y + 170); + var _g = this.leftArrow; + _g.set_x(_g.x - 240); this.leftArrow.set_antialiasing(true); this.add(this.leftArrow); this.sprDifficulty = new flixel_FlxSprite(this.leftArrow.x + 130,this.leftArrow.y); @@ -24914,10 +24907,10 @@ StoryMenuState.prototype = $extend(MusicBeatState.prototype,{ if(tmp) { _this.set_y((flixel_FlxG.height - _this.get_height()) / 2); } - var fh = this.rightArrow; - fh.set_y(fh.y + 170); - var fh = this.rightArrow; - fh.set_x(fh.x + 260); + var _g = this.rightArrow; + _g.set_y(_g.y + 170); + var _g = this.rightArrow; + _g.set_x(_g.x + 260); this.rightArrow.set_antialiasing(true); this.add(this.rightArrow); this.HeartSoul = new flixel_FlxSprite(this.sprDifficulty.x + this.sprDifficulty.get_width() + 50,this.leftArrow.y); @@ -25714,7 +25707,8 @@ TitleState.prototype = $extend(MusicBeatState.prototype,{ if(tmp1) { money.set_y((flixel_FlxG.height - money.get_height()) / 2); } - money.set_y(money.y + (i * 60 + 200)); + var _g2 = money; + _g2.set_y(_g2.y + (i * 60 + 200)); this.credGroup.add(money); this.textGroup.add(money); } @@ -25747,7 +25741,8 @@ TitleState.prototype = $extend(MusicBeatState.prototype,{ if(tmp) { coolText.set_y((flixel_FlxG.height - coolText.get_height()) / 2); } - coolText.set_y(coolText.y + (this.textGroup.length * 60 + 200)); + var _g = coolText; + _g.set_y(_g.y + (this.textGroup.length * 60 + 200)); this.credGroup.add(coolText); this.textGroup.add(coolText); } @@ -25826,18 +25821,17 @@ TitleState.prototype = $extend(MusicBeatState.prototype,{ } ,__class__: TitleState }); -var ValueType = $hxEnums["ValueType"] = { __ename__:"ValueType",__constructs__:null - ,TNull: {_hx_name:"TNull",_hx_index:0,__enum__:"ValueType",toString:$estr} - ,TInt: {_hx_name:"TInt",_hx_index:1,__enum__:"ValueType",toString:$estr} - ,TFloat: {_hx_name:"TFloat",_hx_index:2,__enum__:"ValueType",toString:$estr} - ,TBool: {_hx_name:"TBool",_hx_index:3,__enum__:"ValueType",toString:$estr} - ,TObject: {_hx_name:"TObject",_hx_index:4,__enum__:"ValueType",toString:$estr} - ,TFunction: {_hx_name:"TFunction",_hx_index:5,__enum__:"ValueType",toString:$estr} - ,TClass: ($_=function(c) { return {_hx_index:6,c:c,__enum__:"ValueType",toString:$estr}; },$_._hx_name="TClass",$_.__params__ = ["c"],$_) - ,TEnum: ($_=function(e) { return {_hx_index:7,e:e,__enum__:"ValueType",toString:$estr}; },$_._hx_name="TEnum",$_.__params__ = ["e"],$_) - ,TUnknown: {_hx_name:"TUnknown",_hx_index:8,__enum__:"ValueType",toString:$estr} -}; -ValueType.__constructs__ = [ValueType.TNull,ValueType.TInt,ValueType.TFloat,ValueType.TBool,ValueType.TObject,ValueType.TFunction,ValueType.TClass,ValueType.TEnum,ValueType.TUnknown]; +var ValueType = $hxEnums["ValueType"] = { __ename__ : "ValueType", __constructs__ : ["TNull","TInt","TFloat","TBool","TObject","TFunction","TClass","TEnum","TUnknown"] + ,TNull: {_hx_index:0,__enum__:"ValueType",toString:$estr} + ,TInt: {_hx_index:1,__enum__:"ValueType",toString:$estr} + ,TFloat: {_hx_index:2,__enum__:"ValueType",toString:$estr} + ,TBool: {_hx_index:3,__enum__:"ValueType",toString:$estr} + ,TObject: {_hx_index:4,__enum__:"ValueType",toString:$estr} + ,TFunction: {_hx_index:5,__enum__:"ValueType",toString:$estr} + ,TClass: ($_=function(c) { return {_hx_index:6,c:c,__enum__:"ValueType",toString:$estr}; },$_.__params__ = ["c"],$_) + ,TEnum: ($_=function(e) { return {_hx_index:7,e:e,__enum__:"ValueType",toString:$estr}; },$_.__params__ = ["e"],$_) + ,TUnknown: {_hx_index:8,__enum__:"ValueType",toString:$estr} +}; var Type = function() { }; $hxClasses["Type"] = Type; Type.__name__ = "Type"; @@ -25935,7 +25929,8 @@ Type.enumEq = function(a,b) { return false; } var enm = $hxEnums[e]; - var params = enm.__constructs__[a._hx_index].__params__; + var ctorName = enm.__constructs__[a._hx_index]; + var params = enm[ctorName].__params__; var _g = 0; while(_g < params.length) { var f = params[_g]; @@ -25952,7 +25947,8 @@ Type.enumEq = function(a,b) { }; Type.enumParameters = function(e) { var enm = $hxEnums[e.__enum__]; - var params = enm.__constructs__[e._hx_index].__params__; + var ctorName = enm.__constructs__[e._hx_index]; + var params = enm[ctorName].__params__; if(params != null) { var _g = []; var _g1 = 0; @@ -26214,14 +26210,13 @@ WebmHandler.prototype = { webm: null ,__class__: WebmHandler }; -var WiggleEffectType = $hxEnums["WiggleEffectType"] = { __ename__:"WiggleEffectType",__constructs__:null - ,DREAMY: {_hx_name:"DREAMY",_hx_index:0,__enum__:"WiggleEffectType",toString:$estr} - ,WAVY: {_hx_name:"WAVY",_hx_index:1,__enum__:"WiggleEffectType",toString:$estr} - ,HEAT_WAVE_HORIZONTAL: {_hx_name:"HEAT_WAVE_HORIZONTAL",_hx_index:2,__enum__:"WiggleEffectType",toString:$estr} - ,HEAT_WAVE_VERTICAL: {_hx_name:"HEAT_WAVE_VERTICAL",_hx_index:3,__enum__:"WiggleEffectType",toString:$estr} - ,FLAG: {_hx_name:"FLAG",_hx_index:4,__enum__:"WiggleEffectType",toString:$estr} +var WiggleEffectType = $hxEnums["WiggleEffectType"] = { __ename__ : "WiggleEffectType", __constructs__ : ["DREAMY","WAVY","HEAT_WAVE_HORIZONTAL","HEAT_WAVE_VERTICAL","FLAG"] + ,DREAMY: {_hx_index:0,__enum__:"WiggleEffectType",toString:$estr} + ,WAVY: {_hx_index:1,__enum__:"WiggleEffectType",toString:$estr} + ,HEAT_WAVE_HORIZONTAL: {_hx_index:2,__enum__:"WiggleEffectType",toString:$estr} + ,HEAT_WAVE_VERTICAL: {_hx_index:3,__enum__:"WiggleEffectType",toString:$estr} + ,FLAG: {_hx_index:4,__enum__:"WiggleEffectType",toString:$estr} }; -WiggleEffectType.__constructs__ = [WiggleEffectType.DREAMY,WiggleEffectType.WAVY,WiggleEffectType.HEAT_WAVE_HORIZONTAL,WiggleEffectType.HEAT_WAVE_VERTICAL,WiggleEffectType.FLAG]; var WiggleEffect = function() { this.waveAmplitude = 0; this.waveFrequency = 0; @@ -26243,15 +26238,8 @@ WiggleEffect.prototype = { } ,set_effectType: function(v) { this.effectType = v; - var _this = WiggleEffectType.__constructs__; - var result = new Array(_this.length); - var _g = 0; - var _g1 = _this.length; - while(_g < _g1) { - var i = _g++; - result[i] = _this[i]._hx_name; - } - this.shader.effectType.value = [result.indexOf(Std.string(v))]; + var tmp = WiggleEffectType.__constructs__.slice(); + this.shader.effectType.value = [tmp.indexOf(Std.string(v))]; return v; } ,set_waveSpeed: function(v) { @@ -27124,7 +27112,7 @@ Xml.prototype = { if(this.nodeType != Xml.Element) { throw haxe_Exception.thrown("Bad node type, expected Element but found " + (this.nodeType == null ? "null" : XmlType.toString(this.nodeType))); } - return new haxe_ds__$StringMap_StringMapKeyIterator(this.attributeMap.h); + return haxe_ds_StringMap.keysIterator(this.attributeMap.h); } ,elements: function() { if(this.nodeType != Xml.Document && this.nodeType != Xml.Element) { @@ -27377,21 +27365,27 @@ flixel_math_FlxPoint.prototype = { if(X == null) { X = 0; } - this.set_x(this.x + X); - this.set_y(this.y + Y); + var _g = this; + _g.set_x(_g.x + X); + var _g = this; + _g.set_y(_g.y + Y); return this; } ,addPoint: function(point) { - this.set_x(this.x + point.x); - this.set_y(this.y + point.y); + var _g = this; + _g.set_x(_g.x + point.x); + var _g = this; + _g.set_y(_g.y + point.y); if(point._weak) { point.put(); } return this; } ,addPointWeak: function(point) { - this.set_x(this.x + point.x); - this.set_y(this.y + point.y); + var _g = this; + _g.set_x(_g.x + point.x); + var _g = this; + _g.set_y(_g.y + point.y); return this; } ,subtract: function(X,Y) { @@ -27401,26 +27395,34 @@ flixel_math_FlxPoint.prototype = { if(X == null) { X = 0; } - this.set_x(this.x - X); - this.set_y(this.y - Y); + var _g = this; + _g.set_x(_g.x - X); + var _g = this; + _g.set_y(_g.y - Y); return this; } ,subtractPoint: function(point) { - this.set_x(this.x - point.x); - this.set_y(this.y - point.y); + var _g = this; + _g.set_x(_g.x - point.x); + var _g = this; + _g.set_y(_g.y - point.y); if(point._weak) { point.put(); } return this; } ,subtractPointWeak: function(point) { - this.set_x(this.x - point.x); - this.set_y(this.y - point.y); + var _g = this; + _g.set_x(_g.x - point.x); + var _g = this; + _g.set_y(_g.y - point.y); return this; } ,scale: function(k) { - this.set_x(this.x * k); - this.set_y(this.y * k); + var _g = this; + _g.set_x(_g.x * k); + var _g = this; + _g.set_y(_g.y * k); return this; } ,copyFrom: function(point) { @@ -28476,29 +28478,12 @@ var flixel_FlxCamera = function(X,Y,Width,Height,Zoom) { this._helperPoint = new openfl_geom_Point(); this._helperMatrix = new flixel_math_FlxMatrix(); var _this = flixel_math_FlxRect._pool.get(); - var X1 = 0; - var Y1 = 0; - var Width1 = 0; - var Height1 = 0; - if(Height1 == null) { - Height1 = 0; - } - if(Width1 == null) { - Width1 = 0; - } - if(Y1 == null) { - Y1 = 0; - } - if(X1 == null) { - X1 = 0; - } - _this.x = X1; - _this.y = Y1; - _this.width = Width1; - _this.height = Height1; - var rect = _this; - rect._inPool = false; - this._bounds = rect; + _this.x = 0; + _this.y = 0; + _this.width = 0; + _this.height = 0; + _this._inPool = false; + this._bounds = _this; this._scrollRect = new openfl_display_Sprite(); this.initialZoom = 1; var point = flixel_math_FlxPoint._pool.get().set(0,0); @@ -28877,18 +28862,7 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ _this.width = 0; _this.height = 0; var bounds = _this; - var this1 = flixel_FlxCamera.drawVertices; - var deleteCount = flixel_FlxCamera.drawVertices.get_length(); - var this2 = []; - this1.__tempIndex = 0; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,deleteCount); + flixel_FlxCamera.drawVertices.splice(0,flixel_FlxCamera.drawVertices.get_length()); while(i < verticesLength) { tempX = position.x + vertices.get(i); tempY = position.y + vertices.get(i + 1); @@ -28946,17 +28920,7 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ } } if(!result) { - var this1 = flixel_FlxCamera.drawVertices; - var this2 = []; - this1.__tempIndex = flixel_FlxCamera.drawVertices.get_length() - verticesLength; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,verticesLength); + flixel_FlxCamera.drawVertices.splice(flixel_FlxCamera.drawVertices.get_length() - verticesLength,verticesLength); } else { flixel_FlxCamera.trianglesSprite.get_graphics().clear(); flixel_FlxCamera.trianglesSprite.get_graphics().beginBitmapFill(graphic.bitmap,null,repeat,smoothing); @@ -29025,8 +28989,10 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ if(X == null) { X = 0; } - point.set_x(point.x - X); - point.set_y(point.y - Y); + var _g = point; + _g.set_x(_g.x - X); + var _g = point; + _g.set_y(_g.y - Y); if(this._useBlitMatrix) { point.scale(this.zoom); } @@ -29040,12 +29006,18 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ return vector; } ,transformObject: function(object) { - object.set_scaleX(object.get_scaleX() * this.totalScaleX); - object.set_scaleY(object.get_scaleY() * this.totalScaleY); - object.set_x(object.get_x() - this.scroll.x * this.totalScaleX); - object.set_y(object.get_y() - this.scroll.y * this.totalScaleY); - object.set_x(object.get_x() - 0.5 * this.width * (this.scaleX - this.initialZoom) * flixel_FlxG.scaleMode.scale.x); - object.set_y(object.get_y() - 0.5 * this.height * (this.scaleY - this.initialZoom) * flixel_FlxG.scaleMode.scale.y); + var _g = object; + _g.set_scaleX(_g.get_scaleX() * this.totalScaleX); + var _g = object; + _g.set_scaleY(_g.get_scaleY() * this.totalScaleY); + var _g = object; + _g.set_x(_g.get_x() - this.scroll.x * this.totalScaleX); + var _g = object; + _g.set_y(_g.get_y() - this.scroll.y * this.totalScaleY); + var _g = object; + _g.set_x(_g.get_x() - 0.5 * this.width * (this.scaleX - this.initialZoom) * flixel_FlxG.scaleMode.scale.x); + var _g = object; + _g.set_y(_g.get_y() - 0.5 * this.height * (this.scaleY - this.initialZoom) * flixel_FlxG.scaleMode.scale.y); return object; } ,destroy: function() { @@ -29129,18 +29101,18 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ var targetY = this.target.y + this.targetOffset.y; if(this.style == flixel_FlxCameraFollowStyle.SCREEN_BY_SCREEN) { if(targetX >= this.scroll.x + this.width) { - var fh = this._scrollTarget; - fh.set_x(fh.x + this.width); + var _g = this._scrollTarget; + _g.set_x(_g.x + this.width); } else if(targetX < this.scroll.x) { - var fh = this._scrollTarget; - fh.set_x(fh.x - this.width); + var _g = this._scrollTarget; + _g.set_x(_g.x - this.width); } if(targetY >= this.scroll.y + this.height) { - var fh = this._scrollTarget; - fh.set_y(fh.y + this.height); + var _g = this._scrollTarget; + _g.set_y(_g.y + this.height); } else if(targetY < this.scroll.y) { - var fh = this._scrollTarget; - fh.set_y(fh.y - this.height); + var _g = this._scrollTarget; + _g.set_y(_g.y - this.height); } } else { edge = targetX - this.deadzone.x; @@ -29174,10 +29146,10 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ point._inPool = false; this._lastTargetPosition = point; } - var fh = this._scrollTarget; - fh.set_x(fh.x + (this.target.x - this._lastTargetPosition.x) * this.followLead.x); - var fh = this._scrollTarget; - fh.set_y(fh.y + (this.target.y - this._lastTargetPosition.y) * this.followLead.y); + var _g = this._scrollTarget; + _g.set_x(_g.x + (this.target.x - this._lastTargetPosition.x) * this.followLead.x); + var _g = this._scrollTarget; + _g.set_y(_g.y + (this.target.y - this._lastTargetPosition.y) * this.followLead.y); this._lastTargetPosition.set_x(this.target.x); this._lastTargetPosition.set_y(this.target.y); } @@ -29190,10 +29162,10 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ point.put(); } } else { - var fh = this.scroll; - fh.set_x(fh.x + (this._scrollTarget.x - this.scroll.x) * this.followLerp * flixel_FlxG.updateFramerate / 60); - var fh = this.scroll; - fh.set_y(fh.y + (this._scrollTarget.y - this.scroll.y) * this.followLerp * flixel_FlxG.updateFramerate / 60); + var _g = this.scroll; + _g.set_x(_g.x + (this._scrollTarget.x - this.scroll.x) * this.followLerp * flixel_FlxG.updateFramerate / 60); + var _g = this.scroll; + _g.set_y(_g.y + (this._scrollTarget.y - this.scroll.y) * this.followLerp * flixel_FlxG.updateFramerate / 60); } } } @@ -29238,12 +29210,12 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ } } else { if(this._fxShakeAxes != flixel_util_FlxAxes.Y) { - var fh = this.flashSprite; - fh.set_x(fh.get_x() + flixel_FlxG.random.float(-this._fxShakeIntensity * this.width,this._fxShakeIntensity * this.width) * this.zoom * flixel_FlxG.scaleMode.scale.x); + var _g = this.flashSprite; + _g.set_x(_g.get_x() + flixel_FlxG.random.float(-this._fxShakeIntensity * this.width,this._fxShakeIntensity * this.width) * this.zoom * flixel_FlxG.scaleMode.scale.x); } if(this._fxShakeAxes != flixel_util_FlxAxes.X) { - var fh = this.flashSprite; - fh.set_y(fh.get_y() + flixel_FlxG.random.float(-this._fxShakeIntensity * this.height,this._fxShakeIntensity * this.height) * this.zoom * flixel_FlxG.scaleMode.scale.y); + var _g = this.flashSprite; + _g.set_y(_g.get_y() + flixel_FlxG.random.float(-this._fxShakeIntensity * this.height,this._fxShakeIntensity * this.height) * this.zoom * flixel_FlxG.scaleMode.scale.y); } } } @@ -30007,15 +29979,14 @@ flixel_FlxCamera.prototype = $extend(flixel_FlxBasic.prototype,{ ,__class__: flixel_FlxCamera ,__properties__: $extend(flixel_FlxBasic.prototype.__properties__,{set_antialiasing:"set_antialiasing",set_color:"set_color",set_angle:"set_angle",set_alpha:"set_alpha",set_zoom:"set_zoom",set_height:"set_height",set_width:"set_width",set_followLerp:"set_followLerp",set_y:"set_y",set_x:"set_x"}) }); -var flixel_FlxCameraFollowStyle = $hxEnums["flixel.FlxCameraFollowStyle"] = { __ename__:"flixel.FlxCameraFollowStyle",__constructs__:null - ,LOCKON: {_hx_name:"LOCKON",_hx_index:0,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} - ,PLATFORMER: {_hx_name:"PLATFORMER",_hx_index:1,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} - ,TOPDOWN: {_hx_name:"TOPDOWN",_hx_index:2,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} - ,TOPDOWN_TIGHT: {_hx_name:"TOPDOWN_TIGHT",_hx_index:3,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} - ,SCREEN_BY_SCREEN: {_hx_name:"SCREEN_BY_SCREEN",_hx_index:4,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} - ,NO_DEAD_ZONE: {_hx_name:"NO_DEAD_ZONE",_hx_index:5,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} -}; -flixel_FlxCameraFollowStyle.__constructs__ = [flixel_FlxCameraFollowStyle.LOCKON,flixel_FlxCameraFollowStyle.PLATFORMER,flixel_FlxCameraFollowStyle.TOPDOWN,flixel_FlxCameraFollowStyle.TOPDOWN_TIGHT,flixel_FlxCameraFollowStyle.SCREEN_BY_SCREEN,flixel_FlxCameraFollowStyle.NO_DEAD_ZONE]; +var flixel_FlxCameraFollowStyle = $hxEnums["flixel.FlxCameraFollowStyle"] = { __ename__ : "flixel.FlxCameraFollowStyle", __constructs__ : ["LOCKON","PLATFORMER","TOPDOWN","TOPDOWN_TIGHT","SCREEN_BY_SCREEN","NO_DEAD_ZONE"] + ,LOCKON: {_hx_index:0,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} + ,PLATFORMER: {_hx_index:1,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} + ,TOPDOWN: {_hx_index:2,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} + ,TOPDOWN_TIGHT: {_hx_index:3,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} + ,SCREEN_BY_SCREEN: {_hx_index:4,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} + ,NO_DEAD_ZONE: {_hx_index:5,__enum__:"flixel.FlxCameraFollowStyle",toString:$estr} +}; var flixel_system_FlxVersion = function(Major,Minor,Patch) { this.major = Major; this.minor = Minor; @@ -30047,28 +30018,20 @@ flixel_system_frontEnds_BitmapFrontEnd.prototype = { ,_whitePixel: null ,_lastUniqueKeyIndex: null ,onAssetsReload: function(_) { - var h = this._cache.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var obj = this._cache.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._cache.h); + while(key.hasNext()) { + var key1 = key.next(); + var obj = this._cache.h[key1]; if(obj != null && (obj.assetsClass != null || obj.assetsKey != null)) { obj.onAssetsReload(); } } } ,onContext: function() { - var h = this._cache.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var obj = this._cache.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._cache.h); + while(key.hasNext()) { + var key1 = key.next(); + var obj = this._cache.h[key1]; if(obj != null && obj.isDumped) { obj.onContext(); } @@ -30106,16 +30069,12 @@ flixel_system_frontEnds_BitmapFrontEnd.prototype = { return this._cache.h[key]; } ,findKeyForBitmap: function(bmd) { - var h = this._cache.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var obj = this._cache.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._cache.h); + while(key.hasNext()) { + var key1 = key.next(); + var obj = this._cache.h[key1]; if(obj != null && obj.bitmap == bmd) { - return key; + return key1; } } return null; @@ -30209,20 +30168,16 @@ flixel_system_frontEnds_BitmapFrontEnd.prototype = { this._cache = new haxe_ds_StringMap(); return; } - var h = this._cache.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var obj = this._cache.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._cache.h); + while(key.hasNext()) { + var key1 = key.next(); + var obj = this._cache.h[key1]; if(obj != null && !obj.persist && obj.get_useCount() <= 0) { - if(key != null) { - openfl_utils_Assets.cache.removeBitmapData(key); + if(key1 != null) { + openfl_utils_Assets.cache.removeBitmapData(key1); var _this = this._cache; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } obj.destroy(); @@ -30243,19 +30198,15 @@ flixel_system_frontEnds_BitmapFrontEnd.prototype = { this._cache = new haxe_ds_StringMap(); return; } - var h = this._cache.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var obj = this._cache.h[key]; - if(key != null) { - openfl_utils_Assets.cache.removeBitmapData(key); + var key = haxe_ds_StringMap.keysIterator(this._cache.h); + while(key.hasNext()) { + var key1 = key.next(); + var obj = this._cache.h[key1]; + if(key1 != null) { + openfl_utils_Assets.cache.removeBitmapData(key1); var _this = this._cache; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } if(obj != null) { @@ -30264,16 +30215,12 @@ flixel_system_frontEnds_BitmapFrontEnd.prototype = { } } ,clearUnused: function() { - var h = this._cache.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var obj = this._cache.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._cache.h); + while(key.hasNext()) { + var key1 = key.next(); + var obj = this._cache.h[key1]; if(obj != null && obj.get_useCount() <= 0 && !obj.persist && obj.get_destroyOnNoUse()) { - this.removeByKey(key); + this.removeByKey(key1); } } } @@ -30765,6 +30712,19 @@ flixel_system_frontEnds_InputFrontEnd.prototype = { this.list.push(Input); return Input; } + ,add_flixel_input_keyboard_FlxKeyboard: function(Input) { + var _g = 0; + var _g1 = this.list; + while(_g < _g1.length) { + var input = _g1[_g]; + ++_g; + if(flixel_util_FlxStringUtil.getClassName(Input,true) == flixel_util_FlxStringUtil.getClassName(input,true)) { + return Input; + } + } + this.list.push(Input); + return Input; + } ,replace_flixel_input_mouse_FlxMouse: function(Old,New) { var i = 0; var success = false; @@ -30798,19 +30758,6 @@ flixel_system_frontEnds_InputFrontEnd.prototype = { this.list.push(Input); return Input; } - ,add_flixel_input_keyboard_FlxKeyboard: function(Input) { - var _g = 0; - var _g1 = this.list; - while(_g < _g1.length) { - var input = _g1[_g]; - ++_g; - if(flixel_util_FlxStringUtil.getClassName(Input,true) == flixel_util_FlxStringUtil.getClassName(input,true)) { - return Input; - } - } - this.list.push(Input); - return Input; - } ,list: null ,resetOnStateSwitch: null ,reset: function() { @@ -30972,8 +30919,8 @@ js_Boot.__string_rec = function(o,s) { case "object": if(o.__enum__) { var e = $hxEnums[o.__enum__]; - var con = e.__constructs__[o._hx_index]; - var n = con._hx_name; + var n = e.__constructs__[o._hx_index]; + var con = e[n]; if(con.__params__) { s = s + "\t"; return n + "(" + ((function($this) { @@ -32044,11 +31991,10 @@ flixel_FlxG.get_state = function() { flixel_FlxG.get_onMobile = function() { return flixel_FlxG.html5.onMobile; }; -var flixel_FlxRenderMethod = $hxEnums["flixel.FlxRenderMethod"] = { __ename__:"flixel.FlxRenderMethod",__constructs__:null - ,DRAW_TILES: {_hx_name:"DRAW_TILES",_hx_index:0,__enum__:"flixel.FlxRenderMethod",toString:$estr} - ,BLITTING: {_hx_name:"BLITTING",_hx_index:1,__enum__:"flixel.FlxRenderMethod",toString:$estr} +var flixel_FlxRenderMethod = $hxEnums["flixel.FlxRenderMethod"] = { __ename__ : "flixel.FlxRenderMethod", __constructs__ : ["DRAW_TILES","BLITTING"] + ,DRAW_TILES: {_hx_index:0,__enum__:"flixel.FlxRenderMethod",toString:$estr} + ,BLITTING: {_hx_index:1,__enum__:"flixel.FlxRenderMethod",toString:$estr} }; -flixel_FlxRenderMethod.__constructs__ = [flixel_FlxRenderMethod.DRAW_TILES,flixel_FlxRenderMethod.BLITTING]; var flixel_FlxGame = function(GameWidth,GameHeight,InitialState,Zoom,UpdateFramerate,DrawFramerate,SkipSplash,StartFullscreen) { if(StartFullscreen == null) { StartFullscreen = false; @@ -32629,6 +32575,7 @@ flixel_addons_effects_FlxSkewedSprite.prototype = $extend(flixel_FlxSprite.proto this.updateSkewMatrix(); this._matrix.concat(this._skewMatrix); } + this.getScreenPosition(this._point,camera).subtractPoint(this.offset); this._point.addPoint(this.origin); if(this.isPixelPerfectRender(camera)) { var _this = this._point; @@ -32854,6 +32801,7 @@ flixel_addons_effects_FlxTrail.prototype = $extend(flixel_group_FlxTypedSpriteGr trailSprite.loadGraphic(this._graphic); } trailSprite.set_exists(false); + trailSprite.set_active(false); this.add(trailSprite); trailSprite.set_alpha(this._transp); this._transp -= this._difference; @@ -33241,11 +33189,10 @@ flixel_addons_effects_chainable_FlxGlitchEffect.prototype = { } ,__class__: flixel_addons_effects_chainable_FlxGlitchEffect }; -var flixel_addons_effects_chainable_FlxGlitchDirection = $hxEnums["flixel.addons.effects.chainable.FlxGlitchDirection"] = { __ename__:"flixel.addons.effects.chainable.FlxGlitchDirection",__constructs__:null - ,HORIZONTAL: {_hx_name:"HORIZONTAL",_hx_index:0,__enum__:"flixel.addons.effects.chainable.FlxGlitchDirection",toString:$estr} - ,VERTICAL: {_hx_name:"VERTICAL",_hx_index:1,__enum__:"flixel.addons.effects.chainable.FlxGlitchDirection",toString:$estr} +var flixel_addons_effects_chainable_FlxGlitchDirection = $hxEnums["flixel.addons.effects.chainable.FlxGlitchDirection"] = { __ename__ : "flixel.addons.effects.chainable.FlxGlitchDirection", __constructs__ : ["HORIZONTAL","VERTICAL"] + ,HORIZONTAL: {_hx_index:0,__enum__:"flixel.addons.effects.chainable.FlxGlitchDirection",toString:$estr} + ,VERTICAL: {_hx_index:1,__enum__:"flixel.addons.effects.chainable.FlxGlitchDirection",toString:$estr} }; -flixel_addons_effects_chainable_FlxGlitchDirection.__constructs__ = [flixel_addons_effects_chainable_FlxGlitchDirection.HORIZONTAL,flixel_addons_effects_chainable_FlxGlitchDirection.VERTICAL]; var flixel_addons_effects_chainable_FlxWaveEffect = function(Mode,Strength,Center,Speed,Wavelength,Direction,InterlaceOffset) { if(InterlaceOffset == null) { InterlaceOffset = 0; @@ -33390,17 +33337,15 @@ flixel_addons_effects_chainable_FlxWaveEffect.prototype = { ,__class__: flixel_addons_effects_chainable_FlxWaveEffect ,__properties__: {set_interlaceOffset:"set_interlaceOffset"} }; -var flixel_addons_effects_chainable_FlxWaveMode = $hxEnums["flixel.addons.effects.chainable.FlxWaveMode"] = { __ename__:"flixel.addons.effects.chainable.FlxWaveMode",__constructs__:null - ,ALL: {_hx_name:"ALL",_hx_index:0,__enum__:"flixel.addons.effects.chainable.FlxWaveMode",toString:$estr} - ,START: {_hx_name:"START",_hx_index:1,__enum__:"flixel.addons.effects.chainable.FlxWaveMode",toString:$estr} - ,END: {_hx_name:"END",_hx_index:2,__enum__:"flixel.addons.effects.chainable.FlxWaveMode",toString:$estr} +var flixel_addons_effects_chainable_FlxWaveMode = $hxEnums["flixel.addons.effects.chainable.FlxWaveMode"] = { __ename__ : "flixel.addons.effects.chainable.FlxWaveMode", __constructs__ : ["ALL","START","END"] + ,ALL: {_hx_index:0,__enum__:"flixel.addons.effects.chainable.FlxWaveMode",toString:$estr} + ,START: {_hx_index:1,__enum__:"flixel.addons.effects.chainable.FlxWaveMode",toString:$estr} + ,END: {_hx_index:2,__enum__:"flixel.addons.effects.chainable.FlxWaveMode",toString:$estr} }; -flixel_addons_effects_chainable_FlxWaveMode.__constructs__ = [flixel_addons_effects_chainable_FlxWaveMode.ALL,flixel_addons_effects_chainable_FlxWaveMode.START,flixel_addons_effects_chainable_FlxWaveMode.END]; -var flixel_addons_effects_chainable_FlxWaveDirection = $hxEnums["flixel.addons.effects.chainable.FlxWaveDirection"] = { __ename__:"flixel.addons.effects.chainable.FlxWaveDirection",__constructs__:null - ,HORIZONTAL: {_hx_name:"HORIZONTAL",_hx_index:0,__enum__:"flixel.addons.effects.chainable.FlxWaveDirection",toString:$estr} - ,VERTICAL: {_hx_name:"VERTICAL",_hx_index:1,__enum__:"flixel.addons.effects.chainable.FlxWaveDirection",toString:$estr} +var flixel_addons_effects_chainable_FlxWaveDirection = $hxEnums["flixel.addons.effects.chainable.FlxWaveDirection"] = { __ename__ : "flixel.addons.effects.chainable.FlxWaveDirection", __constructs__ : ["HORIZONTAL","VERTICAL"] + ,HORIZONTAL: {_hx_index:0,__enum__:"flixel.addons.effects.chainable.FlxWaveDirection",toString:$estr} + ,VERTICAL: {_hx_index:1,__enum__:"flixel.addons.effects.chainable.FlxWaveDirection",toString:$estr} }; -flixel_addons_effects_chainable_FlxWaveDirection.__constructs__ = [flixel_addons_effects_chainable_FlxWaveDirection.HORIZONTAL,flixel_addons_effects_chainable_FlxWaveDirection.VERTICAL]; var openfl_media_Sound = function(stream,context) { openfl_events_EventDispatcher.call(this,this); this.bytesLoaded = 0; @@ -34428,7 +34373,9 @@ flixel_addons_text_FlxTypeText.prototype = $extend(flixel_text_FlxText.prototype if(SkipKeys != null) { this.skipKeys = SkipKeys; } - this.completeCallback = Callback; + if(Callback != null) { + this.completeCallback = Callback; + } this.insertBreakLines(); if(this.useDefaultSound) { this.loadDefaultSound(); @@ -36520,8 +36467,9 @@ flixel_addons_transition_TransitionEffect.prototype = $extend(flixel_group_FlxTy ,onFinish: function(f) { this.finished = true; if(this.finishCallback != null) { - this.finishCallback(); + var callback = this.finishCallback; this.finishCallback = null; + callback(); } } ,__class__: flixel_addons_transition_TransitionEffect @@ -37351,12 +37299,14 @@ flixel_addons_ui_FlxInputText.prototype = $extend(flixel_text_FlxText.prototype, return; } else if(key == 37) { if(this.caretIndex > 0) { - this.set_caretIndex(this.caretIndex - 1); + var _g = this; + _g.set_caretIndex(_g.caretIndex - 1); this.set_text(this.text); } } else if(key == 39) { if(this.caretIndex < this.text.length) { - this.set_caretIndex(this.caretIndex + 1); + var _g = this; + _g.set_caretIndex(_g.caretIndex + 1); this.set_text(this.text); } } else if(key == 35) { @@ -37367,7 +37317,8 @@ flixel_addons_ui_FlxInputText.prototype = $extend(flixel_text_FlxText.prototype, this.set_text(this.text); } else if(key == 8) { if(this.caretIndex > 0) { - this.set_caretIndex(this.caretIndex - 1); + var _g = this; + _g.set_caretIndex(_g.caretIndex - 1); this.set_text(this.text.substring(0,this.caretIndex) + this.text.substring(this.caretIndex + 1)); this.onChange("backspace"); } @@ -37386,7 +37337,8 @@ flixel_addons_ui_FlxInputText.prototype = $extend(flixel_text_FlxText.prototype, var newText = this.filter(String.fromCodePoint(code)); if(newText.length > 0 && (this.maxLength == 0 || this.text.length + newText.length < this.maxLength)) { this.set_text(this.insertSubstring(this.text,newText,this.caretIndex)); - this.set_caretIndex(this.caretIndex + 1); + var _g = this; + _g.set_caretIndex(_g.caretIndex + 1); this.onChange("input"); } } @@ -38185,11 +38137,10 @@ flixel_addons_ui_FlxMultiGamepadAnalogStick.prototype = $extend(flixel_addons_ui } ,__class__: flixel_addons_ui_FlxMultiGamepadAnalogStick }); -var flixel_addons_ui_XY = $hxEnums["flixel.addons.ui.XY"] = { __ename__:"flixel.addons.ui.XY",__constructs__:null - ,X: {_hx_name:"X",_hx_index:0,__enum__:"flixel.addons.ui.XY",toString:$estr} - ,Y: {_hx_name:"Y",_hx_index:1,__enum__:"flixel.addons.ui.XY",toString:$estr} +var flixel_addons_ui_XY = $hxEnums["flixel.addons.ui.XY"] = { __ename__ : "flixel.addons.ui.XY", __constructs__ : ["X","Y"] + ,X: {_hx_index:0,__enum__:"flixel.addons.ui.XY",toString:$estr} + ,Y: {_hx_index:1,__enum__:"flixel.addons.ui.XY",toString:$estr} }; -flixel_addons_ui_XY.__constructs__ = [flixel_addons_ui_XY.X,flixel_addons_ui_XY.Y]; var flixel_addons_ui_FlxMultiKey = function(Input,Combos,Forbiddens) { flixel_addons_ui_FlxBaseMultiInput.call(this); this.input = Input; @@ -38388,14 +38339,10 @@ var flixel_addons_ui_FlxUI = function(data,ptr,superIndex_,tongue_,liveFilePath_ } if(uiVars_ != null) { this._variable_index = new haxe_ds_StringMap(); - var h = uiVars_.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - this._variable_index.h[key] = uiVars_.h[key]; + var key = haxe_ds_StringMap.keysIterator(uiVars_.h); + while(key.hasNext()) { + var key1 = key.next(); + this._variable_index.h[key1] = uiVars_.h[key1]; } } if(data != null) { @@ -38513,8 +38460,10 @@ flixel_addons_ui_FlxUI._delta = function(thing,X,Y) { if(X == null) { X = 0; } - thing.set_x(thing.x + X); - thing.set_y(thing.y + Y); + var _g = thing; + _g.set_x(_g.x + X); + var _g = thing; + _g.set_y(_g.y + Y); }; flixel_addons_ui_FlxUI._center = function(thing,X,Y) { if(Y == null) { @@ -38736,14 +38685,10 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype if(this._ptr != null) { this._ptr.getEvent(name,sender,data,params); if(name == "post_load") { - var h = this._asset_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var thing = this._asset_index.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._asset_index.h); + while(key.hasNext()) { + var key1 = key.next(); + var thing = this._asset_index.h[key1]; if(((thing) instanceof flixel_addons_ui_FlxUI)) { var fui = thing; fui.getEvent("post_load",sender,data); @@ -38932,92 +38877,68 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype } ,destroy: function() { if(this._group_index != null) { - var h = this._group_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this._group_index.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = this._group_index; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._group_index = null; } if(this._asset_index != null) { - var h = this._asset_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this._asset_index.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = this._asset_index; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._asset_index = null; } if(this._tag_index != null) { - var h = this._tag_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - flixel_util_FlxArrayUtil.clearArray(this._tag_index.h[key]); + var key = haxe_ds_StringMap.keysIterator(this._tag_index.h); + while(key.hasNext()) { + var key1 = key.next(); + flixel_util_FlxArrayUtil.clearArray(this._tag_index.h[key1]); var _this = this._tag_index; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._tag_index = null; } if(this._definition_index != null) { - var h = this._definition_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this._definition_index.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = this._definition_index; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._definition_index = null; } if(this._variable_index != null) { - var h = this._variable_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this._variable_index.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = this._variable_index; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._variable_index = null; } if(this._mode_index != null) { - var h = this._mode_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this._mode_index.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = this._mode_index; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this._mode_index = null; @@ -39552,15 +39473,11 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype } } } else { - var h = this._asset_index.h; - var asset_name_h = h; - var asset_name_keys = Object.keys(h); - var asset_name_length = asset_name_keys.length; - var asset_name_current = 0; - while(asset_name_current < asset_name_length) { - var asset_name = asset_name_keys[asset_name_current++]; - if(asset_name != "*") { - this.showThing(asset_name,visibleStatus,activeStatus); + var asset_name = haxe_ds_StringMap.keysIterator(this._asset_index.h); + while(asset_name.hasNext()) { + var asset_name1 = asset_name.next(); + if(asset_name1 != "*") { + this.showThing(asset_name1,visibleStatus,activeStatus); } } } @@ -39589,27 +39506,19 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype } ,getAllAssets: function() { var arr = []; - var h = this._asset_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - arr.push(this.getAsset(key)); + var key = haxe_ds_StringMap.keysIterator(this._asset_index.h); + while(key.hasNext()) { + var key1 = key.next(); + arr.push(this.getAsset(key1)); } return arr; } ,getAssetKeys: function() { var arr = []; - var h = this._asset_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - arr.push(key); + var key = haxe_ds_StringMap.keysIterator(this._asset_index.h); + while(key.hasNext()) { + var key1 = key.next(); + arr.push(key1); } return arr; } @@ -39665,14 +39574,10 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype if(thing == null) { return null; } - var h = this._group_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var g = this._group_index.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._group_index.h); + while(key.hasNext()) { + var key1 = key.next(); + var g = this._group_index.h[key1]; if(g.group.members.indexOf(thing) != -1) { return g; } @@ -39791,14 +39696,10 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype splice = false; } if(this._group_index != null) { - var h = this._group_index.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var tempGroup = this._group_index.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._group_index.h); + while(key.hasNext()) { + var key1 = key.next(); + var tempGroup = this._group_index.h[key1]; if(tempGroup.group.members != null) { var i = 0; var _g = 0; @@ -40791,8 +40692,10 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype if(X == null) { X = 0; } - thing.set_x(thing.x + X); - thing.set_y(thing.y + Y); + var _g = thing; + _g.set_x(_g.x + X); + var _g = thing; + _g.set_y(_g.y + Y); this._loadPosition(data,thing); } var send_to = flixel_addons_ui_U.xml_str(data,"send_to",true,""); @@ -41748,7 +41651,8 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype name = flixel_addons_ui_U.xml_name(group_node); var _ui = new flixel_addons_ui_FlxUI(group_node,fg,this,this._ptr_tongue); if(list_tabs != null && list_tabs.length > 0) { - _ui.set_y(_ui.y + list_tabs[0].get_height()); + var _g2 = _ui; + _g2.set_y(_g2.y + list_tabs[0].get_height()); } _ui.name = name; fg.addGroup(_ui); @@ -42199,31 +42103,31 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype var sprite1 = _g1[_g]; ++_g; if(((sprite1) instanceof flixel_addons_ui_FlxUIText)) { - var fh = sprite1.offset; - fh.set_x(fh.x - text_x); - var fh1 = sprite1.offset; - fh1.set_y(fh1.y - text_y); + var _g2 = sprite1.offset; + _g2.set_x(_g2.x - text_x); + var _g3 = sprite1.offset; + _g3.set_y(_g3.y - text_y); break; } } } else { - var fh = fbs.label.offset; - fh.set_x(fh.x - text_x); - var fh = fbs.label.offset; - fh.set_y(fh.y - text_y); + var _g = fbs.label.offset; + _g.set_x(_g.x - text_x); + var _g = fbs.label.offset; + _g.set_y(_g.y - text_y); if(toggleSprite != null) { - var fh = toggleSprite.offset; - fh.set_x(fh.x - text_x); - var fh = toggleSprite.offset; - fh.set_y(fh.y - text_y); + var _g = toggleSprite.offset; + _g.set_x(_g.x - text_x); + var _g = toggleSprite.offset; + _g.set_y(_g.y - text_y); } } } else { var fbu = fb; - var fh = fbu.label.offset; - fh.set_x(fh.x - text_x); - var fh = fbu.label.offset; - fh.set_y(fh.y - text_y); + var _g = fbu.label.offset; + _g.set_x(_g.x - text_x); + var _g = fbu.label.offset; + _g.set_y(_g.y - text_y); } if(sprite != null && toggleSprite != null) { fb.set_toggle_label(toggleSprite); @@ -43368,8 +43272,10 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype if(X1 == null) { X1 = 0; } - thing.set_x(thing.x + X1); - thing.set_y(thing.y + Y1); + var _g = thing; + _g.set_x(_g.x + X1); + var _g = thing; + _g.set_y(_g.y + Y1); } ,_loadBorder: function(data) { var borderDef = flixel_addons_ui_BorderDef.fromXML(data); @@ -43612,13 +43518,12 @@ flixel_addons_ui_FlxUI.prototype = $extend(flixel_addons_ui_FlxUIGroup.prototype ,__class__: flixel_addons_ui_FlxUI ,__properties__: $extend(flixel_addons_ui_FlxUIGroup.prototype.__properties__,{set_currMode:"set_currMode",get_currMode:"get_currMode",set_focus:"set_focus",set_tongue:"set_tongue",get_tongue:"get_tongue",get_isRoot:"get_isRoot"}) }); -var flixel_addons_ui_Rounding = $hxEnums["flixel.addons.ui.Rounding"] = { __ename__:"flixel.addons.ui.Rounding",__constructs__:null - ,Floor: {_hx_name:"Floor",_hx_index:0,__enum__:"flixel.addons.ui.Rounding",toString:$estr} - ,Ceil: {_hx_name:"Ceil",_hx_index:1,__enum__:"flixel.addons.ui.Rounding",toString:$estr} - ,Round: {_hx_name:"Round",_hx_index:2,__enum__:"flixel.addons.ui.Rounding",toString:$estr} - ,None: {_hx_name:"None",_hx_index:3,__enum__:"flixel.addons.ui.Rounding",toString:$estr} +var flixel_addons_ui_Rounding = $hxEnums["flixel.addons.ui.Rounding"] = { __ename__ : "flixel.addons.ui.Rounding", __constructs__ : ["Floor","Ceil","Round","None"] + ,Floor: {_hx_index:0,__enum__:"flixel.addons.ui.Rounding",toString:$estr} + ,Ceil: {_hx_index:1,__enum__:"flixel.addons.ui.Rounding",toString:$estr} + ,Round: {_hx_index:2,__enum__:"flixel.addons.ui.Rounding",toString:$estr} + ,None: {_hx_index:3,__enum__:"flixel.addons.ui.Rounding",toString:$estr} }; -flixel_addons_ui_Rounding.__constructs__ = [flixel_addons_ui_Rounding.Floor,flixel_addons_ui_Rounding.Ceil,flixel_addons_ui_Rounding.Round,flixel_addons_ui_Rounding.None]; var flixel_addons_ui_interfaces_IResizable = function() { }; $hxClasses["flixel.addons.ui.interfaces.IResizable"] = flixel_addons_ui_interfaces_IResizable; flixel_addons_ui_interfaces_IResizable.__name__ = "flixel.addons.ui.interfaces.IResizable"; @@ -43699,8 +43604,10 @@ flixel_addons_ui_FlxUISprite.prototype = $extend(flixel_FlxSprite.prototype,{ if(this.resize_point != null) { var delta_x = diff_w * this.resize_point.x; var delta_y = diff_h * this.resize_point.y; - this.set_x(this.x - delta_x); - this.set_y(this.y - delta_y); + var _g = this; + _g.set_x(_g.x - delta_x); + var _g = this; + _g.set_y(_g.y - delta_y); } } ,loadGraphicAtScale: function(GraphicKey,W,H) { @@ -45136,8 +45043,10 @@ flixel_addons_ui_FlxUI9SliceSprite.prototype = $extend(flixel_addons_ui_FlxUISpr if(this.resize_point != null) { var delta_x = diff_w * this.resize_point.x; var delta_y = diff_h * this.resize_point.y; - this.set_x(this.x - delta_x); - this.set_y(this.y - delta_y); + var _g = this; + _g.set_x(_g.x - delta_x); + var _g = this; + _g.set_y(_g.y - delta_y); } } ,noLongerUsingCachedID: function(id) { @@ -45760,8 +45669,10 @@ flixel_ui_FlxBar.prototype = $extend(flixel_FlxSprite.prototype,{ if(X == null) { X = 0; } - _this1.set_x(_this1.x + X); - _this1.set_y(_this1.y + Y); + var _g2 = _this1; + _g2.set_x(_g2.x + X); + var _g3 = _this1; + _g3.set_y(_g3.y + Y); if(this.isPixelPerfectRender(camera)) { var _this2 = this._point; _this2.set_x(Math.floor(_this2.x)); @@ -46000,15 +45911,7 @@ var flixel_ui_FlxTypedButton = function(X,Y,OnClick) { point._inPool = false; var point1 = flixel_math_FlxPoint._pool.get().set(0,0); point1._inPool = false; - var X1 = 0; - var Y1 = 1; - if(Y1 == null) { - Y1 = 0; - } - if(X1 == null) { - X1 = 0; - } - var point2 = flixel_math_FlxPoint._pool.get().set(X1,Y1); + var point2 = flixel_math_FlxPoint._pool.get().set(0,1); point2._inPool = false; this.labelOffsets = [point,point1,point2]; flixel_FlxSprite.call(this,X,Y); @@ -46687,8 +46590,10 @@ flixel_addons_ui_FlxUITypedButton.prototype = $extend(flixel_ui_FlxTypedButton.p if(this.resize_point != null) { var delta_x = diff_w * this.resize_point.x; var delta_y = diff_h * this.resize_point.y; - this.set_x(this.x - delta_x); - this.set_y(this.y - delta_y); + var _g = this; + _g.set_x(_g.x - delta_x); + var _g = this; + _g.set_y(_g.y - delta_y); } } ,getBmp: function(asset) { @@ -47815,7 +47720,8 @@ flixel_addons_ui_FlxUICursor.prototype = $extend(flixel_addons_ui_FlxUISprite.pr return; } } else { - this.set_location(this.location + 1); + var _g = this; + _g.set_location(_g.location + 1); } } else if(this.location == 0) { if(wrap) { @@ -47831,7 +47737,8 @@ flixel_addons_ui_FlxUICursor.prototype = $extend(flixel_addons_ui_FlxUISprite.pr return; } } else { - this.set_location(this.location - 1); + var _g1 = this; + _g1.set_location(_g1.location - 1); } } ,getCurrentWidget: function() { @@ -48443,8 +48350,10 @@ flixel_addons_ui_FlxUICursor.prototype = $extend(flixel_addons_ui_FlxUISprite.pr fo = currWidget; widgetPoint = fo.getScreenPosition(); } - widgetPoint.set_x(widgetPoint.x * Camera.totalScaleX); - widgetPoint.set_y(widgetPoint.y * Camera.totalScaleY); + var _g = widgetPoint; + _g.set_x(_g.x * Camera.totalScaleX); + var _g = widgetPoint; + _g.set_y(_g.y * Camera.totalScaleY); if(widgetPoint == null) { var X = currWidget.x; var Y = currWidget.y; @@ -48458,8 +48367,10 @@ flixel_addons_ui_FlxUICursor.prototype = $extend(flixel_addons_ui_FlxUISprite.pr point._inPool = false; widgetPoint = point; } - widgetPoint.set_x(widgetPoint.x + currWidget.get_width() / 2); - widgetPoint.set_y(widgetPoint.y + currWidget.get_height() / 2); + var _g = widgetPoint; + _g.set_x(_g.x + currWidget.get_width() / 2); + var _g = widgetPoint; + _g.set_y(_g.y + currWidget.get_height() / 2); return widgetPoint; } ,_doMouseMove: function(pt) { @@ -48830,18 +48741,16 @@ flixel_addons_ui_FlxUICursor.prototype = $extend(flixel_addons_ui_FlxUISprite.pr ,__class__: flixel_addons_ui_FlxUICursor ,__properties__: $extend(flixel_addons_ui_FlxUISprite.prototype.__properties__,{set_gamepad:"set_gamepad",get_gamepad:"get_gamepad",set_listIndex:"set_listIndex",set_location:"set_location"}) }); -var flixel_addons_ui_GamepadAutoConnectPreference = $hxEnums["flixel.addons.ui.GamepadAutoConnectPreference"] = { __ename__:"flixel.addons.ui.GamepadAutoConnectPreference",__constructs__:null - ,Never: {_hx_name:"Never",_hx_index:0,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr} - ,FirstActive: {_hx_name:"FirstActive",_hx_index:1,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr} - ,LastActive: {_hx_name:"LastActive",_hx_index:2,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr} - ,GamepadID: ($_=function(i) { return {_hx_index:3,i:i,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr}; },$_._hx_name="GamepadID",$_.__params__ = ["i"],$_) -}; -flixel_addons_ui_GamepadAutoConnectPreference.__constructs__ = [flixel_addons_ui_GamepadAutoConnectPreference.Never,flixel_addons_ui_GamepadAutoConnectPreference.FirstActive,flixel_addons_ui_GamepadAutoConnectPreference.LastActive,flixel_addons_ui_GamepadAutoConnectPreference.GamepadID]; -var flixel_addons_ui_SortMethod = $hxEnums["flixel.addons.ui.SortMethod"] = { __ename__:"flixel.addons.ui.SortMethod",__constructs__:null - ,XY: {_hx_name:"XY",_hx_index:0,__enum__:"flixel.addons.ui.SortMethod",toString:$estr} - ,ID: {_hx_name:"ID",_hx_index:1,__enum__:"flixel.addons.ui.SortMethod",toString:$estr} -}; -flixel_addons_ui_SortMethod.__constructs__ = [flixel_addons_ui_SortMethod.XY,flixel_addons_ui_SortMethod.ID]; +var flixel_addons_ui_GamepadAutoConnectPreference = $hxEnums["flixel.addons.ui.GamepadAutoConnectPreference"] = { __ename__ : "flixel.addons.ui.GamepadAutoConnectPreference", __constructs__ : ["Never","FirstActive","LastActive","GamepadID"] + ,Never: {_hx_index:0,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr} + ,FirstActive: {_hx_index:1,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr} + ,LastActive: {_hx_index:2,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr} + ,GamepadID: ($_=function(i) { return {_hx_index:3,i:i,__enum__:"flixel.addons.ui.GamepadAutoConnectPreference",toString:$estr}; },$_.__params__ = ["i"],$_) +}; +var flixel_addons_ui_SortMethod = $hxEnums["flixel.addons.ui.SortMethod"] = { __ename__ : "flixel.addons.ui.SortMethod", __constructs__ : ["XY","ID"] + ,XY: {_hx_index:0,__enum__:"flixel.addons.ui.SortMethod",toString:$estr} + ,ID: {_hx_index:1,__enum__:"flixel.addons.ui.SortMethod",toString:$estr} +}; var flixel_addons_ui_FlxUIDropDownMenu = function(X,Y,DataList,Callback,Header,DropPanel,ButtonList,UIControlCallback) { if(Y == null) { Y = 0; @@ -48997,11 +48906,11 @@ flixel_addons_ui_FlxUIDropDownMenu.prototype = $extend(flixel_addons_ui_FlxUIGro var buttonHeight = this.header.background.get_height(); this.dropPanel.set_y(this.header.background.y); if(this.dropsUp()) { - var fh = this.dropPanel; - fh.set_y(fh.y - this.getPanelHeight()); + var _g = this.dropPanel; + _g.set_y(_g.y - this.getPanelHeight()); } else { - var fh = this.dropPanel; - fh.set_y(fh.y + buttonHeight); + var _g = this.dropPanel; + _g.set_y(_g.y + buttonHeight); } var offset = this.dropPanel.y; var _g = 0; @@ -49117,8 +49026,8 @@ flixel_addons_ui_FlxUIDropDownMenu.prototype = $extend(flixel_addons_ui_FlxUIGro t.onUp.callback = tmp; t.name = Name; t.loadGraphicSlice9(["flixel/flixel-ui/img/invis.png","flixel/flixel-ui/img/hilight.png","flixel/flixel-ui/img/hilight.png"],this.header.background.get_width() | 0,this.header.background.get_height() | 0,[[1,1,3,3],[1,1,3,3],[1,1,3,3]],0); - var fh = t.labelOffsets[2]; - fh.set_y(fh.y - 1); + var _g1 = t.labelOffsets[2]; + _g1.set_y(_g1.y - 1); t.up_color = -16777216; t.over_color = -1; t.down_color = -1; @@ -49131,7 +49040,8 @@ flixel_addons_ui_FlxUIDropDownMenu.prototype = $extend(flixel_addons_ui_FlxUIGro while(_g1 < _g2.length) { var offset = _g2[_g1]; ++_g1; - offset.set_x(offset.x + 2); + var _g3 = offset; + _g3.set_x(_g3.x + 2); } return t; } @@ -49230,11 +49140,11 @@ var flixel_addons_ui_FlxUIDropDownHeader = function(Width,Background,Text1,Butto this.button.resize(this.background.get_height(),this.background.get_height()); this.button.set_x(this.background.x + this.background.get_width() - this.button.get_width()); this.button.set_width(Width); - var fh = this.button.offset; - fh.set_x(fh.x - (Width - this.button.frameWidth)); + var _g = this.button.offset; + _g.set_x(_g.x - (Width - this.button.frameWidth)); this.button.set_x(this.offset.x); - var fh = this.button.label.offset; - fh.set_x(fh.x + this.button.offset.x); + var _g = this.button.label.offset; + _g.set_x(_g.x + this.button.offset.x); if(this.text == null) { this.text = new flixel_addons_ui_FlxUIText(0,0,this.background.get_width() | 0); } @@ -49259,12 +49169,11 @@ flixel_addons_ui_FlxUIDropDownHeader.prototype = $extend(flixel_addons_ui_FlxUIG } ,__class__: flixel_addons_ui_FlxUIDropDownHeader }); -var flixel_addons_ui_FlxUIDropDownMenuDropDirection = $hxEnums["flixel.addons.ui.FlxUIDropDownMenuDropDirection"] = { __ename__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",__constructs__:null - ,Automatic: {_hx_name:"Automatic",_hx_index:0,__enum__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",toString:$estr} - ,Down: {_hx_name:"Down",_hx_index:1,__enum__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",toString:$estr} - ,Up: {_hx_name:"Up",_hx_index:2,__enum__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",toString:$estr} +var flixel_addons_ui_FlxUIDropDownMenuDropDirection = $hxEnums["flixel.addons.ui.FlxUIDropDownMenuDropDirection"] = { __ename__ : "flixel.addons.ui.FlxUIDropDownMenuDropDirection", __constructs__ : ["Automatic","Down","Up"] + ,Automatic: {_hx_index:0,__enum__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",toString:$estr} + ,Down: {_hx_index:1,__enum__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",toString:$estr} + ,Up: {_hx_index:2,__enum__:"flixel.addons.ui.FlxUIDropDownMenuDropDirection",toString:$estr} }; -flixel_addons_ui_FlxUIDropDownMenuDropDirection.__constructs__ = [flixel_addons_ui_FlxUIDropDownMenuDropDirection.Automatic,flixel_addons_ui_FlxUIDropDownMenuDropDirection.Down,flixel_addons_ui_FlxUIDropDownMenuDropDirection.Up]; var flixel_addons_ui_FlxUIInputText = function(X,Y,Width,Text1,size,TextColor,BackgroundColor,EmbeddedFont) { this.broadcastToFlxUI = true; flixel_addons_ui_FlxInputText.call(this,X,Y,Width,Text1,size,TextColor,BackgroundColor,EmbeddedFont); @@ -49355,11 +49264,10 @@ flixel_addons_ui_FlxUILine.prototype = $extend(flixel_addons_ui_FlxUISprite.prot ,__class__: flixel_addons_ui_FlxUILine ,__properties__: $extend(flixel_addons_ui_FlxUISprite.prototype.__properties__,{set_thickness:"set_thickness",set_length:"set_length",set_axis:"set_axis"}) }); -var flixel_addons_ui_LineAxis = $hxEnums["flixel.addons.ui.LineAxis"] = { __ename__:"flixel.addons.ui.LineAxis",__constructs__:null - ,HORIZONTAL: {_hx_name:"HORIZONTAL",_hx_index:0,__enum__:"flixel.addons.ui.LineAxis",toString:$estr} - ,VERTICAL: {_hx_name:"VERTICAL",_hx_index:1,__enum__:"flixel.addons.ui.LineAxis",toString:$estr} +var flixel_addons_ui_LineAxis = $hxEnums["flixel.addons.ui.LineAxis"] = { __ename__ : "flixel.addons.ui.LineAxis", __constructs__ : ["HORIZONTAL","VERTICAL"] + ,HORIZONTAL: {_hx_index:0,__enum__:"flixel.addons.ui.LineAxis",toString:$estr} + ,VERTICAL: {_hx_index:1,__enum__:"flixel.addons.ui.LineAxis",toString:$estr} }; -flixel_addons_ui_LineAxis.__constructs__ = [flixel_addons_ui_LineAxis.HORIZONTAL,flixel_addons_ui_LineAxis.VERTICAL]; var flixel_addons_ui_FlxUIList = function(X,Y,Widgets,W,H,MoreString,Stacking,Spacing,PrevButtonOffset,NextButtonOffset,PrevButton,NextButton) { if(Spacing == null) { Spacing = 0; @@ -49588,7 +49496,8 @@ flixel_addons_ui_FlxUIList.prototype = $extend(flixel_addons_ui_FlxUIGroup.proto return Value; } ,onClick: function(i) { - this.set_scrollIndex(this.scrollIndex + i); + var _g = this; + _g.set_scrollIndex(_g.scrollIndex + i); this.refreshList(); } ,refreshList: function() { @@ -50346,12 +50255,14 @@ flixel_addons_ui_FlxUINumericStepper.prototype = $extend(flixel_addons_ui_FlxUIG } } ,_onPlus: function() { - this.set_value(this.value + this.stepSize); + var _g = this; + _g.set_value(_g.value + this.stepSize); this._doCallback("click_numeric_stepper"); this._doCallback("change_numeric_stepper"); } ,_onMinus: function() { - this.set_value(this.value - this.stepSize); + var _g = this; + _g.set_value(_g.value - this.stepSize); this._doCallback("click_numeric_stepper"); this._doCallback("change_numeric_stepper"); } @@ -51488,8 +51399,10 @@ flixel_addons_ui_FlxUITabMenu.prototype = $extend(flixel_addons_ui_FlxUIGroup.pr tab.set_x(this.x + xx); tab.set_y(this.y); if(this._tab_offset != null) { - tab.set_x(tab.x + this._tab_offset.x); - tab.set_y(tab.y + this._tab_offset.y); + var _g2 = tab; + _g2.set_x(_g2.x + this._tab_offset.x); + var _g3 = tab; + _g3.set_y(_g3.y + this._tab_offset.y); } if(this._stretch_tabs) { var theHeight = tab.get_height(); @@ -51518,8 +51431,8 @@ flixel_addons_ui_FlxUITabMenu.prototype = $extend(flixel_addons_ui_FlxUIGroup.pr if(this._tabs != null && this._tabs.length > 0 && this._tabs[0] != null) { this._back.set_y(this._tabs[0].y + this._tabs[0].get_height() - 2); if(this._tab_offset != null) { - var fh = this._back; - fh.set_y(fh.y - this._tab_offset.y); + var _g = this._back; + _g.set_y(_g.y - this._tab_offset.y); } } this.calcBounds(); @@ -51573,9 +51486,11 @@ flixel_addons_ui_FlxUIText.prototype = $extend(flixel_text_FlxText.prototype,{ var numLines = this.textField.get_numLines(); while(diff * sign > 0 && failsafe < 999) { ++failsafe; - this.set_size((this._defaultFormat.size | 0) + sign); + var _g = this; + _g.set_size((_g._defaultFormat.size | 0) + sign); if(sign > 0 && this.textField.get_numLines() > numLines) { - this.set_size((this._defaultFormat.size | 0) - sign); + var _g1 = this; + _g1.set_size((_g1._defaultFormat.size | 0) - sign); break; } this._regen = true; @@ -52066,38 +51981,38 @@ flixel_addons_ui_FlxUITooltip.prototype = $extend(flixel_addons_ui_FlxUIGroup.pr this._anchorArrow.y.offset = oldOffY; if(this._arrow.x < 0) { var xx = Math.abs(this._arrow.x) | 0; - var fh = this._bkg; - fh.set_x(fh.x + xx); - var fh = this._titleText; - fh.set_x(fh.x + xx); - var fh = this._bodyText; - fh.set_x(fh.x + xx); + var _g = this._bkg; + _g.set_x(_g.x + xx); + var _g = this._titleText; + _g.set_x(_g.x + xx); + var _g = this._bodyText; + _g.set_x(_g.x + xx); this._arrow.set_x(0); } if(this._arrow.y < 0) { var yy = Math.abs(this._arrow.y) | 0; - var fh = this._bkg; - fh.set_y(fh.y + yy); - var fh = this._titleText; - fh.set_y(fh.y + yy); - var fh = this._bodyText; - fh.set_y(fh.y + yy); + var _g = this._bkg; + _g.set_y(_g.y + yy); + var _g = this._titleText; + _g.set_y(_g.y + yy); + var _g = this._bodyText; + _g.set_y(_g.y + yy); this._arrow.set_y(0); } if(this._titleText.text != "" && this._bodyText.text == "") { var tempH = H - (this.style.topPadding + this.style.bottomPadding); var titleOnlyOffset = (tempH - titleHeight) / 2 | 0; - var fh = this._titleText; - fh.set_y(fh.y + titleOnlyOffset); - } - var fh = this._titleText; - fh.set_x(fh.x + this.style.leftPadding); - var fh = this._bodyText; - fh.set_x(fh.x + this.style.leftPadding); - var fh = this._titleText; - fh.set_y(fh.y + this.style.topPadding); - var fh = this._bodyText; - fh.set_y(fh.y + this.style.topPadding); + var _g = this._titleText; + _g.set_y(_g.y + titleOnlyOffset); + } + var _g = this._titleText; + _g.set_x(_g.x + this.style.leftPadding); + var _g = this._bodyText; + _g.set_x(_g.x + this.style.leftPadding); + var _g = this._titleText; + _g.set_y(_g.y + this.style.topPadding); + var _g = this._bodyText; + _g.set_y(_g.y + this.style.topPadding); if(this._titleText.text == "") { this._titleText.set_x(this._bkg.x); this._titleText.set_y(this._bkg.y); @@ -52680,10 +52595,10 @@ flixel_addons_ui_FlxUITooltipManager.prototype = { var deltaY = btn.y - this.lastPosition.y; this.lastPosition.set_x(btn.x); this.lastPosition.set_y(btn.y); - var fh = this.tooltip; - fh.set_x(fh.x + deltaX); - var fh = this.tooltip; - fh.set_y(fh.y + deltaY); + var _g = this.tooltip; + _g.set_x(_g.x + deltaX); + var _g = this.tooltip; + _g.set_y(_g.y + deltaY); return; } this.current = i; @@ -55162,12 +55077,14 @@ flixel_animation_FlxAnimation.prototype = $extend(flixel_animation_FlxBaseAnimat if(this.looped && this.curFrame == 0) { this.set_curFrame(this.frames.length - 1); } else { - this.set_curFrame(this.curFrame - 1); + var _g = this; + _g.set_curFrame(_g.curFrame - 1); } } else if(this.looped && this.curFrame == this.frames.length - 1) { this.set_curFrame(0); } else { - this.set_curFrame(this.curFrame + 1); + var _g1 = this; + _g1.set_curFrame(_g1.curFrame + 1); } } } @@ -55235,14 +55152,10 @@ flixel_animation_FlxAnimationController.prototype = { } ,copyFrom: function(controller) { this.destroyAnimations(); - var h = controller._animations.h; - var anim_h = h; - var anim_keys = Object.keys(h); - var anim_length = anim_keys.length; - var anim_current = 0; - while(anim_current < anim_length) { - var anim = anim_h[anim_keys[anim_current++]]; - this.add(anim.name,anim.frames,anim.frameRate,anim.looped,anim.flipX,anim.flipY); + var anim = haxe_ds_StringMap.valueIterator(controller._animations.h); + while(anim.hasNext()) { + var anim1 = anim.next(); + this.add(anim1.name,anim1.frames,anim1.frameRate,anim1.looped,anim1.flipX,anim1.flipY); } if(controller._prerotated != null) { this.createPrerotated(); @@ -55280,14 +55193,10 @@ flixel_animation_FlxAnimationController.prototype = { ,clearAnimations: function() { if(this._animations != null) { var anim; - var h = this._animations.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - anim = this._animations.h[key]; + var key = haxe_ds_StringMap.keysIterator(this._animations.h); + while(key.hasNext()) { + var key1 = key.next(); + anim = this._animations.h[key1]; if(anim != null) { anim.destroy(); } @@ -55682,27 +55591,19 @@ flixel_animation_FlxAnimationController.prototype = { } ,getAnimationList: function() { var animList = []; - var h = this._animations.h; - var anims_h = h; - var anims_keys = Object.keys(h); - var anims_length = anims_keys.length; - var anims_current = 0; - while(anims_current < anims_length) { - var anims = anims_h[anims_keys[anims_current++]]; - animList.push(anims); + var anims = haxe_ds_StringMap.valueIterator(this._animations.h); + while(anims.hasNext()) { + var anims1 = anims.next(); + animList.push(anims1); } return animList; } ,getNameList: function() { var namesList = []; - var h = this._animations.h; - var names_h = h; - var names_keys = Object.keys(h); - var names_length = names_keys.length; - var names_current = 0; - while(names_current < names_length) { - var names = names_keys[names_current++]; - namesList.push(names); + var names = haxe_ds_StringMap.keysIterator(this._animations.h); + while(names.hasNext()) { + var names1 = names.next(); + namesList.push(names1); } return namesList; } @@ -57206,8 +57107,10 @@ flixel_graphics_atlas_FlxAtlas.prototype = { if(X == null) { X = 0; } - tileSize.set_x(tileSize.x + X); - tileSize.set_y(tileSize.y + Y); + var _g = tileSize; + _g.set_x(_g.x + X); + var _g = tileSize; + _g.set_y(_g.y + Y); } return node.getTileFrames(tileSize,tileSpacing,tileBorder); } @@ -57217,14 +57120,10 @@ flixel_graphics_atlas_FlxAtlas.prototype = { if(graph.get_atlasFrames() == null) { atlasFrames = new flixel_graphics_frames_FlxAtlasFrames(graph); } - var h = this.nodes.h; - var node_h = h; - var node_keys = Object.keys(h); - var node_length = node_keys.length; - var node_current = 0; - while(node_current < node_length) { - var node = node_h[node_keys[node_current++]]; - this.addNodeToAtlasFrames(node); + var node = haxe_ds_StringMap.valueIterator(this.nodes.h); + while(node.hasNext()) { + var node1 = node.next(); + this.addNodeToAtlasFrames(node1); } return atlasFrames; } @@ -57405,22 +57304,18 @@ flixel_graphics_atlas_FlxAtlas.prototype = { data += "format: RGBA8888\n"; data += "filter: Linear,Linear\n"; data += "repeat: none\n"; - var h = this.nodes.h; - var node_h = h; - var node_keys = Object.keys(h); - var node_length = node_keys.length; - var node_current = 0; - while(node_current < node_length) { - var node = node_h[node_keys[node_current++]]; - data += node.key + "\n"; - data += " rotate: " + (node.rotated == null ? "null" : "" + node.rotated) + "\n"; - data += " xy: " + (node.rect.x | 0) + ", " + (node.rect.y | 0) + "\n"; + var node = haxe_ds_StringMap.valueIterator(this.nodes.h); + while(node.hasNext()) { + var node1 = node.next(); + data += node1.key + "\n"; + data += " rotate: " + (node1.rotated == null ? "null" : "" + node1.rotated) + "\n"; + data += " xy: " + (node1.rect.x | 0) + ", " + (node1.rect.y | 0) + "\n"; if(this.allowRotation) { - data += "size: " + (node.rect.height | 0) + ", " + (node.rect.width | 0) + "\n"; - data += "orig: " + (node.rect.height | 0) + ", " + (node.rect.width | 0) + "\n"; + data += "size: " + (node1.rect.height | 0) + ", " + (node1.rect.width | 0) + "\n"; + data += "orig: " + (node1.rect.height | 0) + ", " + (node1.rect.width | 0) + "\n"; } else { - data += "size: " + (node.rect.width | 0) + ", " + (node.rect.height | 0) + "\n"; - data += "orig: " + (node.rect.width | 0) + ", " + (node.rect.height | 0) + "\n"; + data += "size: " + (node1.rect.width | 0) + ", " + (node1.rect.height | 0) + "\n"; + data += "orig: " + (node1.rect.width | 0) + ", " + (node1.rect.height | 0) + "\n"; } data += " offset: 0, 0\n"; data += " index: -1\n"; @@ -59456,8 +59351,10 @@ flixel_graphics_frames_FlxFrame.prototype = { if(X == null) { X = 0; } - _this.set_x(_this.x - X); - _this.set_y(_this.y - Y); + var _g = _this; + _g.set_x(_g.x - X); + var _g = _this; + _g.set_y(_g.y - Y); _this.addPoint(this.offset); var X = frameRect.x; var Y = frameRect.y; @@ -59934,15 +59831,14 @@ flixel_graphics_frames_FlxFrame.prototype = { ,__class__: flixel_graphics_frames_FlxFrame ,__properties__: {set_frame:"set_frame"} }; -var flixel_graphics_frames_FlxFrameCollectionType = $hxEnums["flixel.graphics.frames.FlxFrameCollectionType"] = { __ename__:"flixel.graphics.frames.FlxFrameCollectionType",__constructs__:null - ,IMAGE: {_hx_name:"IMAGE",_hx_index:0,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} - ,TILES: {_hx_name:"TILES",_hx_index:1,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} - ,ATLAS: {_hx_name:"ATLAS",_hx_index:2,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} - ,FONT: {_hx_name:"FONT",_hx_index:3,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} - ,USER: ($_=function(type) { return {_hx_index:4,type:type,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr}; },$_._hx_name="USER",$_.__params__ = ["type"],$_) - ,FILTER: {_hx_name:"FILTER",_hx_index:5,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} +var flixel_graphics_frames_FlxFrameCollectionType = $hxEnums["flixel.graphics.frames.FlxFrameCollectionType"] = { __ename__ : "flixel.graphics.frames.FlxFrameCollectionType", __constructs__ : ["IMAGE","TILES","ATLAS","FONT","USER","FILTER"] + ,IMAGE: {_hx_index:0,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} + ,TILES: {_hx_index:1,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} + ,ATLAS: {_hx_index:2,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} + ,FONT: {_hx_index:3,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} + ,USER: ($_=function(type) { return {_hx_index:4,type:type,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr}; },$_.__params__ = ["type"],$_) + ,FILTER: {_hx_index:5,__enum__:"flixel.graphics.frames.FlxFrameCollectionType",toString:$estr} }; -flixel_graphics_frames_FlxFrameCollectionType.__constructs__ = [flixel_graphics_frames_FlxFrameCollectionType.IMAGE,flixel_graphics_frames_FlxFrameCollectionType.TILES,flixel_graphics_frames_FlxFrameCollectionType.ATLAS,flixel_graphics_frames_FlxFrameCollectionType.FONT,flixel_graphics_frames_FlxFrameCollectionType.USER,flixel_graphics_frames_FlxFrameCollectionType.FILTER]; var flixel_graphics_frames_FlxImageFrame = function(parent,border) { flixel_graphics_frames_FlxFramesCollection.call(this,parent,flixel_graphics_frames_FlxFrameCollectionType.IMAGE,border); }; @@ -60315,8 +60211,10 @@ flixel_graphics_frames_FlxTileFrames.fromBitmapAddSpacesAndBorders = function(so if(X == null) { X = 0; } - _this.set_x(_this.x + X); - _this.set_y(_this.y + Y); + var _g = _this; + _g.set_x(_g.x + X); + var _g = _this; + _g.set_y(_g.y + Y); var tileFrames = flixel_graphics_frames_FlxTileFrames.fromGraphic(result,_this,null,tileSpacing); if(tileBorder == null) { return tileFrames; @@ -61030,8 +60928,10 @@ flixel_graphics_frames_FlxTileFrames.prototype = $extend(flixel_graphics_frames_ if(X == null) { X = 0; } - _this1.set_x(_this1.x - X); - _this1.set_y(_this1.y - Y); + var _g = _this1; + _g.set_x(_g.x - X); + var _g = _this1; + _g.set_y(_g.y - Y); var resultSize = _this1; var tileFrames = flixel_graphics_frames_FlxTileFrames.findFrame(this.parent,resultSize,this.region,this.atlasFrame,this.tileSpacing,resultBorder); if(tileFrames != null) { @@ -61153,11 +61053,10 @@ flixel_graphics_tile_FlxDrawBaseItem.prototype = { ,__class__: flixel_graphics_tile_FlxDrawBaseItem ,__properties__: {get_numTriangles:"get_numTriangles",get_numVertices:"get_numVertices"} }; -var flixel_graphics_tile_FlxDrawItemType = $hxEnums["flixel.graphics.tile.FlxDrawItemType"] = { __ename__:"flixel.graphics.tile.FlxDrawItemType",__constructs__:null - ,TILES: {_hx_name:"TILES",_hx_index:0,__enum__:"flixel.graphics.tile.FlxDrawItemType",toString:$estr} - ,TRIANGLES: {_hx_name:"TRIANGLES",_hx_index:1,__enum__:"flixel.graphics.tile.FlxDrawItemType",toString:$estr} +var flixel_graphics_tile_FlxDrawItemType = $hxEnums["flixel.graphics.tile.FlxDrawItemType"] = { __ename__ : "flixel.graphics.tile.FlxDrawItemType", __constructs__ : ["TILES","TRIANGLES"] + ,TILES: {_hx_index:0,__enum__:"flixel.graphics.tile.FlxDrawItemType",toString:$estr} + ,TRIANGLES: {_hx_index:1,__enum__:"flixel.graphics.tile.FlxDrawItemType",toString:$estr} }; -flixel_graphics_tile_FlxDrawItemType.__constructs__ = [flixel_graphics_tile_FlxDrawItemType.TILES,flixel_graphics_tile_FlxDrawItemType.TRIANGLES]; var flixel_graphics_tile_FlxDrawQuadsItem = function() { flixel_graphics_tile_FlxDrawBaseItem.call(this); this.type = flixel_graphics_tile_FlxDrawItemType.TILES; @@ -61279,29 +61178,12 @@ flixel_graphics_tile_FlxDrawQuadsItem.prototype = $extend(flixel_graphics_tile_F }); var flixel_graphics_tile_FlxDrawTrianglesItem = function() { var _this = flixel_math_FlxRect._pool.get(); - var X = 0; - var Y = 0; - var Width = 0; - var Height = 0; - if(Height == null) { - Height = 0; - } - if(Width == null) { - Width = 0; - } - if(Y == null) { - Y = 0; - } - if(X == null) { - X = 0; - } - _this.x = X; - _this.y = Y; - _this.width = Width; - _this.height = Height; - var rect = _this; - rect._inPool = false; - this.bounds = rect; + _this.x = 0; + _this.y = 0; + _this.width = 0; + _this.height = 0; + _this._inPool = false; + this.bounds = _this; this.colorsPosition = 0; this.indicesPosition = 0; this.verticesPosition = 0; @@ -61356,54 +61238,10 @@ flixel_graphics_tile_FlxDrawTrianglesItem.prototype = $extend(flixel_graphics_ti } ,reset: function() { flixel_graphics_tile_FlxDrawBaseItem.prototype.reset.call(this); - var this1 = this.vertices; - var deleteCount = this.vertices.get_length(); - var this2 = []; - this1.__tempIndex = 0; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,deleteCount); - var this1 = this.indices; - var deleteCount = this.indices.get_length(); - var this2 = []; - this1.__tempIndex = 0; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,deleteCount); - var this1 = this.uvtData; - var deleteCount = this.uvtData.get_length(); - var this2 = []; - this1.__tempIndex = 0; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,deleteCount); - var this1 = this.colors; - var deleteCount = this.colors.get_length(); - var this2 = []; - this1.__tempIndex = 0; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,deleteCount); + this.vertices.splice(0,this.vertices.get_length()); + this.indices.splice(0,this.indices.get_length()); + this.uvtData.splice(0,this.uvtData.get_length()); + this.colors.splice(0,this.colors.get_length()); this.verticesPosition = 0; this.indicesPosition = 0; this.colorsPosition = 0; @@ -61511,17 +61349,7 @@ flixel_graphics_tile_FlxDrawTrianglesItem.prototype = $extend(flixel_graphics_ti } } if(!result) { - var this1 = this.vertices; - var this2 = []; - this1.__tempIndex = this.vertices.get_length() - verticesLength; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,verticesLength); + this.vertices.splice(this.vertices.get_length() - verticesLength,verticesLength); } else { var uvtDataLength = uvtData.get_length(); var _g = 0; @@ -62434,25 +62262,23 @@ flixel_input_actions_FlxActionInput.prototype = { } ,__class__: flixel_input_actions_FlxActionInput }; -var flixel_input_actions_FlxInputType = $hxEnums["flixel.input.actions.FlxInputType"] = { __ename__:"flixel.input.actions.FlxInputType",__constructs__:null - ,DIGITAL: {_hx_name:"DIGITAL",_hx_index:0,__enum__:"flixel.input.actions.FlxInputType",toString:$estr} - ,ANALOG: {_hx_name:"ANALOG",_hx_index:1,__enum__:"flixel.input.actions.FlxInputType",toString:$estr} -}; -flixel_input_actions_FlxInputType.__constructs__ = [flixel_input_actions_FlxInputType.DIGITAL,flixel_input_actions_FlxInputType.ANALOG]; -var flixel_input_actions_FlxInputDevice = $hxEnums["flixel.input.actions.FlxInputDevice"] = { __ename__:"flixel.input.actions.FlxInputDevice",__constructs__:null - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:0,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,MOUSE: {_hx_name:"MOUSE",_hx_index:1,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,MOUSE_WHEEL: {_hx_name:"MOUSE_WHEEL",_hx_index:2,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,KEYBOARD: {_hx_name:"KEYBOARD",_hx_index:3,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,GAMEPAD: {_hx_name:"GAMEPAD",_hx_index:4,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,STEAM_CONTROLLER: {_hx_name:"STEAM_CONTROLLER",_hx_index:5,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,IFLXINPUT_OBJECT: {_hx_name:"IFLXINPUT_OBJECT",_hx_index:6,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,OTHER: {_hx_name:"OTHER",_hx_index:7,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,ANDROID: {_hx_name:"ANDROID",_hx_index:8,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,ALL: {_hx_name:"ALL",_hx_index:9,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} - ,NONE: {_hx_name:"NONE",_hx_index:10,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} -}; -flixel_input_actions_FlxInputDevice.__constructs__ = [flixel_input_actions_FlxInputDevice.UNKNOWN,flixel_input_actions_FlxInputDevice.MOUSE,flixel_input_actions_FlxInputDevice.MOUSE_WHEEL,flixel_input_actions_FlxInputDevice.KEYBOARD,flixel_input_actions_FlxInputDevice.GAMEPAD,flixel_input_actions_FlxInputDevice.STEAM_CONTROLLER,flixel_input_actions_FlxInputDevice.IFLXINPUT_OBJECT,flixel_input_actions_FlxInputDevice.OTHER,flixel_input_actions_FlxInputDevice.ANDROID,flixel_input_actions_FlxInputDevice.ALL,flixel_input_actions_FlxInputDevice.NONE]; +var flixel_input_actions_FlxInputType = $hxEnums["flixel.input.actions.FlxInputType"] = { __ename__ : "flixel.input.actions.FlxInputType", __constructs__ : ["DIGITAL","ANALOG"] + ,DIGITAL: {_hx_index:0,__enum__:"flixel.input.actions.FlxInputType",toString:$estr} + ,ANALOG: {_hx_index:1,__enum__:"flixel.input.actions.FlxInputType",toString:$estr} +}; +var flixel_input_actions_FlxInputDevice = $hxEnums["flixel.input.actions.FlxInputDevice"] = { __ename__ : "flixel.input.actions.FlxInputDevice", __constructs__ : ["UNKNOWN","MOUSE","MOUSE_WHEEL","KEYBOARD","GAMEPAD","STEAM_CONTROLLER","IFLXINPUT_OBJECT","OTHER","ANDROID","ALL","NONE"] + ,UNKNOWN: {_hx_index:0,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,MOUSE: {_hx_index:1,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,MOUSE_WHEEL: {_hx_index:2,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,KEYBOARD: {_hx_index:3,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,GAMEPAD: {_hx_index:4,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,STEAM_CONTROLLER: {_hx_index:5,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,IFLXINPUT_OBJECT: {_hx_index:6,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,OTHER: {_hx_index:7,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,ANDROID: {_hx_index:8,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,ALL: {_hx_index:9,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} + ,NONE: {_hx_index:10,__enum__:"flixel.input.actions.FlxInputDevice",toString:$estr} +}; var flixel_input_actions_FlxInputDeviceID = function() { }; $hxClasses["flixel.input.actions.FlxInputDeviceID"] = flixel_input_actions_FlxInputDeviceID; flixel_input_actions_FlxInputDeviceID.__name__ = "flixel.input.actions.FlxInputDeviceID"; @@ -63841,12 +63667,11 @@ flixel_input_actions__$FlxActionManager_ActionSetRegister.prototype = { } ,__class__: flixel_input_actions__$FlxActionManager_ActionSetRegister }; -var flixel_input_actions_ResetPolicy = $hxEnums["flixel.input.actions.ResetPolicy"] = { __ename__:"flixel.input.actions.ResetPolicy",__constructs__:null - ,NONE: {_hx_name:"NONE",_hx_index:0,__enum__:"flixel.input.actions.ResetPolicy",toString:$estr} - ,ALL_SETS: {_hx_name:"ALL_SETS",_hx_index:1,__enum__:"flixel.input.actions.ResetPolicy",toString:$estr} - ,DEFAULT_SET_ONLY: {_hx_name:"DEFAULT_SET_ONLY",_hx_index:2,__enum__:"flixel.input.actions.ResetPolicy",toString:$estr} +var flixel_input_actions_ResetPolicy = $hxEnums["flixel.input.actions.ResetPolicy"] = { __ename__ : "flixel.input.actions.ResetPolicy", __constructs__ : ["NONE","ALL_SETS","DEFAULT_SET_ONLY"] + ,NONE: {_hx_index:0,__enum__:"flixel.input.actions.ResetPolicy",toString:$estr} + ,ALL_SETS: {_hx_index:1,__enum__:"flixel.input.actions.ResetPolicy",toString:$estr} + ,DEFAULT_SET_ONLY: {_hx_index:2,__enum__:"flixel.input.actions.ResetPolicy",toString:$estr} }; -flixel_input_actions_ResetPolicy.__constructs__ = [flixel_input_actions_ResetPolicy.NONE,flixel_input_actions_ResetPolicy.ALL_SETS,flixel_input_actions_ResetPolicy.DEFAULT_SET_ONLY]; var flixel_input_actions_FlxSteamController = function() { }; $hxClasses["flixel.input.actions.FlxSteamController"] = flixel_input_actions_FlxSteamController; flixel_input_actions_FlxSteamController.__name__ = "flixel.input.actions.FlxSteamController"; @@ -64503,32 +64328,29 @@ flixel_input_gamepad_FlxGamepad.prototype = { ,__class__: flixel_input_gamepad_FlxGamepad ,__properties__: {set_deadZone:"set_deadZone",get_deadZone:"get_deadZone",set_attachment:"set_attachment",set_model:"set_model",get_name:"get_name"} }; -var flixel_input_gamepad_FlxGamepadDeadZoneMode = $hxEnums["flixel.input.gamepad.FlxGamepadDeadZoneMode"] = { __ename__:"flixel.input.gamepad.FlxGamepadDeadZoneMode",__constructs__:null - ,INDEPENDENT_AXES: {_hx_name:"INDEPENDENT_AXES",_hx_index:0,__enum__:"flixel.input.gamepad.FlxGamepadDeadZoneMode",toString:$estr} - ,CIRCULAR: {_hx_name:"CIRCULAR",_hx_index:1,__enum__:"flixel.input.gamepad.FlxGamepadDeadZoneMode",toString:$estr} -}; -flixel_input_gamepad_FlxGamepadDeadZoneMode.__constructs__ = [flixel_input_gamepad_FlxGamepadDeadZoneMode.INDEPENDENT_AXES,flixel_input_gamepad_FlxGamepadDeadZoneMode.CIRCULAR]; -var flixel_input_gamepad_FlxGamepadModel = $hxEnums["flixel.input.gamepad.FlxGamepadModel"] = { __ename__:"flixel.input.gamepad.FlxGamepadModel",__constructs__:null - ,LOGITECH: {_hx_name:"LOGITECH",_hx_index:0,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,OUYA: {_hx_name:"OUYA",_hx_index:1,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,PS4: {_hx_name:"PS4",_hx_index:2,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,PSVITA: {_hx_name:"PSVITA",_hx_index:3,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,XINPUT: {_hx_name:"XINPUT",_hx_index:4,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,MAYFLASH_WII_REMOTE: {_hx_name:"MAYFLASH_WII_REMOTE",_hx_index:5,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,WII_REMOTE: {_hx_name:"WII_REMOTE",_hx_index:6,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,MFI: {_hx_name:"MFI",_hx_index:7,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,SWITCH_PRO: {_hx_name:"SWITCH_PRO",_hx_index:8,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,SWITCH_JOYCON_LEFT: {_hx_name:"SWITCH_JOYCON_LEFT",_hx_index:9,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,SWITCH_JOYCON_RIGHT: {_hx_name:"SWITCH_JOYCON_RIGHT",_hx_index:10,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:11,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} -}; -flixel_input_gamepad_FlxGamepadModel.__constructs__ = [flixel_input_gamepad_FlxGamepadModel.LOGITECH,flixel_input_gamepad_FlxGamepadModel.OUYA,flixel_input_gamepad_FlxGamepadModel.PS4,flixel_input_gamepad_FlxGamepadModel.PSVITA,flixel_input_gamepad_FlxGamepadModel.XINPUT,flixel_input_gamepad_FlxGamepadModel.MAYFLASH_WII_REMOTE,flixel_input_gamepad_FlxGamepadModel.WII_REMOTE,flixel_input_gamepad_FlxGamepadModel.MFI,flixel_input_gamepad_FlxGamepadModel.SWITCH_PRO,flixel_input_gamepad_FlxGamepadModel.SWITCH_JOYCON_LEFT,flixel_input_gamepad_FlxGamepadModel.SWITCH_JOYCON_RIGHT,flixel_input_gamepad_FlxGamepadModel.UNKNOWN]; -var flixel_input_gamepad_FlxGamepadAttachment = $hxEnums["flixel.input.gamepad.FlxGamepadAttachment"] = { __ename__:"flixel.input.gamepad.FlxGamepadAttachment",__constructs__:null - ,WII_NUNCHUCK: {_hx_name:"WII_NUNCHUCK",_hx_index:0,__enum__:"flixel.input.gamepad.FlxGamepadAttachment",toString:$estr} - ,WII_CLASSIC_CONTROLLER: {_hx_name:"WII_CLASSIC_CONTROLLER",_hx_index:1,__enum__:"flixel.input.gamepad.FlxGamepadAttachment",toString:$estr} - ,NONE: {_hx_name:"NONE",_hx_index:2,__enum__:"flixel.input.gamepad.FlxGamepadAttachment",toString:$estr} -}; -flixel_input_gamepad_FlxGamepadAttachment.__constructs__ = [flixel_input_gamepad_FlxGamepadAttachment.WII_NUNCHUCK,flixel_input_gamepad_FlxGamepadAttachment.WII_CLASSIC_CONTROLLER,flixel_input_gamepad_FlxGamepadAttachment.NONE]; +var flixel_input_gamepad_FlxGamepadDeadZoneMode = $hxEnums["flixel.input.gamepad.FlxGamepadDeadZoneMode"] = { __ename__ : "flixel.input.gamepad.FlxGamepadDeadZoneMode", __constructs__ : ["INDEPENDENT_AXES","CIRCULAR"] + ,INDEPENDENT_AXES: {_hx_index:0,__enum__:"flixel.input.gamepad.FlxGamepadDeadZoneMode",toString:$estr} + ,CIRCULAR: {_hx_index:1,__enum__:"flixel.input.gamepad.FlxGamepadDeadZoneMode",toString:$estr} +}; +var flixel_input_gamepad_FlxGamepadModel = $hxEnums["flixel.input.gamepad.FlxGamepadModel"] = { __ename__ : "flixel.input.gamepad.FlxGamepadModel", __constructs__ : ["LOGITECH","OUYA","PS4","PSVITA","XINPUT","MAYFLASH_WII_REMOTE","WII_REMOTE","MFI","SWITCH_PRO","SWITCH_JOYCON_LEFT","SWITCH_JOYCON_RIGHT","UNKNOWN"] + ,LOGITECH: {_hx_index:0,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,OUYA: {_hx_index:1,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,PS4: {_hx_index:2,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,PSVITA: {_hx_index:3,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,XINPUT: {_hx_index:4,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,MAYFLASH_WII_REMOTE: {_hx_index:5,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,WII_REMOTE: {_hx_index:6,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,MFI: {_hx_index:7,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,SWITCH_PRO: {_hx_index:8,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,SWITCH_JOYCON_LEFT: {_hx_index:9,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,SWITCH_JOYCON_RIGHT: {_hx_index:10,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} + ,UNKNOWN: {_hx_index:11,__enum__:"flixel.input.gamepad.FlxGamepadModel",toString:$estr} +}; +var flixel_input_gamepad_FlxGamepadAttachment = $hxEnums["flixel.input.gamepad.FlxGamepadAttachment"] = { __ename__ : "flixel.input.gamepad.FlxGamepadAttachment", __constructs__ : ["WII_NUNCHUCK","WII_CLASSIC_CONTROLLER","NONE"] + ,WII_NUNCHUCK: {_hx_index:0,__enum__:"flixel.input.gamepad.FlxGamepadAttachment",toString:$estr} + ,WII_CLASSIC_CONTROLLER: {_hx_index:1,__enum__:"flixel.input.gamepad.FlxGamepadAttachment",toString:$estr} + ,NONE: {_hx_index:2,__enum__:"flixel.input.gamepad.FlxGamepadAttachment",toString:$estr} +}; var flixel_input_gamepad_FlxGamepadAnalogStick = function(x,y,settings) { this.mode = flixel_input_gamepad_FlxAnalogToDigitalMode.BOTH; this.digitalThreshold = 0.5; @@ -64596,12 +64418,11 @@ flixel_input_gamepad_FlxGamepadAnalogStick.prototype = { } ,__class__: flixel_input_gamepad_FlxGamepadAnalogStick }; -var flixel_input_gamepad_FlxAnalogToDigitalMode = $hxEnums["flixel.input.gamepad.FlxAnalogToDigitalMode"] = { __ename__:"flixel.input.gamepad.FlxAnalogToDigitalMode",__constructs__:null - ,BOTH: {_hx_name:"BOTH",_hx_index:0,__enum__:"flixel.input.gamepad.FlxAnalogToDigitalMode",toString:$estr} - ,ONLY_DIGITAL: {_hx_name:"ONLY_DIGITAL",_hx_index:1,__enum__:"flixel.input.gamepad.FlxAnalogToDigitalMode",toString:$estr} - ,ONLY_ANALOG: {_hx_name:"ONLY_ANALOG",_hx_index:2,__enum__:"flixel.input.gamepad.FlxAnalogToDigitalMode",toString:$estr} +var flixel_input_gamepad_FlxAnalogToDigitalMode = $hxEnums["flixel.input.gamepad.FlxAnalogToDigitalMode"] = { __ename__ : "flixel.input.gamepad.FlxAnalogToDigitalMode", __constructs__ : ["BOTH","ONLY_DIGITAL","ONLY_ANALOG"] + ,BOTH: {_hx_index:0,__enum__:"flixel.input.gamepad.FlxAnalogToDigitalMode",toString:$estr} + ,ONLY_DIGITAL: {_hx_index:1,__enum__:"flixel.input.gamepad.FlxAnalogToDigitalMode",toString:$estr} + ,ONLY_ANALOG: {_hx_index:2,__enum__:"flixel.input.gamepad.FlxAnalogToDigitalMode",toString:$estr} }; -flixel_input_gamepad_FlxAnalogToDigitalMode.__constructs__ = [flixel_input_gamepad_FlxAnalogToDigitalMode.BOTH,flixel_input_gamepad_FlxAnalogToDigitalMode.ONLY_DIGITAL,flixel_input_gamepad_FlxAnalogToDigitalMode.ONLY_ANALOG]; var flixel_input_gamepad_FlxGamepadButton = function(ID) { this.value = 0; flixel_input_FlxInput.call(this,ID); @@ -66477,12 +66298,11 @@ flixel_input_gamepad_mappings_FlxGamepadMapping.prototype = { ,__class__: flixel_input_gamepad_mappings_FlxGamepadMapping ,__properties__: {set_attachment:"set_attachment"} }; -var flixel_input_gamepad_mappings_Manufacturer = $hxEnums["flixel.input.gamepad.mappings.Manufacturer"] = { __ename__:"flixel.input.gamepad.mappings.Manufacturer",__constructs__:null - ,GooglePepper: {_hx_name:"GooglePepper",_hx_index:0,__enum__:"flixel.input.gamepad.mappings.Manufacturer",toString:$estr} - ,AdobeWindows: {_hx_name:"AdobeWindows",_hx_index:1,__enum__:"flixel.input.gamepad.mappings.Manufacturer",toString:$estr} - ,Unknown: {_hx_name:"Unknown",_hx_index:2,__enum__:"flixel.input.gamepad.mappings.Manufacturer",toString:$estr} +var flixel_input_gamepad_mappings_Manufacturer = $hxEnums["flixel.input.gamepad.mappings.Manufacturer"] = { __ename__ : "flixel.input.gamepad.mappings.Manufacturer", __constructs__ : ["GooglePepper","AdobeWindows","Unknown"] + ,GooglePepper: {_hx_index:0,__enum__:"flixel.input.gamepad.mappings.Manufacturer",toString:$estr} + ,AdobeWindows: {_hx_index:1,__enum__:"flixel.input.gamepad.mappings.Manufacturer",toString:$estr} + ,Unknown: {_hx_index:2,__enum__:"flixel.input.gamepad.mappings.Manufacturer",toString:$estr} }; -flixel_input_gamepad_mappings_Manufacturer.__constructs__ = [flixel_input_gamepad_mappings_Manufacturer.GooglePepper,flixel_input_gamepad_mappings_Manufacturer.AdobeWindows,flixel_input_gamepad_mappings_Manufacturer.Unknown]; flixel_input_gamepad_mappings_Manufacturer.__meta__ = { obj : { SuppressWarnings : ["checkstyle:MemberName"]}}; var flixel_input_gamepad_mappings_LogitechMapping = function(attachment) { flixel_input_gamepad_mappings_FlxGamepadMapping.call(this,attachment); @@ -68971,17 +68791,13 @@ var flixel_input_keyboard_FlxKeyboard = function() { return new flixel_input_keyboard_FlxKeyList(status,keyManager); }); this.preventDefaultKeys = [38,40,37,39,32,9]; - var h = flixel_input_keyboard_FlxKey.fromStringMap.h; - var code_h = h; - var code_keys = Object.keys(h); - var code_length = code_keys.length; - var code_current = 0; - while(code_current < code_length) { - var code = code_h[code_keys[code_current++]]; - if(code != -2 && code != -1) { - var input = new flixel_input_FlxInput(code); + var code = haxe_ds_StringMap.valueIterator(flixel_input_keyboard_FlxKey.fromStringMap.h); + while(code.hasNext()) { + var code1 = code.next(); + if(code1 != -2 && code1 != -1) { + var input = new flixel_input_FlxInput(code1); this._keyListArray.push(input); - this._keyListMap.h[code] = input; + this._keyListMap.h[code1] = input; } } }; @@ -69932,8 +69748,10 @@ flixel_math_FlxVector.add = function(this1,x,y) { if(X == null) { X = 0; } - this1.set_x(this1.x + X); - this1.set_y(this1.y + Y); + var _g = this1; + _g.set_x(_g.x + X); + var _g = this1; + _g.set_y(_g.y + Y); return this1; }; flixel_math_FlxVector.addPoint = function(this1,point) { @@ -69954,8 +69772,10 @@ flixel_math_FlxVector.subtract = function(this1,x,y) { if(X == null) { X = 0; } - this1.set_x(this1.x - X); - this1.set_y(this1.y - Y); + var _g = this1; + _g.set_x(_g.x - X); + var _g = this1; + _g.set_y(_g.y - Y); return this1; }; flixel_math_FlxVector.subtractPoint = function(this1,point) { @@ -70155,14 +69975,18 @@ flixel_math_FlxVector.leftNormal = function(this1,vec) { return vec; }; flixel_math_FlxVector.negate = function(this1) { - this1.set_x(this1.x * -1); - this1.set_y(this1.y * -1); + var _g = this1; + _g.set_x(_g.x * -1); + var _g = this1; + _g.set_y(_g.y * -1); return this1; }; flixel_math_FlxVector.negateNew = function(this1) { var this2 = flixel_math_FlxVector.clone(this1); - this2.set_x(this2.x * -1); - this2.set_y(this2.y * -1); + var _g = this2; + _g.set_x(_g.x * -1); + var _g = this2; + _g.set_y(_g.y * -1); return this2; }; flixel_math_FlxVector.projectTo = function(this1,v,proj) { @@ -70269,8 +70093,10 @@ flixel_math_FlxVector.ratio = function(this1,a,b,v) { } else { flixel_math_FlxVector._vector1 = flixel_math_FlxVector.clone(b,flixel_math_FlxVector._vector1); var _this = flixel_math_FlxVector._vector1; - _this.set_x(_this.x - a.x); - _this.set_y(_this.y - a.y); + var _g = _this; + _g.set_x(_g.x - a.x); + var _g = _this; + _g.set_y(_g.y - a.y); var this2 = flixel_math_FlxVector._vector1; r = (this2.y * v.x + -this2.x * v.y) / (this1.y * v.x + -this1.x * v.y); } @@ -70294,8 +70120,10 @@ flixel_math_FlxVector.ratioWeak = function(this1,a,b,v) { } flixel_math_FlxVector._vector1 = flixel_math_FlxVector.clone(b,flixel_math_FlxVector._vector1); var _this = flixel_math_FlxVector._vector1; - _this.set_x(_this.x - a.x); - _this.set_y(_this.y - a.y); + var _g = _this; + _g.set_x(_g.x - a.x); + var _g = _this; + _g.set_y(_g.y - a.y); var this2 = flixel_math_FlxVector._vector1; return (this2.y * v.x + -this2.x * v.y) / (this1.y * v.x + -this1.x * v.y); }; @@ -70308,8 +70136,10 @@ flixel_math_FlxVector.findIntersection = function(this1,a,b,v,intersection) { } else { flixel_math_FlxVector._vector1 = flixel_math_FlxVector.clone(b,flixel_math_FlxVector._vector1); var _this = flixel_math_FlxVector._vector1; - _this.set_x(_this.x - a.x); - _this.set_y(_this.y - a.y); + var _g = _this; + _g.set_x(_g.x - a.x); + var _g = _this; + _g.set_y(_g.y - a.y); var this2 = flixel_math_FlxVector._vector1; t = (this2.y * v.x + -this2.x * v.y) / (this1.y * v.x + -this1.x * v.y); } @@ -70380,8 +70210,10 @@ flixel_math_FlxVector.findIntersectionInBounds = function(this1,a,b,v,intersecti } else { flixel_math_FlxVector._vector1 = flixel_math_FlxVector.clone(b,flixel_math_FlxVector._vector1); var _this = flixel_math_FlxVector._vector1; - _this.set_x(_this.x - a.x); - _this.set_y(_this.y - a.y); + var _g = _this; + _g.set_x(_g.x - a.x); + var _g = _this; + _g.set_y(_g.y - a.y); var this2 = flixel_math_FlxVector._vector1; t1 = (this2.y * v.x + -this2.x * v.y) / (this1.y * v.x + -this1.x * v.y); } @@ -70393,8 +70225,10 @@ flixel_math_FlxVector.findIntersectionInBounds = function(this1,a,b,v,intersecti } else { flixel_math_FlxVector._vector1 = flixel_math_FlxVector.clone(a,flixel_math_FlxVector._vector1); var _this = flixel_math_FlxVector._vector1; - _this.set_x(_this.x - b.x); - _this.set_y(_this.y - b.y); + var _g = _this; + _g.set_x(_g.x - b.x); + var _g = _this; + _g.set_y(_g.y - b.y); var this2 = flixel_math_FlxVector._vector1; t2 = (this2.y * this1.x + -this2.x * this1.y) / (v.y * this1.x + -v.x * this1.y); } @@ -70487,8 +70321,10 @@ flixel_math_FlxVector.bounce = function(this1,normal,bounceCoeff) { bounceCoeff = 1; } var d = (1 + bounceCoeff) * (this1.x * normal.x + this1.y * normal.y); - this1.set_x(this1.x - d * normal.x); - this1.set_y(this1.y - d * normal.y); + var _g = this1; + _g.set_x(_g.x - d * normal.x); + var _g = this1; + _g.set_y(_g.y - d * normal.y); if(normal._weak) { normal.put(); } @@ -73662,15 +73498,14 @@ flixel_system_debug_FlxDebugger.__super__ = openfl_display_Sprite; flixel_system_debug_FlxDebugger.prototype = $extend(openfl_display_Sprite.prototype,{ __class__: flixel_system_debug_FlxDebugger }); -var flixel_system_debug_FlxDebuggerLayout = $hxEnums["flixel.system.debug.FlxDebuggerLayout"] = { __ename__:"flixel.system.debug.FlxDebuggerLayout",__constructs__:null - ,STANDARD: {_hx_name:"STANDARD",_hx_index:0,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} - ,MICRO: {_hx_name:"MICRO",_hx_index:1,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} - ,BIG: {_hx_name:"BIG",_hx_index:2,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} - ,TOP: {_hx_name:"TOP",_hx_index:3,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} - ,LEFT: {_hx_name:"LEFT",_hx_index:4,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} - ,RIGHT: {_hx_name:"RIGHT",_hx_index:5,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} -}; -flixel_system_debug_FlxDebuggerLayout.__constructs__ = [flixel_system_debug_FlxDebuggerLayout.STANDARD,flixel_system_debug_FlxDebuggerLayout.MICRO,flixel_system_debug_FlxDebuggerLayout.BIG,flixel_system_debug_FlxDebuggerLayout.TOP,flixel_system_debug_FlxDebuggerLayout.LEFT,flixel_system_debug_FlxDebuggerLayout.RIGHT]; +var flixel_system_debug_FlxDebuggerLayout = $hxEnums["flixel.system.debug.FlxDebuggerLayout"] = { __ename__ : "flixel.system.debug.FlxDebuggerLayout", __constructs__ : ["STANDARD","MICRO","BIG","TOP","LEFT","RIGHT"] + ,STANDARD: {_hx_index:0,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} + ,MICRO: {_hx_index:1,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} + ,BIG: {_hx_index:2,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} + ,TOP: {_hx_index:3,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} + ,LEFT: {_hx_index:4,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} + ,RIGHT: {_hx_index:5,__enum__:"flixel.system.debug.FlxDebuggerLayout",toString:$estr} +}; var flixel_system_debug_Tooltip = function() { }; $hxClasses["flixel.system.debug.Tooltip"] = flixel_system_debug_Tooltip; flixel_system_debug_Tooltip.__name__ = "flixel.system.debug.Tooltip"; @@ -73791,8 +73626,10 @@ flixel_system_debug_TooltipOverlay.prototype = $extend(openfl_display_Sprite.pro this.set_y(this.get_y() < 0 ? 0 : this.get_y()); var offsetX = this.get_x() + this.get_width() >= openfl_Lib.get_current().stage.stageWidth ? openfl_Lib.get_current().stage.stageWidth - (this.get_x() + this.get_width()) : 0; var offsetY = this.get_y() + this.get_height() >= openfl_Lib.get_current().stage.stageHeight ? openfl_Lib.get_current().stage.stageHeight - (this.get_y() + this.get_height()) : 0; - this.set_x(this.get_x() + offsetX); - this.set_y(this.get_y() + offsetY); + var _g = this; + _g.set_x(_g.get_x() + offsetX); + var _g = this; + _g.set_y(_g.get_y() + offsetY); } ,handleMouseEvents: function(event) { if(event.type == "mouseOver" && !this.get_visible()) { @@ -74435,15 +74272,7 @@ flixel_system_debug_console_ConsoleUtil.getFields = function(Object1) { if(js_Boot.__instanceof(Object1,Class)) { fields = Type.getClassFields(Object1); } else if(js_Boot.__instanceof(Object1,Enum)) { - var _this = Object1.__constructs__; - var result = new Array(_this.length); - var _g = 0; - var _g1 = _this.length; - while(_g < _g1) { - var i = _g++; - result[i] = _this[i]._hx_name; - } - fields = result; + fields = Object1.__constructs__.slice(); } else if(Reflect.isObject(Object1)) { fields = Type.getInstanceFields(js_Boot.getClass(Object1)); } @@ -74633,6 +74462,9 @@ hscript_Interp.prototype = { return v1 >>> v2; }); } + ,setVar: function(name,v) { + this.variables.h[name] = v; + } ,assign: function(e1,e2) { var v = this.expr(e2); switch(e1._hx_index) { @@ -74640,19 +74472,19 @@ hscript_Interp.prototype = { var id = e1.v; var l = this.locals.h[id]; if(l == null) { - this.variables.h[id] = v; + this.setVar(id,v); } else { l.r = v; } break; case 5: - var e = e1.e; var f = e1.f; + var e = e1.e; v = this.set(this.expr(e),f,v); break; case 16: - var e = e1.e; var index = e1.index; + var e = e1.e; var arr = this.expr(e); var index1 = this.expr(index); if(js_Boot.__implements(arr,haxe_IMap)) { @@ -74681,21 +74513,21 @@ hscript_Interp.prototype = { var l = this.locals.h[id]; v = fop(this.expr(e1),this.expr(e2)); if(l == null) { - this.variables.h[id] = v; + this.setVar(id,v); } else { l.r = v; } break; case 5: - var e = e1.e; var f = e1.f; + var e = e1.e; var obj = this.expr(e); v = fop(this.get(obj,f),this.expr(e2)); v = this.set(obj,f,v); break; case 16: - var e = e1.e; var index = e1.index; + var e = e1.e; var arr = this.expr(e); var index1 = this.expr(index); if(js_Boot.__implements(arr,haxe_IMap)) { @@ -74717,23 +74549,23 @@ hscript_Interp.prototype = { case 1: var id = e.v; var l = this.locals.h[id]; - var v = l == null ? this.variables.h[id] : l.r; + var v = l == null ? this.resolve(id) : l.r; if(prefix) { v += delta; if(l == null) { - this.variables.h[id] = v; + this.setVar(id,v); } else { l.r = v; } } else if(l == null) { - this.variables.h[id] = v + delta; + this.setVar(id,v + delta); } else { l.r = v + delta; } return v; case 5: - var e1 = e.e; var f = e.f; + var e1 = e.e; var obj = this.expr(e1); var v = this.get(obj,f); if(prefix) { @@ -74744,8 +74576,8 @@ hscript_Interp.prototype = { } return v; case 16: - var e1 = e.e; var index = e.index; + var e1 = e.e; var arr = this.expr(e1); var index1 = this.expr(index); if(js_Boot.__implements(arr,haxe_IMap)) { @@ -74804,14 +74636,10 @@ hscript_Interp.prototype = { } ,duplicate: function(h) { var h2 = new haxe_ds_StringMap(); - var h1 = h.h; - var k_h = h1; - var k_keys = Object.keys(h1); - var k_length = k_keys.length; - var k_current = 0; - while(k_current < k_length) { - var k = k_keys[k_current++]; - h2.h[k] = h.h[k]; + var k = haxe_ds_StringMap.keysIterator(h.h); + while(k.hasNext()) { + var k1 = k.next(); + h2.h[k1] = h.h[k1]; } return h2; } @@ -74868,8 +74696,8 @@ hscript_Interp.prototype = { return this.resolve(id); case 2: var _g = e.t; - var n = e.n; var e1 = e.e; + var n = e.n; this.declared.push({ n : n, old : this.locals.h[n]}); var this1 = this.locals; var value = e1 == null ? null : this.expr(e1); @@ -74891,13 +74719,13 @@ hscript_Interp.prototype = { this.restore(old); return v; case 5: - var e1 = e.e; var f = e.f; + var e1 = e.e; return this.get(this.expr(e1),f); case 6: - var op = e.op; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var op = e.op; var fop = this.binops.h[op]; if(fop == null) { var e3 = hscript_Error.EInvalidOp(op); @@ -74905,9 +74733,9 @@ hscript_Interp.prototype = { } return fop(e1,e2); case 7: - var op = e.op; - var prefix = e.prefix; var e1 = e.e; + var prefix = e.prefix; + var op = e.op; switch(op) { case "!": return this.expr(e1) != true; @@ -74925,8 +74753,8 @@ hscript_Interp.prototype = { } break; case 8: - var e1 = e.e; var params = e.params; + var e1 = e.e; var args = []; var _g = 0; while(_g < params.length) { @@ -74935,8 +74763,8 @@ hscript_Interp.prototype = { args.push(this.expr(p)); } if(e1._hx_index == 5) { - var e2 = e1.e; var f = e1.f; + var e2 = e1.e; var obj = this.expr(e2); if(obj == null) { var e2 = hscript_Error.EInvalidAccess(f); @@ -74948,9 +74776,9 @@ hscript_Interp.prototype = { } break; case 9: - var econd = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var econd = e.cond; if(this.expr(econd) == true) { return this.expr(e1); } else if(e2 == null) { @@ -74960,14 +74788,14 @@ hscript_Interp.prototype = { } break; case 10: - var econd = e.cond; var e1 = e.e; + var econd = e.cond; this.whileLoop(econd,e1); return null; case 11: - var v = e.v; - var it = e.it; var e1 = e.e; + var it = e.it; + var v = e.v; this.forLoop(v,it,e1); return null; case 12: @@ -74976,9 +74804,9 @@ hscript_Interp.prototype = { throw haxe_Exception.thrown(hscript__$Interp_Stop.SContinue); case 14: var _g = e.ret; - var params = e.args; - var fexpr = e.e; var name = e.name; + var fexpr = e.e; + var params = e.args; var capturedLocals = this.duplicate(this.locals); var me = this; var hasOpt = false; @@ -75034,6 +74862,7 @@ hscript_Interp.prototype = { me.locals.h[params[i].name] = { r : args[i]}; } var r = null; + var oldDecl = _gthis.declared.length; if(_gthis.inTry) { try { r = me.exprReturn(fexpr); @@ -75047,6 +74876,7 @@ hscript_Interp.prototype = { } else { r = me.exprReturn(fexpr); } + _gthis.restore(oldDecl); me.locals = old; me.depth = depth; return r; @@ -75068,8 +74898,8 @@ hscript_Interp.prototype = { this.returnValue = e1 == null ? null : this.expr(e1); throw haxe_Exception.thrown(hscript__$Interp_Stop.SReturn); case 16: - var e1 = e.e; var index = e.index; + var e1 = e.e; var arr = this.expr(e1); var index1 = this.expr(index); if(js_Boot.__implements(arr,haxe_IMap)) { @@ -75084,8 +74914,8 @@ hscript_Interp.prototype = { if(arr.length > 0) { var _g = arr[0]; if(_g._hx_index == 6) { - var _g1 = _g.e1; var _g1 = _g.e2; + var _g1 = _g.e1; tmp = _g.op == "=>"; } else { tmp = false; @@ -75106,8 +74936,8 @@ hscript_Interp.prototype = { ++_g; if(e1._hx_index == 6) { if(e1.op == "=>") { - var eKey = e1.e1; var eValue = e1.e2; + var eKey = e1.e1; var key = this.expr(eKey); var value = this.expr(eValue); isAllString = isAllString && typeof(key) == "string"; @@ -75154,8 +74984,8 @@ hscript_Interp.prototype = { } break; case 18: - var cl = e.cl; var params1 = e.params; + var cl = e.cl; var a = []; var _g = 0; while(_g < params1.length) { @@ -75169,9 +74999,9 @@ hscript_Interp.prototype = { throw haxe_Exception.thrown(this.expr(e1)); case 20: var _g = e.t; - var e1 = e.e; - var n = e.v; var ecatch = e.ecatch; + var n = e.v; + var e1 = e.e; var old = this.declared.length; var oldTry = this.inTry; try { @@ -75210,9 +75040,9 @@ hscript_Interp.prototype = { } return o; case 22: - var econd = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var econd = e.cond; if(this.expr(econd) == true) { return this.expr(e1); } else { @@ -75220,9 +75050,9 @@ hscript_Interp.prototype = { } break; case 23: - var e1 = e.e; - var cases = e.cases; var def = e.defaultExpr; + var cases = e.cases; + var e1 = e.e; var val = this.expr(e1); var match = false; var _g = 0; @@ -75249,13 +75079,13 @@ hscript_Interp.prototype = { } return val; case 24: - var econd = e.cond; var e1 = e.e; + var econd = e.cond; this.doWhileLoop(econd,e1); return null; case 25: - var _g = e.name; var _g = e.args; + var _g = e.name; var e1 = e.e; return this.expr(e1); case 26: @@ -75404,7 +75234,7 @@ flixel_system_debug_console__$ConsoleUtil_Interp.__name__ = "flixel.system.debug flixel_system_debug_console__$ConsoleUtil_Interp.__super__ = hscript_Interp; flixel_system_debug_console__$ConsoleUtil_Interp.prototype = $extend(hscript_Interp.prototype,{ getGlobals: function() { - return this.toArray(new haxe_ds__$StringMap_StringMapKeyIterator(this.locals.h)).concat(this.toArray(new haxe_ds__$StringMap_StringMapKeyIterator(this.variables.h))); + return this.toArray(haxe_ds_StringMap.keysIterator(this.locals.h)).concat(this.toArray(haxe_ds_StringMap.keysIterator(this.variables.h))); } ,toArray: function(iterator) { var array = []; @@ -76071,8 +75901,10 @@ flixel_system_debug_interaction_tools_Mover.prototype = $extend(flixel_system_de } var object = member; if(object != null) { - object.set_x(object.x + dx); - object.set_y(object.y + dy); + var _g2 = object; + _g2.set_x(_g2.x + dx); + var _g3 = object; + _g3.set_y(_g3.y + dy); } } } @@ -76888,32 +76720,29 @@ flixel_system_debug_watch_TrackerProfile.prototype = { } ,__class__: flixel_system_debug_watch_TrackerProfile }; -var flixel_system_frontEnds_FlxBrowser = $hxEnums["flixel.system.frontEnds.FlxBrowser"] = { __ename__:"flixel.system.frontEnds.FlxBrowser",__constructs__:null - ,INTERNET_EXPLORER: {_hx_name:"INTERNET_EXPLORER",_hx_index:0,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} - ,CHROME: {_hx_name:"CHROME",_hx_index:1,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} - ,FIREFOX: {_hx_name:"FIREFOX",_hx_index:2,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} - ,SAFARI: {_hx_name:"SAFARI",_hx_index:3,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} - ,OPERA: {_hx_name:"OPERA",_hx_index:4,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:5,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} -}; -flixel_system_frontEnds_FlxBrowser.__constructs__ = [flixel_system_frontEnds_FlxBrowser.INTERNET_EXPLORER,flixel_system_frontEnds_FlxBrowser.CHROME,flixel_system_frontEnds_FlxBrowser.FIREFOX,flixel_system_frontEnds_FlxBrowser.SAFARI,flixel_system_frontEnds_FlxBrowser.OPERA,flixel_system_frontEnds_FlxBrowser.UNKNOWN]; -var flixel_system_frontEnds_FlxPlatform = $hxEnums["flixel.system.frontEnds.FlxPlatform"] = { __ename__:"flixel.system.frontEnds.FlxPlatform",__constructs__:null - ,WINDOWS: {_hx_name:"WINDOWS",_hx_index:0,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} - ,LINUX: {_hx_name:"LINUX",_hx_index:1,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} - ,MAC: {_hx_name:"MAC",_hx_index:2,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} - ,ANDROID: {_hx_name:"ANDROID",_hx_index:3,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} - ,BLACKBERRY: {_hx_name:"BLACKBERRY",_hx_index:4,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} - ,WINDOWS_PHONE: {_hx_name:"WINDOWS_PHONE",_hx_index:5,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} - ,IOS: ($_=function(device) { return {_hx_index:6,device:device,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr}; },$_._hx_name="IOS",$_.__params__ = ["device"],$_) - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:7,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} -}; -flixel_system_frontEnds_FlxPlatform.__constructs__ = [flixel_system_frontEnds_FlxPlatform.WINDOWS,flixel_system_frontEnds_FlxPlatform.LINUX,flixel_system_frontEnds_FlxPlatform.MAC,flixel_system_frontEnds_FlxPlatform.ANDROID,flixel_system_frontEnds_FlxPlatform.BLACKBERRY,flixel_system_frontEnds_FlxPlatform.WINDOWS_PHONE,flixel_system_frontEnds_FlxPlatform.IOS,flixel_system_frontEnds_FlxPlatform.UNKNOWN]; -var flixel_system_frontEnds_FlxIOSDevice = $hxEnums["flixel.system.frontEnds.FlxIOSDevice"] = { __ename__:"flixel.system.frontEnds.FlxIOSDevice",__constructs__:null - ,IPHONE: {_hx_name:"IPHONE",_hx_index:0,__enum__:"flixel.system.frontEnds.FlxIOSDevice",toString:$estr} - ,IPAD: {_hx_name:"IPAD",_hx_index:1,__enum__:"flixel.system.frontEnds.FlxIOSDevice",toString:$estr} - ,IPOD: {_hx_name:"IPOD",_hx_index:2,__enum__:"flixel.system.frontEnds.FlxIOSDevice",toString:$estr} -}; -flixel_system_frontEnds_FlxIOSDevice.__constructs__ = [flixel_system_frontEnds_FlxIOSDevice.IPHONE,flixel_system_frontEnds_FlxIOSDevice.IPAD,flixel_system_frontEnds_FlxIOSDevice.IPOD]; +var flixel_system_frontEnds_FlxBrowser = $hxEnums["flixel.system.frontEnds.FlxBrowser"] = { __ename__ : "flixel.system.frontEnds.FlxBrowser", __constructs__ : ["INTERNET_EXPLORER","CHROME","FIREFOX","SAFARI","OPERA","UNKNOWN"] + ,INTERNET_EXPLORER: {_hx_index:0,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} + ,CHROME: {_hx_index:1,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} + ,FIREFOX: {_hx_index:2,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} + ,SAFARI: {_hx_index:3,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} + ,OPERA: {_hx_index:4,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} + ,UNKNOWN: {_hx_index:5,__enum__:"flixel.system.frontEnds.FlxBrowser",toString:$estr} +}; +var flixel_system_frontEnds_FlxPlatform = $hxEnums["flixel.system.frontEnds.FlxPlatform"] = { __ename__ : "flixel.system.frontEnds.FlxPlatform", __constructs__ : ["WINDOWS","LINUX","MAC","ANDROID","BLACKBERRY","WINDOWS_PHONE","IOS","UNKNOWN"] + ,WINDOWS: {_hx_index:0,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} + ,LINUX: {_hx_index:1,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} + ,MAC: {_hx_index:2,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} + ,ANDROID: {_hx_index:3,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} + ,BLACKBERRY: {_hx_index:4,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} + ,WINDOWS_PHONE: {_hx_index:5,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} + ,IOS: ($_=function(device) { return {_hx_index:6,device:device,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr}; },$_.__params__ = ["device"],$_) + ,UNKNOWN: {_hx_index:7,__enum__:"flixel.system.frontEnds.FlxPlatform",toString:$estr} +}; +var flixel_system_frontEnds_FlxIOSDevice = $hxEnums["flixel.system.frontEnds.FlxIOSDevice"] = { __ename__ : "flixel.system.frontEnds.FlxIOSDevice", __constructs__ : ["IPHONE","IPAD","IPOD"] + ,IPHONE: {_hx_index:0,__enum__:"flixel.system.frontEnds.FlxIOSDevice",toString:$estr} + ,IPAD: {_hx_index:1,__enum__:"flixel.system.frontEnds.FlxIOSDevice",toString:$estr} + ,IPOD: {_hx_index:2,__enum__:"flixel.system.frontEnds.FlxIOSDevice",toString:$estr} +}; var flixel_system_frontEnds_PluginFrontEnd = function() { this.list = []; this.add_flixel_util_FlxTimerManager(flixel_util_FlxTimer.globalManager = new flixel_util_FlxTimerManager()); @@ -77207,7 +77036,8 @@ flixel_system_frontEnds_SoundFrontEnd.prototype = { } ,changeVolume: function(Amount) { this.muted = false; - this.set_volume(this.volume + Amount); + var _g = this; + _g.set_volume(_g.volume + Amount); this.showSoundTray(); } ,showSoundTray: function() { @@ -77386,7 +77216,8 @@ flixel_system_ui_FlxSoundTray.prototype = $extend(openfl_display_Sprite.prototyp if(this._timer > 0) { this._timer -= MS / 1000; } else if(this.get_y() > -this.get_height()) { - this.set_y(this.get_y() - MS / 1000 * flixel_FlxG.height * 2); + var _g = this; + _g.set_y(_g.get_y() - MS / 1000 * flixel_FlxG.height * 2); if(this.get_y() <= -this.get_height()) { this.set_visible(false); this.active = false; @@ -77494,12 +77325,14 @@ flixel_system_ui_FlxSystemButton.prototype = $extend(openfl_display_Sprite.proto } ,onMouseOver: function(_) { if(this.enabled) { - this.set_alpha(this.get_alpha() - 0.2); + var _g = this; + _g.set_alpha(_g.get_alpha() - 0.2); } } ,onMouseOut: function(_) { if(this.enabled) { - this.set_alpha(this.get_alpha() + 0.2); + var _g = this; + _g.set_alpha(_g.get_alpha() + 0.2); } } ,set_toggled: function(Value) { @@ -77550,13 +77383,12 @@ flixel_text_FlxTextFormatMarkerPair.prototype = { ,marker: null ,__class__: flixel_text_FlxTextFormatMarkerPair }; -var flixel_text_FlxTextBorderStyle = $hxEnums["flixel.text.FlxTextBorderStyle"] = { __ename__:"flixel.text.FlxTextBorderStyle",__constructs__:null - ,NONE: {_hx_name:"NONE",_hx_index:0,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} - ,SHADOW: {_hx_name:"SHADOW",_hx_index:1,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} - ,OUTLINE: {_hx_name:"OUTLINE",_hx_index:2,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} - ,OUTLINE_FAST: {_hx_name:"OUTLINE_FAST",_hx_index:3,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} +var flixel_text_FlxTextBorderStyle = $hxEnums["flixel.text.FlxTextBorderStyle"] = { __ename__ : "flixel.text.FlxTextBorderStyle", __constructs__ : ["NONE","SHADOW","OUTLINE","OUTLINE_FAST"] + ,NONE: {_hx_index:0,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} + ,SHADOW: {_hx_index:1,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} + ,OUTLINE: {_hx_index:2,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} + ,OUTLINE_FAST: {_hx_index:3,__enum__:"flixel.text.FlxTextBorderStyle",toString:$estr} }; -flixel_text_FlxTextBorderStyle.__constructs__ = [flixel_text_FlxTextBorderStyle.NONE,flixel_text_FlxTextBorderStyle.SHADOW,flixel_text_FlxTextBorderStyle.OUTLINE,flixel_text_FlxTextBorderStyle.OUTLINE_FAST]; var flixel_text_FlxTextAlign = {}; flixel_text_FlxTextAlign.fromOpenFL = function(align) { switch(align) { @@ -78490,13 +78322,12 @@ flixel_tile_FlxBaseTilemap.prototype = $extend(flixel_FlxObject.prototype,{ } ,__class__: flixel_tile_FlxBaseTilemap }); -var flixel_tile_FlxTilemapAutoTiling = $hxEnums["flixel.tile.FlxTilemapAutoTiling"] = { __ename__:"flixel.tile.FlxTilemapAutoTiling",__constructs__:null - ,OFF: {_hx_name:"OFF",_hx_index:0,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} - ,AUTO: {_hx_name:"AUTO",_hx_index:1,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} - ,ALT: {_hx_name:"ALT",_hx_index:2,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} - ,FULL: {_hx_name:"FULL",_hx_index:3,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} +var flixel_tile_FlxTilemapAutoTiling = $hxEnums["flixel.tile.FlxTilemapAutoTiling"] = { __ename__ : "flixel.tile.FlxTilemapAutoTiling", __constructs__ : ["OFF","AUTO","ALT","FULL"] + ,OFF: {_hx_index:0,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} + ,AUTO: {_hx_index:1,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} + ,ALT: {_hx_index:2,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} + ,FULL: {_hx_index:3,__enum__:"flixel.tile.FlxTilemapAutoTiling",toString:$estr} }; -flixel_tile_FlxTilemapAutoTiling.__constructs__ = [flixel_tile_FlxTilemapAutoTiling.OFF,flixel_tile_FlxTilemapAutoTiling.AUTO,flixel_tile_FlxTilemapAutoTiling.ALT,flixel_tile_FlxTilemapAutoTiling.FULL]; var flixel_tile_FlxTileblock = function(X,Y,Width,Height) { flixel_FlxSprite.call(this,X,Y); this.makeGraphic(Width,Height,0,true); @@ -80412,17 +80243,16 @@ flixel_tweens_motion_QuadPath.prototype = $extend(flixel_tweens_motion_Motion.pr } ,__class__: flixel_tweens_motion_QuadPath }); -var flixel_ui_FlxBarFillDirection = $hxEnums["flixel.ui.FlxBarFillDirection"] = { __ename__:"flixel.ui.FlxBarFillDirection",__constructs__:null - ,LEFT_TO_RIGHT: {_hx_name:"LEFT_TO_RIGHT",_hx_index:0,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,RIGHT_TO_LEFT: {_hx_name:"RIGHT_TO_LEFT",_hx_index:1,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,TOP_TO_BOTTOM: {_hx_name:"TOP_TO_BOTTOM",_hx_index:2,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,BOTTOM_TO_TOP: {_hx_name:"BOTTOM_TO_TOP",_hx_index:3,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,HORIZONTAL_INSIDE_OUT: {_hx_name:"HORIZONTAL_INSIDE_OUT",_hx_index:4,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,HORIZONTAL_OUTSIDE_IN: {_hx_name:"HORIZONTAL_OUTSIDE_IN",_hx_index:5,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,VERTICAL_INSIDE_OUT: {_hx_name:"VERTICAL_INSIDE_OUT",_hx_index:6,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} - ,VERTICAL_OUTSIDE_IN: {_hx_name:"VERTICAL_OUTSIDE_IN",_hx_index:7,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} -}; -flixel_ui_FlxBarFillDirection.__constructs__ = [flixel_ui_FlxBarFillDirection.LEFT_TO_RIGHT,flixel_ui_FlxBarFillDirection.RIGHT_TO_LEFT,flixel_ui_FlxBarFillDirection.TOP_TO_BOTTOM,flixel_ui_FlxBarFillDirection.BOTTOM_TO_TOP,flixel_ui_FlxBarFillDirection.HORIZONTAL_INSIDE_OUT,flixel_ui_FlxBarFillDirection.HORIZONTAL_OUTSIDE_IN,flixel_ui_FlxBarFillDirection.VERTICAL_INSIDE_OUT,flixel_ui_FlxBarFillDirection.VERTICAL_OUTSIDE_IN]; +var flixel_ui_FlxBarFillDirection = $hxEnums["flixel.ui.FlxBarFillDirection"] = { __ename__ : "flixel.ui.FlxBarFillDirection", __constructs__ : ["LEFT_TO_RIGHT","RIGHT_TO_LEFT","TOP_TO_BOTTOM","BOTTOM_TO_TOP","HORIZONTAL_INSIDE_OUT","HORIZONTAL_OUTSIDE_IN","VERTICAL_INSIDE_OUT","VERTICAL_OUTSIDE_IN"] + ,LEFT_TO_RIGHT: {_hx_index:0,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,RIGHT_TO_LEFT: {_hx_index:1,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,TOP_TO_BOTTOM: {_hx_index:2,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,BOTTOM_TO_TOP: {_hx_index:3,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,HORIZONTAL_INSIDE_OUT: {_hx_index:4,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,HORIZONTAL_OUTSIDE_IN: {_hx_index:5,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,VERTICAL_INSIDE_OUT: {_hx_index:6,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} + ,VERTICAL_OUTSIDE_IN: {_hx_index:7,__enum__:"flixel.ui.FlxBarFillDirection",toString:$estr} +}; var flixel_ui_FlxTypedButton_$flixel_$text_$FlxText = function(X,Y,OnClick) { if(Y == null) { Y = 0; @@ -80440,15 +80270,7 @@ var flixel_ui_FlxTypedButton_$flixel_$text_$FlxText = function(X,Y,OnClick) { point._inPool = false; var point1 = flixel_math_FlxPoint._pool.get().set(0,0); point1._inPool = false; - var X1 = 0; - var Y1 = 1; - if(Y1 == null) { - Y1 = 0; - } - if(X1 == null) { - X1 = 0; - } - var point2 = flixel_math_FlxPoint._pool.get().set(X1,Y1); + var point2 = flixel_math_FlxPoint._pool.get().set(0,1); point2._inPool = false; this.labelOffsets = [point,point1,point2]; flixel_FlxSprite.call(this,X,Y); @@ -81011,12 +80833,11 @@ flixel_util_FlxArrayUtil.safePush = function(array,element) { flixel_util_FlxArrayUtil.contains = function(array,element) { return array.indexOf(element) != -1; }; -var flixel_util_FlxAxes = $hxEnums["flixel.util.FlxAxes"] = { __ename__:"flixel.util.FlxAxes",__constructs__:null - ,X: {_hx_name:"X",_hx_index:0,__enum__:"flixel.util.FlxAxes",toString:$estr} - ,Y: {_hx_name:"Y",_hx_index:1,__enum__:"flixel.util.FlxAxes",toString:$estr} - ,XY: {_hx_name:"XY",_hx_index:2,__enum__:"flixel.util.FlxAxes",toString:$estr} +var flixel_util_FlxAxes = $hxEnums["flixel.util.FlxAxes"] = { __ename__ : "flixel.util.FlxAxes", __constructs__ : ["X","Y","XY"] + ,X: {_hx_index:0,__enum__:"flixel.util.FlxAxes",toString:$estr} + ,Y: {_hx_index:1,__enum__:"flixel.util.FlxAxes",toString:$estr} + ,XY: {_hx_index:2,__enum__:"flixel.util.FlxAxes",toString:$estr} }; -flixel_util_FlxAxes.__constructs__ = [flixel_util_FlxAxes.X,flixel_util_FlxAxes.Y,flixel_util_FlxAxes.XY]; var flixel_util_FlxBitmapDataPool = function() { }; $hxClasses["flixel.util.FlxBitmapDataPool"] = flixel_util_FlxBitmapDataPool; flixel_util_FlxBitmapDataPool.__name__ = "flixel.util.FlxBitmapDataPool"; @@ -82100,15 +81921,11 @@ flixel_util_FlxColor.fromString = function(str) { } } else { str = str.toUpperCase(); - var h = flixel_util_FlxColor.colorLookup.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(key.toUpperCase() == str) { - result = flixel_util_FlxColor._new(flixel_util_FlxColor.colorLookup.h[key]); + var key = haxe_ds_StringMap.keysIterator(flixel_util_FlxColor.colorLookup.h); + while(key.hasNext()) { + var key1 = key.next(); + if(key1.toUpperCase() == str) { + result = flixel_util_FlxColor._new(flixel_util_FlxColor.colorLookup.h[key1]); break; } } @@ -84041,12 +83858,11 @@ flixel_util_FlxGradient.overlayGradientOnBitmapData = function(dest,width,height source.dispose(); return dest; }; -var flixel_util_FlxHorizontalAlign = $hxEnums["flixel.util.FlxHorizontalAlign"] = { __ename__:"flixel.util.FlxHorizontalAlign",__constructs__:null - ,LEFT: {_hx_name:"LEFT",_hx_index:0,__enum__:"flixel.util.FlxHorizontalAlign",toString:$estr} - ,CENTER: {_hx_name:"CENTER",_hx_index:1,__enum__:"flixel.util.FlxHorizontalAlign",toString:$estr} - ,RIGHT: {_hx_name:"RIGHT",_hx_index:2,__enum__:"flixel.util.FlxHorizontalAlign",toString:$estr} +var flixel_util_FlxHorizontalAlign = $hxEnums["flixel.util.FlxHorizontalAlign"] = { __ename__ : "flixel.util.FlxHorizontalAlign", __constructs__ : ["LEFT","CENTER","RIGHT"] + ,LEFT: {_hx_index:0,__enum__:"flixel.util.FlxHorizontalAlign",toString:$estr} + ,CENTER: {_hx_index:1,__enum__:"flixel.util.FlxHorizontalAlign",toString:$estr} + ,RIGHT: {_hx_index:2,__enum__:"flixel.util.FlxHorizontalAlign",toString:$estr} }; -flixel_util_FlxHorizontalAlign.__constructs__ = [flixel_util_FlxHorizontalAlign.LEFT,flixel_util_FlxHorizontalAlign.CENTER,flixel_util_FlxHorizontalAlign.RIGHT]; var flixel_util_FlxPath = function(Nodes) { this._firstUpdate = false; this._wasObjectImmovable = null; @@ -84174,8 +83990,10 @@ flixel_util_FlxPath.prototype = { if(X == null) { X = 0; } - _this.set_x(_this.x + X); - _this.set_y(_this.y + Y); + var _g = _this; + _g.set_x(_g.x + X); + var _g = _this; + _g.set_y(_g.y + Y); } var node = this._nodes[this.nodeIndex]; var deltaX = node.x - flixel_util_FlxPath._point.x; @@ -84206,8 +84024,10 @@ flixel_util_FlxPath.prototype = { if(X == null) { X = 0; } - _this.set_x(_this.x + X); - _this.set_y(_this.y + Y); + var _g = _this; + _g.set_x(_g.x + X); + var _g = _this; + _g.set_y(_g.y + Y); } var _this = flixel_util_FlxPath._point; var result = Math.abs(_this.x - node.x) <= 0.0000001 && Math.abs(_this.y - node.y) <= 0.0000001; @@ -84281,15 +84101,15 @@ flixel_util_FlxPath.prototype = { if((this._mode & 1048576) == 0) { this.object.set_x(oldNode.x); if(this.autoCenter) { - var fh = this.object; - fh.set_x(fh.x - this.object.get_width() * 0.5); + var _g = this.object; + _g.set_x(_g.x - this.object.get_width() * 0.5); } } if((this._mode & 65536) == 0) { this.object.set_y(oldNode.y); if(this.autoCenter) { - var fh = this.object; - fh.set_y(fh.y - this.object.get_height() * 0.5); + var _g = this.object; + _g.set_y(_g.y - this.object.get_height() * 0.5); } } } @@ -84585,12 +84405,11 @@ flixel_util_FlxPool_$flixel_$util_$LabelValuePair.prototype = { ,__class__: flixel_util_FlxPool_$flixel_$util_$LabelValuePair ,__properties__: {get_length:"get_length"} }; -var flixel_util_FlxSaveStatus = $hxEnums["flixel.util.FlxSaveStatus"] = { __ename__:"flixel.util.FlxSaveStatus",__constructs__:null - ,SUCCESS: {_hx_name:"SUCCESS",_hx_index:0,__enum__:"flixel.util.FlxSaveStatus",toString:$estr} - ,PENDING: {_hx_name:"PENDING",_hx_index:1,__enum__:"flixel.util.FlxSaveStatus",toString:$estr} - ,ERROR: {_hx_name:"ERROR",_hx_index:2,__enum__:"flixel.util.FlxSaveStatus",toString:$estr} +var flixel_util_FlxSaveStatus = $hxEnums["flixel.util.FlxSaveStatus"] = { __ename__ : "flixel.util.FlxSaveStatus", __constructs__ : ["SUCCESS","PENDING","ERROR"] + ,SUCCESS: {_hx_index:0,__enum__:"flixel.util.FlxSaveStatus",toString:$estr} + ,PENDING: {_hx_index:1,__enum__:"flixel.util.FlxSaveStatus",toString:$estr} + ,ERROR: {_hx_index:2,__enum__:"flixel.util.FlxSaveStatus",toString:$estr} }; -flixel_util_FlxSaveStatus.__constructs__ = [flixel_util_FlxSaveStatus.SUCCESS,flixel_util_FlxSaveStatus.PENDING,flixel_util_FlxSaveStatus.ERROR]; var flixel_util__$FlxSignal_FlxSignalHandler = function(listener,dispatchOnce) { this.dispatchOnce = false; this.listener = listener; @@ -85576,14 +85395,10 @@ flixel_util_FlxStringUtil.formatArray = function(AnyArray) { }; flixel_util_FlxStringUtil.formatStringMap = function(AnyMap) { var string = ""; - var h = AnyMap.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - string += key == null ? "null" : "" + key; + var key = haxe_ds_StringMap.keysIterator(AnyMap.h); + while(key.hasNext()) { + var key1 = key.next(); + string += key1 == null ? "null" : "" + key1; string += ", "; } return string.substring(0,string.length - 2); @@ -86218,12 +86033,11 @@ flixel_util_UnicodeBuffer.addChar = function(this1,c) { flixel_util_UnicodeBuffer.toString = function(this1) { return this1; }; -var flixel_util_FlxVerticalAlign = $hxEnums["flixel.util.FlxVerticalAlign"] = { __ename__:"flixel.util.FlxVerticalAlign",__constructs__:null - ,TOP: {_hx_name:"TOP",_hx_index:0,__enum__:"flixel.util.FlxVerticalAlign",toString:$estr} - ,CENTER: {_hx_name:"CENTER",_hx_index:1,__enum__:"flixel.util.FlxVerticalAlign",toString:$estr} - ,BOTTOM: {_hx_name:"BOTTOM",_hx_index:2,__enum__:"flixel.util.FlxVerticalAlign",toString:$estr} +var flixel_util_FlxVerticalAlign = $hxEnums["flixel.util.FlxVerticalAlign"] = { __ename__ : "flixel.util.FlxVerticalAlign", __constructs__ : ["TOP","CENTER","BOTTOM"] + ,TOP: {_hx_index:0,__enum__:"flixel.util.FlxVerticalAlign",toString:$estr} + ,CENTER: {_hx_index:1,__enum__:"flixel.util.FlxVerticalAlign",toString:$estr} + ,BOTTOM: {_hx_index:2,__enum__:"flixel.util.FlxVerticalAlign",toString:$estr} }; -flixel_util_FlxVerticalAlign.__constructs__ = [flixel_util_FlxVerticalAlign.TOP,flixel_util_FlxVerticalAlign.CENTER,flixel_util_FlxVerticalAlign.BOTTOM]; var flixel_util_helpers_FlxRange = function(start,end) { this.active = true; this.start = start; @@ -86260,14 +86074,13 @@ flixel_util_helpers_FlxRange.prototype = { } ,__class__: flixel_util_helpers_FlxRange }; -var haxe_StackItem = $hxEnums["haxe.StackItem"] = { __ename__:"haxe.StackItem",__constructs__:null - ,CFunction: {_hx_name:"CFunction",_hx_index:0,__enum__:"haxe.StackItem",toString:$estr} - ,Module: ($_=function(m) { return {_hx_index:1,m:m,__enum__:"haxe.StackItem",toString:$estr}; },$_._hx_name="Module",$_.__params__ = ["m"],$_) - ,FilePos: ($_=function(s,file,line,column) { return {_hx_index:2,s:s,file:file,line:line,column:column,__enum__:"haxe.StackItem",toString:$estr}; },$_._hx_name="FilePos",$_.__params__ = ["s","file","line","column"],$_) - ,Method: ($_=function(classname,method) { return {_hx_index:3,classname:classname,method:method,__enum__:"haxe.StackItem",toString:$estr}; },$_._hx_name="Method",$_.__params__ = ["classname","method"],$_) - ,LocalFunction: ($_=function(v) { return {_hx_index:4,v:v,__enum__:"haxe.StackItem",toString:$estr}; },$_._hx_name="LocalFunction",$_.__params__ = ["v"],$_) +var haxe_StackItem = $hxEnums["haxe.StackItem"] = { __ename__ : "haxe.StackItem", __constructs__ : ["CFunction","Module","FilePos","Method","LocalFunction"] + ,CFunction: {_hx_index:0,__enum__:"haxe.StackItem",toString:$estr} + ,Module: ($_=function(m) { return {_hx_index:1,m:m,__enum__:"haxe.StackItem",toString:$estr}; },$_.__params__ = ["m"],$_) + ,FilePos: ($_=function(s,file,line,column) { return {_hx_index:2,s:s,file:file,line:line,column:column,__enum__:"haxe.StackItem",toString:$estr}; },$_.__params__ = ["s","file","line","column"],$_) + ,Method: ($_=function(classname,method) { return {_hx_index:3,classname:classname,method:method,__enum__:"haxe.StackItem",toString:$estr}; },$_.__params__ = ["classname","method"],$_) + ,LocalFunction: ($_=function(v) { return {_hx_index:4,v:v,__enum__:"haxe.StackItem",toString:$estr}; },$_.__params__ = ["v"],$_) }; -haxe_StackItem.__constructs__ = [haxe_StackItem.CFunction,haxe_StackItem.Module,haxe_StackItem.FilePos,haxe_StackItem.Method,haxe_StackItem.LocalFunction]; var haxe_CallStack = {}; haxe_CallStack.callStack = function() { return haxe_NativeStackTrace.toHaxe(haxe_NativeStackTrace.callStack()); @@ -86343,8 +86156,8 @@ haxe_CallStack.equalItems = function(item1,item2) { if(item2 == null) { return false; } else if(item2._hx_index == 1) { - var m2 = item2.m; var m1 = item1.m; + var m2 = item2.m; return m1 == m2; } else { return false; @@ -86354,14 +86167,14 @@ haxe_CallStack.equalItems = function(item1,item2) { if(item2 == null) { return false; } else if(item2._hx_index == 2) { - var item21 = item2.s; - var file2 = item2.file; - var line2 = item2.line; - var col2 = item2.column; - var col1 = item1.column; - var line1 = item1.line; - var file1 = item1.file; var item11 = item1.s; + var file1 = item1.file; + var line1 = item1.line; + var col1 = item1.column; + var col2 = item2.column; + var line2 = item2.line; + var file2 = item2.file; + var item21 = item2.s; if(file1 == file2 && line1 == line2 && col1 == col2) { return haxe_CallStack.equalItems(item11,item21); } else { @@ -86375,10 +86188,10 @@ haxe_CallStack.equalItems = function(item1,item2) { if(item2 == null) { return false; } else if(item2._hx_index == 3) { - var class2 = item2.classname; - var method2 = item2.method; - var method1 = item1.method; var class1 = item1.classname; + var method1 = item1.method; + var method2 = item2.method; + var class2 = item2.classname; if(class1 == class2) { return method1 == method2; } else { @@ -86392,8 +86205,8 @@ haxe_CallStack.equalItems = function(item1,item2) { if(item2 == null) { return false; } else if(item2._hx_index == 4) { - var v2 = item2.v; var v1 = item1.v; + var v2 = item2.v; return v1 == v2; } else { return false; @@ -86413,10 +86226,10 @@ haxe_CallStack.itemToString = function(b,s) { b.b += m == null ? "null" : "" + m; break; case 2: - var s1 = s.s; - var file = s.file; - var line = s.line; var col = s.column; + var line = s.line; + var file = s.file; + var s1 = s.s; if(s1 != null) { haxe_CallStack.itemToString(b,s1); b.b += " ("; @@ -86433,8 +86246,8 @@ haxe_CallStack.itemToString = function(b,s) { } break; case 3: - var cname = s.classname; var meth = s.method; + var cname = s.classname; b.b += Std.string(cname == null ? "" : cname); b.b += "."; b.b += meth == null ? "null" : "" + meth; @@ -86502,9 +86315,6 @@ haxe_Exception.prototype = $extend(Error.prototype,{ ,unwrap: function() { return this.__nativeException; } - ,toString: function() { - return this.get_message(); - } ,__shiftStack: function() { this.__skipStack++; } @@ -86921,15 +86731,11 @@ haxe_Serializer.prototype = { case haxe_ds_StringMap: this.buf.b += "b"; var v1 = v; - var h = v1.h; - var _g_h = h; - var _g_keys = Object.keys(h); - var _g_length = _g_keys.length; - var _g_current = 0; - while(_g_current < _g_length) { - var k = _g_keys[_g_current++]; - this.serializeString(k); - this.serialize(v1.h[k]); + var k = haxe_ds_StringMap.keysIterator(v1.h); + while(k.hasNext()) { + var k1 = k.next(); + this.serializeString(k1); + this.serialize(v1.h[k1]); } this.buf.b += "h"; break; @@ -87010,7 +86816,7 @@ haxe_Serializer.prototype = { this.buf.b += Std.string(v._hx_index); } else { var e = v; - this.serializeString($hxEnums[e.__enum__].__constructs__[e._hx_index]._hx_name); + this.serializeString($hxEnums[e.__enum__].__constructs__[e._hx_index]); } this.buf.b += ":"; var params = Type.enumParameters(v); @@ -87084,7 +86890,7 @@ haxe__$Unserializer_DefaultResolver.prototype = { }; var haxe_Unserializer = function(buf) { this.buf = buf; - this.length = this.buf.length; + this.length = buf.length; this.pos = 0; this.scache = []; this.cache = []; @@ -87298,15 +87104,7 @@ haxe_Unserializer.prototype = { } this.pos++; var index = this.readDigits(); - var _this = edecl.__constructs__; - var result = new Array(_this.length); - var _g = 0; - var _g1 = _this.length; - while(_g < _g1) { - var i = _g++; - result[i] = _this[i]._hx_name; - } - var tag = result[index]; + var tag = edecl.__constructs__.slice()[index]; if(tag == null) { throw haxe_Exception.thrown("Unknown enum index " + name + "@" + index); } @@ -88036,7 +87834,7 @@ haxe_ds_IntMap.prototype = { } ,keys: function() { var a = []; - for( var key in this.h ) if(this.h.hasOwnProperty(key)) a.push(+key); + for( var key in this.h ) if(this.h.hasOwnProperty(key)) a.push(key | 0); return new haxe_iterators_ArrayIterator(a); } ,iterator: function() { @@ -88086,6 +87884,40 @@ var haxe_ds_StringMap = function() { $hxClasses["haxe.ds.StringMap"] = haxe_ds_StringMap; haxe_ds_StringMap.__name__ = "haxe.ds.StringMap"; haxe_ds_StringMap.__interfaces__ = [haxe_IMap]; +haxe_ds_StringMap.keysIterator = function(h) { + var keys = Object.keys(h); + var len = keys.length; + var idx = 0; + return { hasNext : function() { + return idx < len; + }, next : function() { + idx += 1; + return keys[idx - 1]; + }}; +}; +haxe_ds_StringMap.valueIterator = function(h) { + var keys = Object.keys(h); + var len = keys.length; + var idx = 0; + return { hasNext : function() { + return idx < len; + }, next : function() { + idx += 1; + return h[keys[idx - 1]]; + }}; +}; +haxe_ds_StringMap.kvIterator = function(h) { + var keys = Object.keys(h); + var len = keys.length; + var idx = 0; + return { hasNext : function() { + return idx < len; + }, next : function() { + idx += 1; + var k = keys[idx - 1]; + return { key : k, value : h[k]}; + }}; +}; haxe_ds_StringMap.stringify = function(h) { var s = "{"; var first = true; @@ -88115,112 +87947,16 @@ haxe_ds_StringMap.prototype = { } } ,keys: function() { - return new haxe_ds__$StringMap_StringMapKeyIterator(this.h); + return haxe_ds_StringMap.keysIterator(this.h); } ,iterator: function() { - return new haxe_ds__$StringMap_StringMapValueIterator(this.h); + return haxe_ds_StringMap.valueIterator(this.h); } ,keyValueIterator: function() { - return new haxe_ds__$StringMap_StringMapKeyValueIterator(this.h); + return haxe_ds_StringMap.kvIterator(this.h); } ,__class__: haxe_ds_StringMap }; -var haxe_ds__$StringMap_StringMapKeyIterator = function(h) { - this.h = h; - this.keys = Object.keys(h); - this.length = this.keys.length; - this.current = 0; -}; -$hxClasses["haxe.ds._StringMap.StringMapKeyIterator"] = haxe_ds__$StringMap_StringMapKeyIterator; -haxe_ds__$StringMap_StringMapKeyIterator.__name__ = "haxe.ds._StringMap.StringMapKeyIterator"; -haxe_ds__$StringMap_StringMapKeyIterator.prototype = { - h: null - ,keys: null - ,length: null - ,current: null - ,hasNext: function() { - return this.current < this.length; - } - ,next: function() { - return this.keys[this.current++]; - } - ,__class__: haxe_ds__$StringMap_StringMapKeyIterator -}; -var haxe_ds__$StringMap_StringMapValueIterator = function(h) { - this.h = h; - this.keys = Object.keys(h); - this.length = this.keys.length; - this.current = 0; -}; -$hxClasses["haxe.ds._StringMap.StringMapValueIterator"] = haxe_ds__$StringMap_StringMapValueIterator; -haxe_ds__$StringMap_StringMapValueIterator.__name__ = "haxe.ds._StringMap.StringMapValueIterator"; -haxe_ds__$StringMap_StringMapValueIterator.prototype = { - h: null - ,keys: null - ,length: null - ,current: null - ,hasNext: function() { - return this.current < this.length; - } - ,next: function() { - return this.h[this.keys[this.current++]]; - } - ,__class__: haxe_ds__$StringMap_StringMapValueIterator -}; -var haxe_ds__$StringMap_StringMapKeyValueIterator = function(h) { - this.h = h; - this.keys = Object.keys(h); - this.length = this.keys.length; - this.current = 0; -}; -$hxClasses["haxe.ds._StringMap.StringMapKeyValueIterator"] = haxe_ds__$StringMap_StringMapKeyValueIterator; -haxe_ds__$StringMap_StringMapKeyValueIterator.__name__ = "haxe.ds._StringMap.StringMapKeyValueIterator"; -haxe_ds__$StringMap_StringMapKeyValueIterator.prototype = { - h: null - ,keys: null - ,length: null - ,current: null - ,hasNext: function() { - return this.current < this.length; - } - ,next: function() { - var key = this.keys[this.current++]; - return { key : key, value : this.h[key]}; - } - ,__class__: haxe_ds__$StringMap_StringMapKeyValueIterator -}; -var haxe_exceptions_PosException = function(message,previous,pos) { - haxe_Exception.call(this,message,previous); - if(pos == null) { - this.posInfos = { fileName : "(unknown)", lineNumber : 0, className : "(unknown)", methodName : "(unknown)"}; - } else { - this.posInfos = pos; - } - this.__skipStack++; -}; -$hxClasses["haxe.exceptions.PosException"] = haxe_exceptions_PosException; -haxe_exceptions_PosException.__name__ = "haxe.exceptions.PosException"; -haxe_exceptions_PosException.__super__ = haxe_Exception; -haxe_exceptions_PosException.prototype = $extend(haxe_Exception.prototype,{ - posInfos: null - ,toString: function() { - return "" + haxe_Exception.prototype.toString.call(this) + " in " + this.posInfos.className + "." + this.posInfos.methodName + " at " + this.posInfos.fileName + ":" + this.posInfos.lineNumber; - } - ,__class__: haxe_exceptions_PosException -}); -var haxe_exceptions_NotImplementedException = function(message,previous,pos) { - if(message == null) { - message = "Not implemented"; - } - haxe_exceptions_PosException.call(this,message,previous,pos); - this.__skipStack++; -}; -$hxClasses["haxe.exceptions.NotImplementedException"] = haxe_exceptions_NotImplementedException; -haxe_exceptions_NotImplementedException.__name__ = "haxe.exceptions.NotImplementedException"; -haxe_exceptions_NotImplementedException.__super__ = haxe_exceptions_PosException; -haxe_exceptions_NotImplementedException.prototype = $extend(haxe_exceptions_PosException.prototype,{ - __class__: haxe_exceptions_NotImplementedException -}); var haxe_http_HttpBase = function(url) { this.url = url; this.headers = []; @@ -88306,7 +88042,7 @@ haxe_http_HttpJs.prototype = $extend(haxe_http_HttpBase.prototype,{ haxe_NativeStackTrace.lastError = _g; s = null; } - if(s == 0 && js_Browser.get_supported() && $global.location != null) { + if(s == 0 && typeof(window) != "undefined" && $global.location != null) { var protocol = $global.location.protocol.toLowerCase(); var rlocalProtocol = new EReg("^(?:about|app|app-storage|.+-extension|file|res|widget):$",""); var isLocal = rlocalProtocol.match(protocol); @@ -88353,17 +88089,17 @@ haxe_http_HttpJs.prototype = $extend(haxe_http_HttpBase.prototype,{ r.onreadystatechange = onreadystatechange; } var uri; - var _g = this.postData; - var _g1 = this.postBytes; - if(_g == null) { - if(_g1 == null) { + var _g = this.postBytes; + var _g1 = this.postData; + if(_g1 == null) { + if(_g == null) { uri = null; } else { - var bytes = _g1; + var bytes = _g; uri = new Blob([bytes.b.bufferValue]); } - } else if(_g1 == null) { - var str = _g; + } else if(_g == null) { + var str = _g1; uri = str; } else { uri = null; @@ -88498,7 +88234,7 @@ haxe_io_Input.__name__ = "haxe.io.Input"; haxe_io_Input.prototype = { bigEndian: null ,readByte: function() { - throw new haxe_exceptions_NotImplementedException(null,null,{ fileName : "haxe/io/Input.hx", lineNumber : 53, className : "haxe.io.Input", methodName : "readByte"}); + throw haxe_Exception.thrown("Not implemented"); } ,readBytes: function(s,pos,len) { var k = len; @@ -88633,11 +88369,10 @@ haxe_io_BytesInput.prototype = $extend(haxe_io_Input.prototype,{ } ,__class__: haxe_io_BytesInput }); -var haxe_io_Encoding = $hxEnums["haxe.io.Encoding"] = { __ename__:"haxe.io.Encoding",__constructs__:null - ,UTF8: {_hx_name:"UTF8",_hx_index:0,__enum__:"haxe.io.Encoding",toString:$estr} - ,RawNative: {_hx_name:"RawNative",_hx_index:1,__enum__:"haxe.io.Encoding",toString:$estr} +var haxe_io_Encoding = $hxEnums["haxe.io.Encoding"] = { __ename__ : "haxe.io.Encoding", __constructs__ : ["UTF8","RawNative"] + ,UTF8: {_hx_index:0,__enum__:"haxe.io.Encoding",toString:$estr} + ,RawNative: {_hx_index:1,__enum__:"haxe.io.Encoding",toString:$estr} }; -haxe_io_Encoding.__constructs__ = [haxe_io_Encoding.UTF8,haxe_io_Encoding.RawNative]; var haxe_io_Eof = function() { }; $hxClasses["haxe.io.Eof"] = haxe_io_Eof; @@ -88648,13 +88383,12 @@ haxe_io_Eof.prototype = { } ,__class__: haxe_io_Eof }; -var haxe_io_Error = $hxEnums["haxe.io.Error"] = { __ename__:"haxe.io.Error",__constructs__:null - ,Blocked: {_hx_name:"Blocked",_hx_index:0,__enum__:"haxe.io.Error",toString:$estr} - ,Overflow: {_hx_name:"Overflow",_hx_index:1,__enum__:"haxe.io.Error",toString:$estr} - ,OutsideBounds: {_hx_name:"OutsideBounds",_hx_index:2,__enum__:"haxe.io.Error",toString:$estr} - ,Custom: ($_=function(e) { return {_hx_index:3,e:e,__enum__:"haxe.io.Error",toString:$estr}; },$_._hx_name="Custom",$_.__params__ = ["e"],$_) +var haxe_io_Error = $hxEnums["haxe.io.Error"] = { __ename__ : "haxe.io.Error", __constructs__ : ["Blocked","Overflow","OutsideBounds","Custom"] + ,Blocked: {_hx_index:0,__enum__:"haxe.io.Error",toString:$estr} + ,Overflow: {_hx_index:1,__enum__:"haxe.io.Error",toString:$estr} + ,OutsideBounds: {_hx_index:2,__enum__:"haxe.io.Error",toString:$estr} + ,Custom: ($_=function(e) { return {_hx_index:3,e:e,__enum__:"haxe.io.Error",toString:$estr}; },$_.__params__ = ["e"],$_) }; -haxe_io_Error.__constructs__ = [haxe_io_Error.Blocked,haxe_io_Error.Overflow,haxe_io_Error.OutsideBounds,haxe_io_Error.Custom]; var haxe_io_FPHelper = function() { }; $hxClasses["haxe.io.FPHelper"] = haxe_io_FPHelper; haxe_io_FPHelper.__name__ = "haxe.io.FPHelper"; @@ -88887,11 +88621,11 @@ haxe_xml_Parser.doParse = function(str,strict,p,parent) { var start = 0; var nsubs = 0; var nbrackets = 0; + var c = str.charCodeAt(p); var buf = new StringBuf(); var escapeNext = 1; var attrValQuote = -1; - while(p < str.length) { - var c = str.charCodeAt(p); + while(c == c) { switch(state) { case 0: switch(c) { @@ -89181,7 +88915,7 @@ haxe_xml_Parser.doParse = function(str,strict,p,parent) { } break; } - ++p; + c = str.charCodeAt(++p); } if(state == 1) { start = p; @@ -89371,18 +89105,16 @@ haxe_xml_Printer.prototype = { } ,__class__: haxe_xml_Printer }; -var haxe_zip_ExtraField = $hxEnums["haxe.zip.ExtraField"] = { __ename__:"haxe.zip.ExtraField",__constructs__:null - ,FUnknown: ($_=function(tag,bytes) { return {_hx_index:0,tag:tag,bytes:bytes,__enum__:"haxe.zip.ExtraField",toString:$estr}; },$_._hx_name="FUnknown",$_.__params__ = ["tag","bytes"],$_) - ,FInfoZipUnicodePath: ($_=function(name,crc) { return {_hx_index:1,name:name,crc:crc,__enum__:"haxe.zip.ExtraField",toString:$estr}; },$_._hx_name="FInfoZipUnicodePath",$_.__params__ = ["name","crc"],$_) - ,FUtf8: {_hx_name:"FUtf8",_hx_index:2,__enum__:"haxe.zip.ExtraField",toString:$estr} +var haxe_zip_ExtraField = $hxEnums["haxe.zip.ExtraField"] = { __ename__ : "haxe.zip.ExtraField", __constructs__ : ["FUnknown","FInfoZipUnicodePath","FUtf8"] + ,FUnknown: ($_=function(tag,bytes) { return {_hx_index:0,tag:tag,bytes:bytes,__enum__:"haxe.zip.ExtraField",toString:$estr}; },$_.__params__ = ["tag","bytes"],$_) + ,FInfoZipUnicodePath: ($_=function(name,crc) { return {_hx_index:1,name:name,crc:crc,__enum__:"haxe.zip.ExtraField",toString:$estr}; },$_.__params__ = ["name","crc"],$_) + ,FUtf8: {_hx_index:2,__enum__:"haxe.zip.ExtraField",toString:$estr} }; -haxe_zip_ExtraField.__constructs__ = [haxe_zip_ExtraField.FUnknown,haxe_zip_ExtraField.FInfoZipUnicodePath,haxe_zip_ExtraField.FUtf8]; -var haxe_zip_Huffman = $hxEnums["haxe.zip.Huffman"] = { __ename__:"haxe.zip.Huffman",__constructs__:null - ,Found: ($_=function(i) { return {_hx_index:0,i:i,__enum__:"haxe.zip.Huffman",toString:$estr}; },$_._hx_name="Found",$_.__params__ = ["i"],$_) - ,NeedBit: ($_=function(left,right) { return {_hx_index:1,left:left,right:right,__enum__:"haxe.zip.Huffman",toString:$estr}; },$_._hx_name="NeedBit",$_.__params__ = ["left","right"],$_) - ,NeedBits: ($_=function(n,table) { return {_hx_index:2,n:n,table:table,__enum__:"haxe.zip.Huffman",toString:$estr}; },$_._hx_name="NeedBits",$_.__params__ = ["n","table"],$_) +var haxe_zip_Huffman = $hxEnums["haxe.zip.Huffman"] = { __ename__ : "haxe.zip.Huffman", __constructs__ : ["Found","NeedBit","NeedBits"] + ,Found: ($_=function(i) { return {_hx_index:0,i:i,__enum__:"haxe.zip.Huffman",toString:$estr}; },$_.__params__ = ["i"],$_) + ,NeedBit: ($_=function(left,right) { return {_hx_index:1,left:left,right:right,__enum__:"haxe.zip.Huffman",toString:$estr}; },$_.__params__ = ["left","right"],$_) + ,NeedBits: ($_=function(n,table) { return {_hx_index:2,n:n,table:table,__enum__:"haxe.zip.Huffman",toString:$estr}; },$_.__params__ = ["n","table"],$_) }; -haxe_zip_Huffman.__constructs__ = [haxe_zip_Huffman.Found,haxe_zip_Huffman.NeedBit,haxe_zip_Huffman.NeedBits]; var haxe_zip_HuffTools = function() { }; $hxClasses["haxe.zip.HuffTools"] = haxe_zip_HuffTools; @@ -89394,14 +89126,14 @@ haxe_zip_HuffTools.prototype = { var _g = t.i; return 0; case 1: - var a = t.left; var b = t.right; + var a = t.left; var da = this.treeDepth(a); var db = this.treeDepth(b); return 1 + (da < db ? da : db); case 2: - var _g = t.n; var _g = t.table; + var _g = t.n; throw haxe_Exception.thrown("assert"); } } @@ -89412,8 +89144,8 @@ haxe_zip_HuffTools.prototype = { } if(d == 1) { if(t._hx_index == 1) { - var a = t.left; var b = t.right; + var a = t.left; return haxe_zip_Huffman.NeedBit(this.treeCompress(a),this.treeCompress(b)); } else { throw haxe_Exception.thrown("assert"); @@ -89432,8 +89164,8 @@ haxe_zip_HuffTools.prototype = { } ,treeWalk: function(table,p,cd,d,t) { if(t._hx_index == 1) { - var a = t.left; var b = t.right; + var a = t.left; if(d > 0) { this.treeWalk(table,p,cd + 1,d - 1,a); this.treeWalk(table,p | 1 << cd,cd + 1,d - 1,b); @@ -89556,17 +89288,16 @@ haxe_zip__$InflateImpl_Window.prototype = { } ,__class__: haxe_zip__$InflateImpl_Window }; -var haxe_zip__$InflateImpl_State = $hxEnums["haxe.zip._InflateImpl.State"] = { __ename__:"haxe.zip._InflateImpl.State",__constructs__:null - ,Head: {_hx_name:"Head",_hx_index:0,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,Block: {_hx_name:"Block",_hx_index:1,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,CData: {_hx_name:"CData",_hx_index:2,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,Flat: {_hx_name:"Flat",_hx_index:3,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,Crc: {_hx_name:"Crc",_hx_index:4,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,Dist: {_hx_name:"Dist",_hx_index:5,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,DistOne: {_hx_name:"DistOne",_hx_index:6,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} - ,Done: {_hx_name:"Done",_hx_index:7,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} -}; -haxe_zip__$InflateImpl_State.__constructs__ = [haxe_zip__$InflateImpl_State.Head,haxe_zip__$InflateImpl_State.Block,haxe_zip__$InflateImpl_State.CData,haxe_zip__$InflateImpl_State.Flat,haxe_zip__$InflateImpl_State.Crc,haxe_zip__$InflateImpl_State.Dist,haxe_zip__$InflateImpl_State.DistOne,haxe_zip__$InflateImpl_State.Done]; +var haxe_zip__$InflateImpl_State = $hxEnums["haxe.zip._InflateImpl.State"] = { __ename__ : "haxe.zip._InflateImpl.State", __constructs__ : ["Head","Block","CData","Flat","Crc","Dist","DistOne","Done"] + ,Head: {_hx_index:0,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,Block: {_hx_index:1,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,CData: {_hx_index:2,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,Flat: {_hx_index:3,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,Crc: {_hx_index:4,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,Dist: {_hx_index:5,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,DistOne: {_hx_index:6,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} + ,Done: {_hx_index:7,__enum__:"haxe.zip._InflateImpl.State",toString:$estr} +}; var haxe_zip_InflateImpl = function(i,header,crc) { if(crc == null) { crc = true; @@ -89713,12 +89444,12 @@ haxe_zip_InflateImpl.prototype = { var n = h.i; return n; case 1: - var a = h.left; var b = h.right; + var a = h.left; return this.applyHuffman(this.getBit() ? b : a); case 2: - var n = h.n; var tbl = h.table; + var n = h.n; return this.applyHuffman(tbl[this.getBits(n)]); } } @@ -90038,121 +89769,111 @@ haxe_zip_Reader.prototype = { } ,__class__: haxe_zip_Reader }; -var hscript_Const = $hxEnums["hscript.Const"] = { __ename__:"hscript.Const",__constructs__:null - ,CInt: ($_=function(v) { return {_hx_index:0,v:v,__enum__:"hscript.Const",toString:$estr}; },$_._hx_name="CInt",$_.__params__ = ["v"],$_) - ,CFloat: ($_=function(f) { return {_hx_index:1,f:f,__enum__:"hscript.Const",toString:$estr}; },$_._hx_name="CFloat",$_.__params__ = ["f"],$_) - ,CString: ($_=function(s) { return {_hx_index:2,s:s,__enum__:"hscript.Const",toString:$estr}; },$_._hx_name="CString",$_.__params__ = ["s"],$_) -}; -hscript_Const.__constructs__ = [hscript_Const.CInt,hscript_Const.CFloat,hscript_Const.CString]; -var hscript_Expr = $hxEnums["hscript.Expr"] = { __ename__:"hscript.Expr",__constructs__:null - ,EConst: ($_=function(c) { return {_hx_index:0,c:c,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EConst",$_.__params__ = ["c"],$_) - ,EIdent: ($_=function(v) { return {_hx_index:1,v:v,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EIdent",$_.__params__ = ["v"],$_) - ,EVar: ($_=function(n,t,e) { return {_hx_index:2,n:n,t:t,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EVar",$_.__params__ = ["n","t","e"],$_) - ,EParent: ($_=function(e) { return {_hx_index:3,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EParent",$_.__params__ = ["e"],$_) - ,EBlock: ($_=function(e) { return {_hx_index:4,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EBlock",$_.__params__ = ["e"],$_) - ,EField: ($_=function(e,f) { return {_hx_index:5,e:e,f:f,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EField",$_.__params__ = ["e","f"],$_) - ,EBinop: ($_=function(op,e1,e2) { return {_hx_index:6,op:op,e1:e1,e2:e2,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EBinop",$_.__params__ = ["op","e1","e2"],$_) - ,EUnop: ($_=function(op,prefix,e) { return {_hx_index:7,op:op,prefix:prefix,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EUnop",$_.__params__ = ["op","prefix","e"],$_) - ,ECall: ($_=function(e,params) { return {_hx_index:8,e:e,params:params,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="ECall",$_.__params__ = ["e","params"],$_) - ,EIf: ($_=function(cond,e1,e2) { return {_hx_index:9,cond:cond,e1:e1,e2:e2,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EIf",$_.__params__ = ["cond","e1","e2"],$_) - ,EWhile: ($_=function(cond,e) { return {_hx_index:10,cond:cond,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EWhile",$_.__params__ = ["cond","e"],$_) - ,EFor: ($_=function(v,it,e) { return {_hx_index:11,v:v,it:it,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EFor",$_.__params__ = ["v","it","e"],$_) - ,EBreak: {_hx_name:"EBreak",_hx_index:12,__enum__:"hscript.Expr",toString:$estr} - ,EContinue: {_hx_name:"EContinue",_hx_index:13,__enum__:"hscript.Expr",toString:$estr} - ,EFunction: ($_=function(args,e,name,ret) { return {_hx_index:14,args:args,e:e,name:name,ret:ret,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EFunction",$_.__params__ = ["args","e","name","ret"],$_) - ,EReturn: ($_=function(e) { return {_hx_index:15,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EReturn",$_.__params__ = ["e"],$_) - ,EArray: ($_=function(e,index) { return {_hx_index:16,e:e,index:index,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EArray",$_.__params__ = ["e","index"],$_) - ,EArrayDecl: ($_=function(e) { return {_hx_index:17,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EArrayDecl",$_.__params__ = ["e"],$_) - ,ENew: ($_=function(cl,params) { return {_hx_index:18,cl:cl,params:params,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="ENew",$_.__params__ = ["cl","params"],$_) - ,EThrow: ($_=function(e) { return {_hx_index:19,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EThrow",$_.__params__ = ["e"],$_) - ,ETry: ($_=function(e,v,t,ecatch) { return {_hx_index:20,e:e,v:v,t:t,ecatch:ecatch,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="ETry",$_.__params__ = ["e","v","t","ecatch"],$_) - ,EObject: ($_=function(fl) { return {_hx_index:21,fl:fl,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EObject",$_.__params__ = ["fl"],$_) - ,ETernary: ($_=function(cond,e1,e2) { return {_hx_index:22,cond:cond,e1:e1,e2:e2,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="ETernary",$_.__params__ = ["cond","e1","e2"],$_) - ,ESwitch: ($_=function(e,cases,defaultExpr) { return {_hx_index:23,e:e,cases:cases,defaultExpr:defaultExpr,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="ESwitch",$_.__params__ = ["e","cases","defaultExpr"],$_) - ,EDoWhile: ($_=function(cond,e) { return {_hx_index:24,cond:cond,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EDoWhile",$_.__params__ = ["cond","e"],$_) - ,EMeta: ($_=function(name,args,e) { return {_hx_index:25,name:name,args:args,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="EMeta",$_.__params__ = ["name","args","e"],$_) - ,ECheckType: ($_=function(e,t) { return {_hx_index:26,e:e,t:t,__enum__:"hscript.Expr",toString:$estr}; },$_._hx_name="ECheckType",$_.__params__ = ["e","t"],$_) -}; -hscript_Expr.__constructs__ = [hscript_Expr.EConst,hscript_Expr.EIdent,hscript_Expr.EVar,hscript_Expr.EParent,hscript_Expr.EBlock,hscript_Expr.EField,hscript_Expr.EBinop,hscript_Expr.EUnop,hscript_Expr.ECall,hscript_Expr.EIf,hscript_Expr.EWhile,hscript_Expr.EFor,hscript_Expr.EBreak,hscript_Expr.EContinue,hscript_Expr.EFunction,hscript_Expr.EReturn,hscript_Expr.EArray,hscript_Expr.EArrayDecl,hscript_Expr.ENew,hscript_Expr.EThrow,hscript_Expr.ETry,hscript_Expr.EObject,hscript_Expr.ETernary,hscript_Expr.ESwitch,hscript_Expr.EDoWhile,hscript_Expr.EMeta,hscript_Expr.ECheckType]; -var hscript_CType = $hxEnums["hscript.CType"] = { __ename__:"hscript.CType",__constructs__:null - ,CTPath: ($_=function(path,params) { return {_hx_index:0,path:path,params:params,__enum__:"hscript.CType",toString:$estr}; },$_._hx_name="CTPath",$_.__params__ = ["path","params"],$_) - ,CTFun: ($_=function(args,ret) { return {_hx_index:1,args:args,ret:ret,__enum__:"hscript.CType",toString:$estr}; },$_._hx_name="CTFun",$_.__params__ = ["args","ret"],$_) - ,CTAnon: ($_=function(fields) { return {_hx_index:2,fields:fields,__enum__:"hscript.CType",toString:$estr}; },$_._hx_name="CTAnon",$_.__params__ = ["fields"],$_) - ,CTParent: ($_=function(t) { return {_hx_index:3,t:t,__enum__:"hscript.CType",toString:$estr}; },$_._hx_name="CTParent",$_.__params__ = ["t"],$_) - ,CTOpt: ($_=function(t) { return {_hx_index:4,t:t,__enum__:"hscript.CType",toString:$estr}; },$_._hx_name="CTOpt",$_.__params__ = ["t"],$_) - ,CTNamed: ($_=function(n,t) { return {_hx_index:5,n:n,t:t,__enum__:"hscript.CType",toString:$estr}; },$_._hx_name="CTNamed",$_.__params__ = ["n","t"],$_) -}; -hscript_CType.__constructs__ = [hscript_CType.CTPath,hscript_CType.CTFun,hscript_CType.CTAnon,hscript_CType.CTParent,hscript_CType.CTOpt,hscript_CType.CTNamed]; -var hscript_Error = $hxEnums["hscript.Error"] = { __ename__:"hscript.Error",__constructs__:null - ,EInvalidChar: ($_=function(c) { return {_hx_index:0,c:c,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EInvalidChar",$_.__params__ = ["c"],$_) - ,EUnexpected: ($_=function(s) { return {_hx_index:1,s:s,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EUnexpected",$_.__params__ = ["s"],$_) - ,EUnterminatedString: {_hx_name:"EUnterminatedString",_hx_index:2,__enum__:"hscript.Error",toString:$estr} - ,EUnterminatedComment: {_hx_name:"EUnterminatedComment",_hx_index:3,__enum__:"hscript.Error",toString:$estr} - ,EInvalidPreprocessor: ($_=function(msg) { return {_hx_index:4,msg:msg,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EInvalidPreprocessor",$_.__params__ = ["msg"],$_) - ,EUnknownVariable: ($_=function(v) { return {_hx_index:5,v:v,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EUnknownVariable",$_.__params__ = ["v"],$_) - ,EInvalidIterator: ($_=function(v) { return {_hx_index:6,v:v,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EInvalidIterator",$_.__params__ = ["v"],$_) - ,EInvalidOp: ($_=function(op) { return {_hx_index:7,op:op,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EInvalidOp",$_.__params__ = ["op"],$_) - ,EInvalidAccess: ($_=function(f) { return {_hx_index:8,f:f,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="EInvalidAccess",$_.__params__ = ["f"],$_) - ,ECustom: ($_=function(msg) { return {_hx_index:9,msg:msg,__enum__:"hscript.Error",toString:$estr}; },$_._hx_name="ECustom",$_.__params__ = ["msg"],$_) -}; -hscript_Error.__constructs__ = [hscript_Error.EInvalidChar,hscript_Error.EUnexpected,hscript_Error.EUnterminatedString,hscript_Error.EUnterminatedComment,hscript_Error.EInvalidPreprocessor,hscript_Error.EUnknownVariable,hscript_Error.EInvalidIterator,hscript_Error.EInvalidOp,hscript_Error.EInvalidAccess,hscript_Error.ECustom]; -var hscript_ModuleDecl = $hxEnums["hscript.ModuleDecl"] = { __ename__:"hscript.ModuleDecl",__constructs__:null - ,DPackage: ($_=function(path) { return {_hx_index:0,path:path,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_._hx_name="DPackage",$_.__params__ = ["path"],$_) - ,DImport: ($_=function(path,everything) { return {_hx_index:1,path:path,everything:everything,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_._hx_name="DImport",$_.__params__ = ["path","everything"],$_) - ,DClass: ($_=function(c) { return {_hx_index:2,c:c,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_._hx_name="DClass",$_.__params__ = ["c"],$_) - ,DTypedef: ($_=function(c) { return {_hx_index:3,c:c,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_._hx_name="DTypedef",$_.__params__ = ["c"],$_) -}; -hscript_ModuleDecl.__constructs__ = [hscript_ModuleDecl.DPackage,hscript_ModuleDecl.DImport,hscript_ModuleDecl.DClass,hscript_ModuleDecl.DTypedef]; -var hscript_FieldAccess = $hxEnums["hscript.FieldAccess"] = { __ename__:"hscript.FieldAccess",__constructs__:null - ,APublic: {_hx_name:"APublic",_hx_index:0,__enum__:"hscript.FieldAccess",toString:$estr} - ,APrivate: {_hx_name:"APrivate",_hx_index:1,__enum__:"hscript.FieldAccess",toString:$estr} - ,AInline: {_hx_name:"AInline",_hx_index:2,__enum__:"hscript.FieldAccess",toString:$estr} - ,AOverride: {_hx_name:"AOverride",_hx_index:3,__enum__:"hscript.FieldAccess",toString:$estr} - ,AStatic: {_hx_name:"AStatic",_hx_index:4,__enum__:"hscript.FieldAccess",toString:$estr} - ,AMacro: {_hx_name:"AMacro",_hx_index:5,__enum__:"hscript.FieldAccess",toString:$estr} -}; -hscript_FieldAccess.__constructs__ = [hscript_FieldAccess.APublic,hscript_FieldAccess.APrivate,hscript_FieldAccess.AInline,hscript_FieldAccess.AOverride,hscript_FieldAccess.AStatic,hscript_FieldAccess.AMacro]; -var hscript_FieldKind = $hxEnums["hscript.FieldKind"] = { __ename__:"hscript.FieldKind",__constructs__:null - ,KFunction: ($_=function(f) { return {_hx_index:0,f:f,__enum__:"hscript.FieldKind",toString:$estr}; },$_._hx_name="KFunction",$_.__params__ = ["f"],$_) - ,KVar: ($_=function(v) { return {_hx_index:1,v:v,__enum__:"hscript.FieldKind",toString:$estr}; },$_._hx_name="KVar",$_.__params__ = ["v"],$_) -}; -hscript_FieldKind.__constructs__ = [hscript_FieldKind.KFunction,hscript_FieldKind.KVar]; -var hscript__$Interp_Stop = $hxEnums["hscript._Interp.Stop"] = { __ename__:"hscript._Interp.Stop",__constructs__:null - ,SBreak: {_hx_name:"SBreak",_hx_index:0,__enum__:"hscript._Interp.Stop",toString:$estr} - ,SContinue: {_hx_name:"SContinue",_hx_index:1,__enum__:"hscript._Interp.Stop",toString:$estr} - ,SReturn: {_hx_name:"SReturn",_hx_index:2,__enum__:"hscript._Interp.Stop",toString:$estr} -}; -hscript__$Interp_Stop.__constructs__ = [hscript__$Interp_Stop.SBreak,hscript__$Interp_Stop.SContinue,hscript__$Interp_Stop.SReturn]; -var hscript_Token = $hxEnums["hscript.Token"] = { __ename__:"hscript.Token",__constructs__:null - ,TEof: {_hx_name:"TEof",_hx_index:0,__enum__:"hscript.Token",toString:$estr} - ,TConst: ($_=function(c) { return {_hx_index:1,c:c,__enum__:"hscript.Token",toString:$estr}; },$_._hx_name="TConst",$_.__params__ = ["c"],$_) - ,TId: ($_=function(s) { return {_hx_index:2,s:s,__enum__:"hscript.Token",toString:$estr}; },$_._hx_name="TId",$_.__params__ = ["s"],$_) - ,TOp: ($_=function(s) { return {_hx_index:3,s:s,__enum__:"hscript.Token",toString:$estr}; },$_._hx_name="TOp",$_.__params__ = ["s"],$_) - ,TPOpen: {_hx_name:"TPOpen",_hx_index:4,__enum__:"hscript.Token",toString:$estr} - ,TPClose: {_hx_name:"TPClose",_hx_index:5,__enum__:"hscript.Token",toString:$estr} - ,TBrOpen: {_hx_name:"TBrOpen",_hx_index:6,__enum__:"hscript.Token",toString:$estr} - ,TBrClose: {_hx_name:"TBrClose",_hx_index:7,__enum__:"hscript.Token",toString:$estr} - ,TDot: {_hx_name:"TDot",_hx_index:8,__enum__:"hscript.Token",toString:$estr} - ,TComma: {_hx_name:"TComma",_hx_index:9,__enum__:"hscript.Token",toString:$estr} - ,TSemicolon: {_hx_name:"TSemicolon",_hx_index:10,__enum__:"hscript.Token",toString:$estr} - ,TBkOpen: {_hx_name:"TBkOpen",_hx_index:11,__enum__:"hscript.Token",toString:$estr} - ,TBkClose: {_hx_name:"TBkClose",_hx_index:12,__enum__:"hscript.Token",toString:$estr} - ,TQuestion: {_hx_name:"TQuestion",_hx_index:13,__enum__:"hscript.Token",toString:$estr} - ,TDoubleDot: {_hx_name:"TDoubleDot",_hx_index:14,__enum__:"hscript.Token",toString:$estr} - ,TMeta: ($_=function(s) { return {_hx_index:15,s:s,__enum__:"hscript.Token",toString:$estr}; },$_._hx_name="TMeta",$_.__params__ = ["s"],$_) - ,TPrepro: ($_=function(s) { return {_hx_index:16,s:s,__enum__:"hscript.Token",toString:$estr}; },$_._hx_name="TPrepro",$_.__params__ = ["s"],$_) -}; -hscript_Token.__constructs__ = [hscript_Token.TEof,hscript_Token.TConst,hscript_Token.TId,hscript_Token.TOp,hscript_Token.TPOpen,hscript_Token.TPClose,hscript_Token.TBrOpen,hscript_Token.TBrClose,hscript_Token.TDot,hscript_Token.TComma,hscript_Token.TSemicolon,hscript_Token.TBkOpen,hscript_Token.TBkClose,hscript_Token.TQuestion,hscript_Token.TDoubleDot,hscript_Token.TMeta,hscript_Token.TPrepro]; +var hscript_Const = $hxEnums["hscript.Const"] = { __ename__ : "hscript.Const", __constructs__ : ["CInt","CFloat","CString"] + ,CInt: ($_=function(v) { return {_hx_index:0,v:v,__enum__:"hscript.Const",toString:$estr}; },$_.__params__ = ["v"],$_) + ,CFloat: ($_=function(f) { return {_hx_index:1,f:f,__enum__:"hscript.Const",toString:$estr}; },$_.__params__ = ["f"],$_) + ,CString: ($_=function(s) { return {_hx_index:2,s:s,__enum__:"hscript.Const",toString:$estr}; },$_.__params__ = ["s"],$_) +}; +var hscript_Expr = $hxEnums["hscript.Expr"] = { __ename__ : "hscript.Expr", __constructs__ : ["EConst","EIdent","EVar","EParent","EBlock","EField","EBinop","EUnop","ECall","EIf","EWhile","EFor","EBreak","EContinue","EFunction","EReturn","EArray","EArrayDecl","ENew","EThrow","ETry","EObject","ETernary","ESwitch","EDoWhile","EMeta","ECheckType"] + ,EConst: ($_=function(c) { return {_hx_index:0,c:c,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["c"],$_) + ,EIdent: ($_=function(v) { return {_hx_index:1,v:v,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["v"],$_) + ,EVar: ($_=function(n,t,e) { return {_hx_index:2,n:n,t:t,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["n","t","e"],$_) + ,EParent: ($_=function(e) { return {_hx_index:3,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e"],$_) + ,EBlock: ($_=function(e) { return {_hx_index:4,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e"],$_) + ,EField: ($_=function(e,f) { return {_hx_index:5,e:e,f:f,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e","f"],$_) + ,EBinop: ($_=function(op,e1,e2) { return {_hx_index:6,op:op,e1:e1,e2:e2,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["op","e1","e2"],$_) + ,EUnop: ($_=function(op,prefix,e) { return {_hx_index:7,op:op,prefix:prefix,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["op","prefix","e"],$_) + ,ECall: ($_=function(e,params) { return {_hx_index:8,e:e,params:params,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e","params"],$_) + ,EIf: ($_=function(cond,e1,e2) { return {_hx_index:9,cond:cond,e1:e1,e2:e2,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["cond","e1","e2"],$_) + ,EWhile: ($_=function(cond,e) { return {_hx_index:10,cond:cond,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["cond","e"],$_) + ,EFor: ($_=function(v,it,e) { return {_hx_index:11,v:v,it:it,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["v","it","e"],$_) + ,EBreak: {_hx_index:12,__enum__:"hscript.Expr",toString:$estr} + ,EContinue: {_hx_index:13,__enum__:"hscript.Expr",toString:$estr} + ,EFunction: ($_=function(args,e,name,ret) { return {_hx_index:14,args:args,e:e,name:name,ret:ret,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["args","e","name","ret"],$_) + ,EReturn: ($_=function(e) { return {_hx_index:15,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e"],$_) + ,EArray: ($_=function(e,index) { return {_hx_index:16,e:e,index:index,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e","index"],$_) + ,EArrayDecl: ($_=function(e) { return {_hx_index:17,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e"],$_) + ,ENew: ($_=function(cl,params) { return {_hx_index:18,cl:cl,params:params,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["cl","params"],$_) + ,EThrow: ($_=function(e) { return {_hx_index:19,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e"],$_) + ,ETry: ($_=function(e,v,t,ecatch) { return {_hx_index:20,e:e,v:v,t:t,ecatch:ecatch,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e","v","t","ecatch"],$_) + ,EObject: ($_=function(fl) { return {_hx_index:21,fl:fl,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["fl"],$_) + ,ETernary: ($_=function(cond,e1,e2) { return {_hx_index:22,cond:cond,e1:e1,e2:e2,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["cond","e1","e2"],$_) + ,ESwitch: ($_=function(e,cases,defaultExpr) { return {_hx_index:23,e:e,cases:cases,defaultExpr:defaultExpr,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e","cases","defaultExpr"],$_) + ,EDoWhile: ($_=function(cond,e) { return {_hx_index:24,cond:cond,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["cond","e"],$_) + ,EMeta: ($_=function(name,args,e) { return {_hx_index:25,name:name,args:args,e:e,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["name","args","e"],$_) + ,ECheckType: ($_=function(e,t) { return {_hx_index:26,e:e,t:t,__enum__:"hscript.Expr",toString:$estr}; },$_.__params__ = ["e","t"],$_) +}; +var hscript_CType = $hxEnums["hscript.CType"] = { __ename__ : "hscript.CType", __constructs__ : ["CTPath","CTFun","CTAnon","CTParent","CTOpt","CTNamed"] + ,CTPath: ($_=function(path,params) { return {_hx_index:0,path:path,params:params,__enum__:"hscript.CType",toString:$estr}; },$_.__params__ = ["path","params"],$_) + ,CTFun: ($_=function(args,ret) { return {_hx_index:1,args:args,ret:ret,__enum__:"hscript.CType",toString:$estr}; },$_.__params__ = ["args","ret"],$_) + ,CTAnon: ($_=function(fields) { return {_hx_index:2,fields:fields,__enum__:"hscript.CType",toString:$estr}; },$_.__params__ = ["fields"],$_) + ,CTParent: ($_=function(t) { return {_hx_index:3,t:t,__enum__:"hscript.CType",toString:$estr}; },$_.__params__ = ["t"],$_) + ,CTOpt: ($_=function(t) { return {_hx_index:4,t:t,__enum__:"hscript.CType",toString:$estr}; },$_.__params__ = ["t"],$_) + ,CTNamed: ($_=function(n,t) { return {_hx_index:5,n:n,t:t,__enum__:"hscript.CType",toString:$estr}; },$_.__params__ = ["n","t"],$_) +}; +var hscript_Error = $hxEnums["hscript.Error"] = { __ename__ : "hscript.Error", __constructs__ : ["EInvalidChar","EUnexpected","EUnterminatedString","EUnterminatedComment","EInvalidPreprocessor","EUnknownVariable","EInvalidIterator","EInvalidOp","EInvalidAccess","ECustom"] + ,EInvalidChar: ($_=function(c) { return {_hx_index:0,c:c,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["c"],$_) + ,EUnexpected: ($_=function(s) { return {_hx_index:1,s:s,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["s"],$_) + ,EUnterminatedString: {_hx_index:2,__enum__:"hscript.Error",toString:$estr} + ,EUnterminatedComment: {_hx_index:3,__enum__:"hscript.Error",toString:$estr} + ,EInvalidPreprocessor: ($_=function(msg) { return {_hx_index:4,msg:msg,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["msg"],$_) + ,EUnknownVariable: ($_=function(v) { return {_hx_index:5,v:v,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["v"],$_) + ,EInvalidIterator: ($_=function(v) { return {_hx_index:6,v:v,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["v"],$_) + ,EInvalidOp: ($_=function(op) { return {_hx_index:7,op:op,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["op"],$_) + ,EInvalidAccess: ($_=function(f) { return {_hx_index:8,f:f,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["f"],$_) + ,ECustom: ($_=function(msg) { return {_hx_index:9,msg:msg,__enum__:"hscript.Error",toString:$estr}; },$_.__params__ = ["msg"],$_) +}; +var hscript_ModuleDecl = $hxEnums["hscript.ModuleDecl"] = { __ename__ : "hscript.ModuleDecl", __constructs__ : ["DPackage","DImport","DClass","DTypedef"] + ,DPackage: ($_=function(path) { return {_hx_index:0,path:path,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_.__params__ = ["path"],$_) + ,DImport: ($_=function(path,everything) { return {_hx_index:1,path:path,everything:everything,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_.__params__ = ["path","everything"],$_) + ,DClass: ($_=function(c) { return {_hx_index:2,c:c,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_.__params__ = ["c"],$_) + ,DTypedef: ($_=function(c) { return {_hx_index:3,c:c,__enum__:"hscript.ModuleDecl",toString:$estr}; },$_.__params__ = ["c"],$_) +}; +var hscript_FieldAccess = $hxEnums["hscript.FieldAccess"] = { __ename__ : "hscript.FieldAccess", __constructs__ : ["APublic","APrivate","AInline","AOverride","AStatic","AMacro"] + ,APublic: {_hx_index:0,__enum__:"hscript.FieldAccess",toString:$estr} + ,APrivate: {_hx_index:1,__enum__:"hscript.FieldAccess",toString:$estr} + ,AInline: {_hx_index:2,__enum__:"hscript.FieldAccess",toString:$estr} + ,AOverride: {_hx_index:3,__enum__:"hscript.FieldAccess",toString:$estr} + ,AStatic: {_hx_index:4,__enum__:"hscript.FieldAccess",toString:$estr} + ,AMacro: {_hx_index:5,__enum__:"hscript.FieldAccess",toString:$estr} +}; +var hscript_FieldKind = $hxEnums["hscript.FieldKind"] = { __ename__ : "hscript.FieldKind", __constructs__ : ["KFunction","KVar"] + ,KFunction: ($_=function(f) { return {_hx_index:0,f:f,__enum__:"hscript.FieldKind",toString:$estr}; },$_.__params__ = ["f"],$_) + ,KVar: ($_=function(v) { return {_hx_index:1,v:v,__enum__:"hscript.FieldKind",toString:$estr}; },$_.__params__ = ["v"],$_) +}; +var hscript__$Interp_Stop = $hxEnums["hscript._Interp.Stop"] = { __ename__ : "hscript._Interp.Stop", __constructs__ : ["SBreak","SContinue","SReturn"] + ,SBreak: {_hx_index:0,__enum__:"hscript._Interp.Stop",toString:$estr} + ,SContinue: {_hx_index:1,__enum__:"hscript._Interp.Stop",toString:$estr} + ,SReturn: {_hx_index:2,__enum__:"hscript._Interp.Stop",toString:$estr} +}; +var hscript_Token = $hxEnums["hscript.Token"] = { __ename__ : "hscript.Token", __constructs__ : ["TEof","TConst","TId","TOp","TPOpen","TPClose","TBrOpen","TBrClose","TDot","TComma","TSemicolon","TBkOpen","TBkClose","TQuestion","TDoubleDot","TMeta","TPrepro"] + ,TEof: {_hx_index:0,__enum__:"hscript.Token",toString:$estr} + ,TConst: ($_=function(c) { return {_hx_index:1,c:c,__enum__:"hscript.Token",toString:$estr}; },$_.__params__ = ["c"],$_) + ,TId: ($_=function(s) { return {_hx_index:2,s:s,__enum__:"hscript.Token",toString:$estr}; },$_.__params__ = ["s"],$_) + ,TOp: ($_=function(s) { return {_hx_index:3,s:s,__enum__:"hscript.Token",toString:$estr}; },$_.__params__ = ["s"],$_) + ,TPOpen: {_hx_index:4,__enum__:"hscript.Token",toString:$estr} + ,TPClose: {_hx_index:5,__enum__:"hscript.Token",toString:$estr} + ,TBrOpen: {_hx_index:6,__enum__:"hscript.Token",toString:$estr} + ,TBrClose: {_hx_index:7,__enum__:"hscript.Token",toString:$estr} + ,TDot: {_hx_index:8,__enum__:"hscript.Token",toString:$estr} + ,TComma: {_hx_index:9,__enum__:"hscript.Token",toString:$estr} + ,TSemicolon: {_hx_index:10,__enum__:"hscript.Token",toString:$estr} + ,TBkOpen: {_hx_index:11,__enum__:"hscript.Token",toString:$estr} + ,TBkClose: {_hx_index:12,__enum__:"hscript.Token",toString:$estr} + ,TQuestion: {_hx_index:13,__enum__:"hscript.Token",toString:$estr} + ,TDoubleDot: {_hx_index:14,__enum__:"hscript.Token",toString:$estr} + ,TMeta: ($_=function(s) { return {_hx_index:15,s:s,__enum__:"hscript.Token",toString:$estr}; },$_.__params__ = ["s"],$_) + ,TPrepro: ($_=function(s) { return {_hx_index:16,s:s,__enum__:"hscript.Token",toString:$estr}; },$_.__params__ = ["s"],$_) +}; var hscript_Parser = function() { this.uid = 0; this.preprocesorValues = new haxe_ds_StringMap(); this.line = 1; this.opChars = "+*/-=!><&|^%~"; this.identChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"; - var priorities = [["%"],["*","/"],["+","-"],["<<",">>",">>>"],["|","&","^"],["==","!=",">","<",">=","<="],["..."],["&&"],["||"],["=","+=","-=","*=","/=","%=","<<=",">>=",">>>=","|=","&=","^=","=>"]]; + var priorities = [["%"],["*","/"],["+","-"],["<<",">>",">>>"],["|","&","^"],["==","!=",">","<",">=","<="],["..."],["&&"],["||"],["=","+=","-=","*=","/=","%=","<<=",">>=",">>>=","|=","&=","^=","=>"],["->"]]; this.opPriority = new haxe_ds_StringMap(); this.opRightAssoc = new haxe_ds_StringMap(); - this.unops = new haxe_ds_StringMap(); var _g = 0; var _g1 = priorities.length; while(_g < _g1) { @@ -90169,15 +89890,13 @@ var hscript_Parser = function() { } } var x = "!"; - this.unops.h[x] = x == "++" || x == "--"; + this.opPriority.h[x] = x == "++" || x == "--" ? -1 : -2; var x = "++"; - this.unops.h[x] = x == "++" || x == "--"; + this.opPriority.h[x] = x == "++" || x == "--" ? -1 : -2; var x = "--"; - this.unops.h[x] = x == "++" || x == "--"; - var x = "-"; - this.unops.h[x] = x == "++" || x == "--"; + this.opPriority.h[x] = x == "++" || x == "--" ? -1 : -2; var x = "~"; - this.unops.h[x] = x == "++" || x == "--"; + this.opPriority.h[x] = x == "++" || x == "--" ? -1 : -2; }; $hxClasses["hscript.Parser"] = hscript_Parser; hscript_Parser.__name__ = "hscript.Parser"; @@ -90187,7 +89906,6 @@ hscript_Parser.prototype = { ,identChars: null ,opPriority: null ,opRightAssoc: null - ,unops: null ,preprocesorValues: null ,allowJSON: null ,allowTypes: null @@ -90317,8 +90035,8 @@ hscript_Parser.prototype = { switch(e._hx_index) { case 2: var _g = e.n; - var t = e.t; var e1 = e.e; + var t = e.t; if(e1 != null) { return this.isBlock(e1); } else if(t != null) { @@ -90338,14 +90056,14 @@ hscript_Parser.prototype = { var _g = e.e; return true; case 6: - var _g = e.op; var _g = e.e1; + var _g = e.op; var e1 = e.e2; return this.isBlock(e1); case 7: var _g = e.op; - var prefix = e.prefix; var e1 = e.e; + var prefix = e.prefix; if(!prefix) { return this.isBlock(e1); } else { @@ -90354,8 +90072,8 @@ hscript_Parser.prototype = { break; case 9: var _g = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; if(e2 != null) { return this.isBlock(e2); } else { @@ -90367,14 +90085,14 @@ hscript_Parser.prototype = { var e1 = e.e; return this.isBlock(e1); case 11: - var _g = e.v; var _g = e.it; + var _g = e.v; var e1 = e.e; return this.isBlock(e1); case 14: - var _g = e.args; - var _g = e.name; var _g = e.ret; + var _g = e.name; + var _g = e.args; var e1 = e.e; return this.isBlock(e1); case 15: @@ -90386,26 +90104,26 @@ hscript_Parser.prototype = { } break; case 20: - var _g = e.e; - var _g = e.v; var _g = e.t; + var _g = e.v; + var _g = e.e; var e1 = e.ecatch; return this.isBlock(e1); case 21: var _g = e.fl; return true; case 23: - var _g = e.e; - var _g = e.cases; var _g = e.defaultExpr; + var _g = e.cases; + var _g = e.e; return true; case 24: var _g = e.cond; var e1 = e.e; return this.isBlock(e1); case 25: - var _g = e.name; var _g = e.args; + var _g = e.name; var e1 = e.e; return this.isBlock(e1); default: @@ -90420,9 +90138,9 @@ hscript_Parser.prototype = { var tmp; if(tk == hscript_Token.TComma && e != null) { if(e._hx_index == 2) { - var _g = e.n; + var _g = e.e; var _g1 = e.t; - var _g2 = e.e; + var _g2 = e.n; tmp = true; } else { tmp = false; @@ -90518,27 +90236,44 @@ hscript_Parser.prototype = { return this.parseExprNext(e); case 3: var op = tk.s; - if(Object.prototype.hasOwnProperty.call(this.unops.h,op)) { + if(op == "-") { var start = 0; var e = this.parseExpr(); - if(op == "-" && e != null) { - if(e._hx_index == 0) { - var _g = e.c; - switch(_g._hx_index) { - case 0: - var i = _g.v; - return hscript_Expr.EConst(hscript_Const.CInt(-i)); - case 1: - var f = _g.f; - return hscript_Expr.EConst(hscript_Const.CFloat(-f)); - default: - } + if(e == null) { + return this.makeUnop(op,e); + } + if(e._hx_index == 0) { + var _g = e.c; + switch(_g._hx_index) { + case 0: + var i = _g.v; + return hscript_Expr.EConst(hscript_Const.CInt(-i)); + case 1: + var f = _g.f; + return hscript_Expr.EConst(hscript_Const.CFloat(-f)); + default: + return this.makeUnop(op,e); } + } else { + return this.makeUnop(op,e); } - return this.makeUnop(op,e); + } + if(this.opPriority.h[op] < 0) { + return this.makeUnop(op,this.parseExpr()); } return this.unexpected(tk); case 4: + tk = this.token(); + if(tk == hscript_Token.TPClose) { + var t = this.token(); + if(!Type.enumEq(t,hscript_Token.TOp("->"))) { + this.unexpected(t); + } + var eret = this.parseExpr(); + return hscript_Expr.EFunction([],hscript_Expr.EReturn(eret)); + } + var _this = this.tokens; + _this.head = new haxe_ds_GenericCell(tk,_this.head); var e = this.parseExpr(); tk = this.token(); if(tk != null) { @@ -90650,21 +90385,21 @@ hscript_Parser.prototype = { var _g = a[0]; switch(_g._hx_index) { case 10: - var _g1 = _g.cond; var _g1 = _g.e; + var _g1 = _g.cond; var tmp = "__a_" + this.uid++; var e = hscript_Expr.EBlock([hscript_Expr.EVar(tmp,null,hscript_Expr.EArrayDecl([])),this.mapCompr(tmp,a[0]),hscript_Expr.EIdent(tmp)]); return this.parseExprNext(e); case 11: - var _g1 = _g.v; - var _g1 = _g.it; var _g1 = _g.e; + var _g1 = _g.it; + var _g1 = _g.v; var tmp = "__a_" + this.uid++; var e = hscript_Expr.EBlock([hscript_Expr.EVar(tmp,null,hscript_Expr.EArrayDecl([])),this.mapCompr(tmp,a[0]),hscript_Expr.EIdent(tmp)]); return this.parseExprNext(e); case 24: - var _g1 = _g.cond; var _g1 = _g.e; + var _g1 = _g.cond; var tmp = "__a_" + this.uid++; var e = hscript_Expr.EBlock([hscript_Expr.EVar(tmp,null,hscript_Expr.EArrayDecl([])),this.mapCompr(tmp,a[0]),hscript_Expr.EIdent(tmp)]); return this.parseExprNext(e); @@ -90767,25 +90502,25 @@ hscript_Parser.prototype = { } break; case 9: - var cond = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var cond = e.cond; edef = e2 == null ? hscript_Expr.EIf(cond,this.mapCompr(tmp,e1),null) : hscript_Expr.ECall(hscript_Expr.EField(hscript_Expr.EIdent(tmp),"push"),[e]); break; case 10: - var cond = e.cond; var e2 = e.e; + var cond = e.cond; edef = hscript_Expr.EWhile(cond,this.mapCompr(tmp,e2)); break; case 11: - var v = e.v; - var it = e.it; var e2 = e.e; + var it = e.it; + var v = e.v; edef = hscript_Expr.EFor(v,it,this.mapCompr(tmp,e2)); break; case 24: - var cond = e.cond; var e2 = e.e; + var cond = e.cond; edef = hscript_Expr.EDoWhile(cond,this.mapCompr(tmp,e2)); break; default: @@ -90799,14 +90534,14 @@ hscript_Parser.prototype = { } switch(e._hx_index) { case 6: - var bop = e.op; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var bop = e.op; return hscript_Expr.EBinop(bop,this.makeUnop(op,e1),e2); case 22: - var e1 = e.cond; - var e2 = e.e1; var e3 = e.e2; + var e2 = e.e1; + var e1 = e.cond; return hscript_Expr.ETernary(this.makeUnop(op,e1),e2,e3); default: return hscript_Expr.EUnop(op,true,e); @@ -90818,9 +90553,9 @@ hscript_Parser.prototype = { } switch(e._hx_index) { case 6: - var op2 = e.op; - var e2 = e.e1; var e3 = e.e2; + var e2 = e.e1; + var op2 = e.op; if(this.opPriority.h[op] <= this.opPriority.h[op2] && !Object.prototype.hasOwnProperty.call(this.opRightAssoc.h,op)) { return hscript_Expr.EBinop(op2,this.makeBinop(op,e1,e2),e3); } else { @@ -90828,9 +90563,9 @@ hscript_Parser.prototype = { } break; case 22: - var e2 = e.cond; - var e3 = e.e1; var e4 = e.e2; + var e3 = e.e1; + var e2 = e.cond; if(Object.prototype.hasOwnProperty.call(this.opRightAssoc.h,op)) { return hscript_Expr.EBinop(op,e1,e); } else { @@ -91169,8 +90904,8 @@ hscript_Parser.prototype = { case 26: var _hx_tmp = e1.e; if(_hx_tmp._hx_index == 1) { - var i = _hx_tmp.v; var t = e1.t; + var i = _hx_tmp.v; var eret = this.parseExpr(); return hscript_Expr.EFunction([{ name : i, t : t}],hscript_Expr.EReturn(eret)); } @@ -91179,7 +90914,7 @@ hscript_Parser.prototype = { } this.unexpected(tk); } - if(this.unops.h[op]) { + if(this.opPriority.h[op] == -1) { var tmp; if(!this.isBlock(e1)) { if(e1._hx_index == 3) { @@ -92232,21 +91967,24 @@ hscript_Parser.prototype = { default: if(this.ops[char]) { var op = String.fromCodePoint(char); - var prev = -1; while(true) { char = this.input.charCodeAt(this.readPos++); if(char != char) { char = 0; } - if(!this.ops[char] || prev == 61) { - if(HxOverrides.cca(op,0) == 47) { - return this.tokenComment(op,char); - } + if(!this.ops[char]) { this.char = char; return hscript_Token.TOp(op); } - prev = char; + var pop = op; op += String.fromCodePoint(char); + if(!Object.prototype.hasOwnProperty.call(this.opPriority.h,op) && Object.prototype.hasOwnProperty.call(this.opPriority.h,pop)) { + if(op == "//" || op == "/*") { + return this.tokenComment(op,char); + } + this.char = char; + return hscript_Token.TOp(pop); + } } } if(this.idents[char]) { @@ -92306,12 +92044,12 @@ hscript_Parser.prototype = { var e1 = e.e; return this.evalPreproCond(e1); case 6: - var _g = e.e1; - var _g1 = e.e2; + var _g = e.e2; + var _g1 = e.e1; switch(e.op) { case "&&": - var e1 = _g; - var e2 = _g1; + var e2 = _g; + var e1 = _g1; if(this.evalPreproCond(e1)) { return this.evalPreproCond(e2); } else { @@ -92319,8 +92057,8 @@ hscript_Parser.prototype = { } break; case "||": - var e1 = _g; - var e2 = _g1; + var e2 = _g; + var e1 = _g1; if(!this.evalPreproCond(e1)) { return this.evalPreproCond(e2); } else { @@ -92329,7 +92067,7 @@ hscript_Parser.prototype = { break; default: if(!this.resumeErrors) { - throw haxe_Exception.thrown(hscript_Error.EInvalidPreprocessor("Can't eval " + $hxEnums[e.__enum__].__constructs__[e._hx_index]._hx_name)); + throw haxe_Exception.thrown(hscript_Error.EInvalidPreprocessor("Can't eval " + $hxEnums[e.__enum__].__constructs__[e._hx_index])); } return false; } @@ -92341,14 +92079,14 @@ hscript_Parser.prototype = { return !this.evalPreproCond(e1); } else { if(!this.resumeErrors) { - throw haxe_Exception.thrown(hscript_Error.EInvalidPreprocessor("Can't eval " + $hxEnums[e.__enum__].__constructs__[e._hx_index]._hx_name)); + throw haxe_Exception.thrown(hscript_Error.EInvalidPreprocessor("Can't eval " + $hxEnums[e.__enum__].__constructs__[e._hx_index])); } return false; } break; default: if(!this.resumeErrors) { - throw haxe_Exception.thrown(hscript_Error.EInvalidPreprocessor("Can't eval " + $hxEnums[e.__enum__].__constructs__[e._hx_index]._hx_name)); + throw haxe_Exception.thrown(hscript_Error.EInvalidPreprocessor("Can't eval " + $hxEnums[e.__enum__].__constructs__[e._hx_index])); } return false; } @@ -92542,8 +92280,8 @@ hscript_Tools.iter = function(e,f) { var _g = e.v; break; case 2: - var _g = e.n; var _g = e.t; + var _g = e.n; var e1 = e.e; if(e1 != null) { f(e1); @@ -92569,20 +92307,20 @@ hscript_Tools.iter = function(e,f) { break; case 6: var _g = e.op; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; f(e1); f(e2); break; case 7: - var _g = e.op; var _g = e.prefix; + var _g = e.op; var e1 = e.e; f(e1); break; case 8: - var e1 = e.e; var args = e.params; + var e1 = e.e; f(e1); var _g = 0; while(_g < args.length) { @@ -92592,9 +92330,9 @@ hscript_Tools.iter = function(e,f) { } break; case 9: - var c = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var c = e.cond; f(c); f(e1); if(e2 != null) { @@ -92602,24 +92340,24 @@ hscript_Tools.iter = function(e,f) { } break; case 10: - var c = e.cond; var e1 = e.e; + var c = e.cond; f(c); f(e1); break; case 11: var _g = e.v; - var it = e.it; var e1 = e.e; + var it = e.it; f(it); f(e1); break; case 12:case 13: break; case 14: - var _g = e.args; - var _g = e.name; var _g = e.ret; + var _g = e.name; + var _g = e.args; var e1 = e.e; f(e1); break; @@ -92630,8 +92368,8 @@ hscript_Tools.iter = function(e,f) { } break; case 16: - var e1 = e.e; var i = e.index; + var e1 = e.e; f(e1); f(i); break; @@ -92659,10 +92397,10 @@ hscript_Tools.iter = function(e,f) { f(e1); break; case 20: - var _g = e.v; var _g = e.t; - var e1 = e.e; + var _g = e.v; var c = e.ecatch; + var e1 = e.e; f(e1); f(c); break; @@ -92676,17 +92414,17 @@ hscript_Tools.iter = function(e,f) { } break; case 22: - var c = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var c = e.cond; f(c); f(e1); f(e2); break; case 23: - var e1 = e.e; - var cases = e.cases; var def = e.defaultExpr; + var cases = e.cases; + var e1 = e.e; f(e1); var _g = 0; while(_g < cases.length) { @@ -92706,15 +92444,15 @@ hscript_Tools.iter = function(e,f) { } break; case 24: - var c = e.cond; var e1 = e.e; + var c = e.cond; f(c); f(e1); break; case 25: - var name = e.name; - var args = e.args; var e1 = e.e; + var args = e.args; + var name = e.name; if(args != null) { var _g = 0; while(_g < args.length) { @@ -92744,9 +92482,9 @@ hscript_Tools.map = function(e,f) { edef = e; break; case 2: - var n = e.n; - var t = e.t; var e1 = e.e; + var t = e.t; + var n = e.n; edef = hscript_Expr.EVar(n,t,e1 != null ? f(e1) : null); break; case 3: @@ -92765,25 +92503,25 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.EBlock(_g); break; case 5: - var e1 = e.e; var fi = e.f; + var e1 = e.e; edef = hscript_Expr.EField(f(e1),fi); break; case 6: - var op = e.op; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var op = e.op; edef = hscript_Expr.EBinop(op,f(e1),f(e2)); break; case 7: - var op = e.op; - var pre = e.prefix; var e1 = e.e; + var pre = e.prefix; + var op = e.op; edef = hscript_Expr.EUnop(op,pre,f(e1)); break; case 8: - var e1 = e.e; var args = e.params; + var e1 = e.e; var edef1 = f(e1); var _g = []; var _g1 = 0; @@ -92795,30 +92533,30 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.ECall(edef1,_g); break; case 9: - var c = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var c = e.cond; edef = hscript_Expr.EIf(f(c),f(e1),e2 != null ? f(e2) : null); break; case 10: - var c = e.cond; var e1 = e.e; + var c = e.cond; edef = hscript_Expr.EWhile(f(c),f(e1)); break; case 11: - var v = e.v; - var it = e.it; var e1 = e.e; + var it = e.it; + var v = e.v; edef = hscript_Expr.EFor(v,f(it),f(e1)); break; case 12:case 13: edef = e; break; case 14: - var args = e.args; - var e1 = e.e; - var name = e.name; var t = e.ret; + var name = e.name; + var e1 = e.e; + var args = e.args; edef = hscript_Expr.EFunction(args,f(e1),name,t); break; case 15: @@ -92826,8 +92564,8 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.EReturn(e1 != null ? f(e1) : null); break; case 16: - var e1 = e.e; var i = e.index; + var e1 = e.e; edef = hscript_Expr.EArray(f(e1),f(i)); break; case 17: @@ -92842,8 +92580,8 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.EArrayDecl(_g); break; case 18: - var cl = e.cl; var el = e.params; + var cl = e.cl; var _g = []; var _g1 = 0; while(_g1 < el.length) { @@ -92858,10 +92596,10 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.EThrow(f(e1)); break; case 20: - var e1 = e.e; - var v = e.v; - var t = e.t; var c = e.ecatch; + var t = e.t; + var v = e.v; + var e1 = e.e; edef = hscript_Expr.ETry(f(e1),v,t,f(c)); break; case 21: @@ -92876,15 +92614,15 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.EObject(_g); break; case 22: - var c = e.cond; - var e1 = e.e1; var e2 = e.e2; + var e1 = e.e1; + var c = e.cond; edef = hscript_Expr.ETernary(f(c),f(e1),f(e2)); break; case 23: - var e1 = e.e; - var cases = e.cases; var def = e.defaultExpr; + var cases = e.cases; + var e1 = e.e; var edef1 = f(e1); var _g = []; var _g1 = 0; @@ -92904,14 +92642,14 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.ESwitch(edef1,_g,def == null ? null : f(def)); break; case 24: - var c = e.cond; var e1 = e.e; + var c = e.cond; edef = hscript_Expr.EDoWhile(f(c),f(e1)); break; case 25: - var name = e.name; - var args = e.args; var e1 = e.e; + var args = e.args; + var name = e.name; var edef1; if(args == null) { edef1 = null; @@ -92928,8 +92666,8 @@ hscript_Tools.map = function(e,f) { edef = hscript_Expr.EMeta(name,edef1,f(e1)); break; case 26: - var e1 = e.e; var t = e.t; + var e1 = e.e; edef = hscript_Expr.ECheckType(f(e1),t); break; } @@ -93041,26 +92779,18 @@ io_newgrounds_Call.prototype = { } } if(this._properties != null) { - var h = this._properties.h; - var field_h = h; - var field_keys = Object.keys(h); - var field_length = field_keys.length; - var field_current = 0; - while(field_current < field_length) { - var field = field_keys[field_current++]; - data[field] = this._properties.h[field]; + var field = haxe_ds_StringMap.keysIterator(this._properties.h); + while(field.hasNext()) { + var field1 = field.next(); + data[field1] = this._properties.h[field1]; } } if(this._parameters != null) { data.call.parameters = { }; - var h = this._parameters.h; - var field_h = h; - var field_keys = Object.keys(h); - var field_length = field_keys.length; - var field_current = 0; - while(field_current < field_length) { - var field = field_keys[field_current++]; - data.call.parameters[field] = this._parameters.h[field]; + var field = haxe_ds_StringMap.keysIterator(this._parameters.h); + while(field.hasNext()) { + var field1 = field.next(); + data.call.parameters[field1] = this._parameters.h[field1]; } } var _this = this._core; @@ -93388,6 +93118,10 @@ io_newgrounds_NG.createAndCheckSession = function(appId,debug,backupSession,onSe io_newgrounds_NG.core.attemptingLogin = true; } }; +io_newgrounds_NG.openPassportHelper = function(url) { + var $window = "_blank"; + window.open(url,$window); +}; io_newgrounds_NG.getHost = function() { var url = window.document.location.href; if(url == null || url == "") { @@ -93473,10 +93207,10 @@ io_newgrounds_NG.prototype = $extend(io_newgrounds_NGLite.prototype,{ if(io_newgrounds_objects_Session.get_status(this._session) == "request-login") { var _g = $bind(this,this.checkSession); var response = null; - var onSuccess1 = onSuccess; + var onSucceess = onSuccess; var onCancel1 = onCancel; this._passportCallback = function() { - _g(response,onSuccess1,onCancel1); + _g(response,onSucceess,onCancel1); }; if(onPending != null) { onPending(); @@ -93493,79 +93227,55 @@ io_newgrounds_NG.prototype = $extend(io_newgrounds_NGLite.prototype,{ if(this.verbose) { this.log(any,{ fileName : "io/newgrounds/NG.hx", lineNumber : 224, className : "io.newgrounds.NG", methodName : "openPassportUrl"}); } - this.openPassportHelper(this.get_passportUrl()); - this.dispatchPassportCallback(); + io_newgrounds_NG.openPassportHelper(this.get_passportUrl()); + this.onPassportUrlOpen(); } else { this.logError("Cannot open passport",{ fileName : "io/newgrounds/NG.hx", lineNumber : 229, className : "io.newgrounds.NG", methodName : "openPassportUrl"}); } } - ,openPassportHelper: function(url) { - var $window = "_blank"; - window.open(url,$window); - } ,onPassportUrlOpen: function() { - this.dispatchPassportCallback(); - } - ,dispatchPassportCallback: function() { if(this._passportCallback != null) { - if(this.verbose) { - this.log("dispatching passport callback",{ fileName : "io/newgrounds/NG.hx", lineNumber : 270, className : "io.newgrounds.NG", methodName : "dispatchPassportCallback"}); - } - var callback = this._passportCallback; - this._passportCallback = null; - callback(); + this._passportCallback(); } + this._passportCallback = null; } - ,checkSession: function(response,onSuccess,onCancel) { + ,checkSession: function(response,onSucceess,onCancel) { var _gthis = this; - if(this._loginCancelled) { - this.log("login cancelled via cancelLoginRequest",{ fileName : "io/newgrounds/NG.hx", lineNumber : 281, className : "io.newgrounds.NG", methodName : "checkSession"}); - this.endLoginAndCall(onCancel); - return; - } if(response != null) { if(!response.success || !response.result.data.success) { - this.log("login cancelled via passport",{ fileName : "io/newgrounds/NG.hx", lineNumber : 291, className : "io.newgrounds.NG", methodName : "checkSession"}); + this.log("login cancelled via passport",{ fileName : "io/newgrounds/NG.hx", lineNumber : 276, className : "io.newgrounds.NG", methodName : "checkSession"}); this.endLoginAndCall(onCancel); return; } - if(this.verbose) { - this.log("Session received",{ fileName : "io/newgrounds/NG.hx", lineNumber : 297, className : "io.newgrounds.NG", methodName : "checkSession"}); - } this._session = response.result.data.session; } if(io_newgrounds_objects_Session.get_status(this._session) == "user-loaded") { this.loggedIn = true; - this.endLoginAndCall(onSuccess); + this.endLoginAndCall(onSucceess); this.onLogin.dispatch(); } else if(io_newgrounds_objects_Session.get_status(this._session) == "request-login") { var _g = $bind(this,this.checkSession); - var onSuccess1 = onSuccess; + var onSucceess1 = onSucceess; var onCancel1 = onCancel; var call = function(response) { - _g(response,onSuccess1,onCancel1); + _g(response,onSucceess1,onCancel1); }; var call1 = this.calls.app.checkSession().addDataHandler(call); this.timer(3.0,function() { - if(_gthis.verbose) { - _gthis.log("3s elapsed, checking session again",{ fileName : "io/newgrounds/NG.hx", lineNumber : 316, className : "io.newgrounds.NG", methodName : "checkSession"}); - } if(!_gthis._loginCancelled) { call1.send(); } else { - _gthis.log("login cancelled via cancelLoginRequest",{ fileName : "io/newgrounds/NG.hx", lineNumber : 323, className : "io.newgrounds.NG", methodName : "checkSession"}); + _gthis.log("login cancelled via cancelLoginRequest",{ fileName : "io/newgrounds/NG.hx", lineNumber : 305, className : "io.newgrounds.NG", methodName : "checkSession"}); _gthis.endLoginAndCall(onCancel); } }); } else { - this.log("login cancelled via passport",{ fileName : "io/newgrounds/NG.hx", lineNumber : 331, className : "io.newgrounds.NG", methodName : "checkSession"}); this.endLoginAndCall(onCancel); } } ,cancelLoginRequest: function() { if(this.attemptingLogin) { this._loginCancelled = true; - this.dispatchPassportCallback(); } } ,endLoginAndCall: function(callback) { @@ -93625,13 +93335,13 @@ io_newgrounds_NG.prototype = $extend(io_newgrounds_NGLite.prototype,{ } var any = "" + response.result.data.medals.length + " Medals received [" + idList.join(", ") + "]"; if(this.verbose) { - this.log(any,{ fileName : "io/newgrounds/NG.hx", lineNumber : 420, className : "io.newgrounds.NG", methodName : "onMedalsReceived"}); + this.log(any,{ fileName : "io/newgrounds/NG.hx", lineNumber : 394, className : "io.newgrounds.NG", methodName : "onMedalsReceived"}); } this.onMedalsLoaded.dispatch(); } ,requestScoreBoards: function(onSuccess,onFail) { if(this.scoreBoards != null) { - this.log("aborting scoreboard request, all scoreboards are loaded",{ fileName : "io/newgrounds/NG.hx", lineNumber : 433, className : "io.newgrounds.NG", methodName : "requestScoreBoards"}); + this.log("aborting scoreboard request, all scoreboards are loaded",{ fileName : "io/newgrounds/NG.hx", lineNumber : 407, className : "io.newgrounds.NG", methodName : "requestScoreBoards"}); if(onSuccess != null) { onSuccess(); } @@ -93665,7 +93375,7 @@ io_newgrounds_NG.prototype = $extend(io_newgrounds_NGLite.prototype,{ } var any = "" + response.result.data.scoreboards.length + " ScoreBoards received [" + idList.join(", ") + "]"; if(this.verbose) { - this.log(any,{ fileName : "io/newgrounds/NG.hx", lineNumber : 472, className : "io.newgrounds.NG", methodName : "onBoardsReceived"}); + this.log(any,{ fileName : "io/newgrounds/NG.hx", lineNumber : 446, className : "io.newgrounds.NG", methodName : "onBoardsReceived"}); } this.onScoreBoardsLoaded.dispatch(); } @@ -94243,7 +93953,7 @@ $hxClasses["io.newgrounds.utils.AsyncHttp"] = io_newgrounds_utils_AsyncHttp; io_newgrounds_utils_AsyncHttp.__name__ = "io.newgrounds.utils.AsyncHttp"; io_newgrounds_utils_AsyncHttp.send = function(core,data,onData,onError,onStatus) { if(core.verbose) { - core.log("sending: " + data,{ fileName : "io/newgrounds/utils/AsyncHttp.hx", lineNumber : 35, className : "io.newgrounds.utils.AsyncHttp", methodName : "send"}); + core.log("sending: " + data,{ fileName : "io/newgrounds/utils/AsyncHttp.hx", lineNumber : 33, className : "io.newgrounds.utils.AsyncHttp", methodName : "send"}); } io_newgrounds_utils_AsyncHttp.sendSync(core,data,onData,onError,onStatus); }; @@ -94303,14 +94013,6 @@ io_newgrounds_utils_TypedDispatcher.prototype = { var js_Browser = function() { }; $hxClasses["js.Browser"] = js_Browser; js_Browser.__name__ = "js.Browser"; -js_Browser.__properties__ = {get_supported:"get_supported"}; -js_Browser.get_supported = function() { - if(typeof(window) != "undefined" && typeof(window.location) != "undefined") { - return typeof(window.location.protocol) == "string"; - } else { - return false; - } -}; js_Browser.getLocalStorage = function() { try { var s = window.localStorage; @@ -94719,28 +94421,24 @@ lime__$internal_backend_html5_HTML5HTTPRequest.prototype = { this.request.onreadystatechange = readyStateChange; var query = ""; if(this.parent.data == null) { - var h = this.parent.formData.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(this.parent.formData.h); + while(key.hasNext()) { + var key1 = key.next(); if(query.length > 0) { query += "&"; } - var value = this.parent.formData.h[key]; - if(key.indexOf("[]") > -1 && ((value) instanceof Array)) { + var value = this.parent.formData.h[key1]; + if(key1.indexOf("[]") > -1 && ((value) instanceof Array)) { var _g = []; var x = $getIterator(value); while(x.hasNext()) { var x1 = x.next(); _g.push(encodeURIComponent(x1)); } - var arrayValue = _g.join("&" + key + "="); - query += encodeURIComponent(key) + "=" + arrayValue; + var arrayValue = _g.join("&" + key1 + "="); + query += encodeURIComponent(key1) + "=" + arrayValue; } else { - var query1 = encodeURIComponent(key) + "="; + var query1 = encodeURIComponent(key1) + "="; var s = Std.string(value); query += query1 + encodeURIComponent(s); } @@ -95937,12 +95635,11 @@ lime__$internal_format_BMP.encode = function(image,type) { } return data; }; -var lime__$internal_format_BMPType = $hxEnums["lime._internal.format.BMPType"] = { __ename__:"lime._internal.format.BMPType",__constructs__:null - ,RGB: {_hx_name:"RGB",_hx_index:0,__enum__:"lime._internal.format.BMPType",toString:$estr} - ,BITFIELD: {_hx_name:"BITFIELD",_hx_index:1,__enum__:"lime._internal.format.BMPType",toString:$estr} - ,ICO: {_hx_name:"ICO",_hx_index:2,__enum__:"lime._internal.format.BMPType",toString:$estr} +var lime__$internal_format_BMPType = $hxEnums["lime._internal.format.BMPType"] = { __ename__ : "lime._internal.format.BMPType", __constructs__ : ["RGB","BITFIELD","ICO"] + ,RGB: {_hx_index:0,__enum__:"lime._internal.format.BMPType",toString:$estr} + ,BITFIELD: {_hx_index:1,__enum__:"lime._internal.format.BMPType",toString:$estr} + ,ICO: {_hx_index:2,__enum__:"lime._internal.format.BMPType",toString:$estr} }; -lime__$internal_format_BMPType.__constructs__ = [lime__$internal_format_BMPType.RGB,lime__$internal_format_BMPType.BITFIELD,lime__$internal_format_BMPType.ICO]; var lime__$internal_format_Base64 = function() { }; $hxClasses["lime._internal.format.Base64"] = lime__$internal_format_Base64; lime__$internal_format_Base64.__name__ = "lime._internal.format.Base64"; @@ -103525,26 +103222,23 @@ lime_graphics_ImageBuffer.prototype = { ,__class__: lime_graphics_ImageBuffer ,__properties__: {get_stride:"get_stride",set_src:"set_src",get_src:"get_src"} }; -var lime_graphics_ImageChannel = $hxEnums["lime.graphics.ImageChannel"] = { __ename__:"lime.graphics.ImageChannel",__constructs__:null - ,RED: {_hx_name:"RED",_hx_index:0,__enum__:"lime.graphics.ImageChannel",toString:$estr} - ,GREEN: {_hx_name:"GREEN",_hx_index:1,__enum__:"lime.graphics.ImageChannel",toString:$estr} - ,BLUE: {_hx_name:"BLUE",_hx_index:2,__enum__:"lime.graphics.ImageChannel",toString:$estr} - ,ALPHA: {_hx_name:"ALPHA",_hx_index:3,__enum__:"lime.graphics.ImageChannel",toString:$estr} -}; -lime_graphics_ImageChannel.__constructs__ = [lime_graphics_ImageChannel.RED,lime_graphics_ImageChannel.GREEN,lime_graphics_ImageChannel.BLUE,lime_graphics_ImageChannel.ALPHA]; -var lime_graphics_ImageFileFormat = $hxEnums["lime.graphics.ImageFileFormat"] = { __ename__:"lime.graphics.ImageFileFormat",__constructs__:null - ,BMP: {_hx_name:"BMP",_hx_index:0,__enum__:"lime.graphics.ImageFileFormat",toString:$estr} - ,JPEG: {_hx_name:"JPEG",_hx_index:1,__enum__:"lime.graphics.ImageFileFormat",toString:$estr} - ,PNG: {_hx_name:"PNG",_hx_index:2,__enum__:"lime.graphics.ImageFileFormat",toString:$estr} -}; -lime_graphics_ImageFileFormat.__constructs__ = [lime_graphics_ImageFileFormat.BMP,lime_graphics_ImageFileFormat.JPEG,lime_graphics_ImageFileFormat.PNG]; -var lime_graphics_ImageType = $hxEnums["lime.graphics.ImageType"] = { __ename__:"lime.graphics.ImageType",__constructs__:null - ,CANVAS: {_hx_name:"CANVAS",_hx_index:0,__enum__:"lime.graphics.ImageType",toString:$estr} - ,DATA: {_hx_name:"DATA",_hx_index:1,__enum__:"lime.graphics.ImageType",toString:$estr} - ,FLASH: {_hx_name:"FLASH",_hx_index:2,__enum__:"lime.graphics.ImageType",toString:$estr} - ,CUSTOM: {_hx_name:"CUSTOM",_hx_index:3,__enum__:"lime.graphics.ImageType",toString:$estr} -}; -lime_graphics_ImageType.__constructs__ = [lime_graphics_ImageType.CANVAS,lime_graphics_ImageType.DATA,lime_graphics_ImageType.FLASH,lime_graphics_ImageType.CUSTOM]; +var lime_graphics_ImageChannel = $hxEnums["lime.graphics.ImageChannel"] = { __ename__ : "lime.graphics.ImageChannel", __constructs__ : ["RED","GREEN","BLUE","ALPHA"] + ,RED: {_hx_index:0,__enum__:"lime.graphics.ImageChannel",toString:$estr} + ,GREEN: {_hx_index:1,__enum__:"lime.graphics.ImageChannel",toString:$estr} + ,BLUE: {_hx_index:2,__enum__:"lime.graphics.ImageChannel",toString:$estr} + ,ALPHA: {_hx_index:3,__enum__:"lime.graphics.ImageChannel",toString:$estr} +}; +var lime_graphics_ImageFileFormat = $hxEnums["lime.graphics.ImageFileFormat"] = { __ename__ : "lime.graphics.ImageFileFormat", __constructs__ : ["BMP","JPEG","PNG"] + ,BMP: {_hx_index:0,__enum__:"lime.graphics.ImageFileFormat",toString:$estr} + ,JPEG: {_hx_index:1,__enum__:"lime.graphics.ImageFileFormat",toString:$estr} + ,PNG: {_hx_index:2,__enum__:"lime.graphics.ImageFileFormat",toString:$estr} +}; +var lime_graphics_ImageType = $hxEnums["lime.graphics.ImageType"] = { __ename__ : "lime.graphics.ImageType", __constructs__ : ["CANVAS","DATA","FLASH","CUSTOM"] + ,CANVAS: {_hx_index:0,__enum__:"lime.graphics.ImageType",toString:$estr} + ,DATA: {_hx_index:1,__enum__:"lime.graphics.ImageType",toString:$estr} + ,FLASH: {_hx_index:2,__enum__:"lime.graphics.ImageType",toString:$estr} + ,CUSTOM: {_hx_index:3,__enum__:"lime.graphics.ImageType",toString:$estr} +}; var lime_graphics_OpenGLES2RenderContext = {}; lime_graphics_OpenGLES2RenderContext.fromGL = function(gl) { return null; @@ -106963,18 +106657,18 @@ lime_media_AudioBuffer.__getCodec = function(bytes) { if(bytes.getString(8,4) == "WAVE") { return "audio/wav"; } else { - var _g = bytes.b[1]; - var _g1 = bytes.b[2]; + var _g = bytes.b[2]; + var _g1 = bytes.b[1]; switch(bytes.b[0]) { case 73: - if(_g == 68) { - if(_g1 == 51) { + if(_g1 == 68) { + if(_g == 51) { return "audio/mp3"; } } break; case 255: - switch(_g) { + switch(_g1) { case 243:case 250:case 251: return "audio/mp3"; default: @@ -106987,18 +106681,18 @@ lime_media_AudioBuffer.__getCodec = function(bytes) { case "fLaC": return "audio/flac"; default: - var _g = bytes.b[1]; - var _g1 = bytes.b[2]; + var _g = bytes.b[2]; + var _g1 = bytes.b[1]; switch(bytes.b[0]) { case 73: - if(_g == 68) { - if(_g1 == 51) { + if(_g1 == 68) { + if(_g == 51) { return "audio/mp3"; } } break; case 255: - switch(_g) { + switch(_g1) { case 243:case 250:case 251: return "audio/mp3"; default: @@ -108876,11 +108570,10 @@ lime_system_DisplayMode.prototype = { ,width: null ,__class__: lime_system_DisplayMode }; -var lime_system_Endian = $hxEnums["lime.system.Endian"] = { __ename__:"lime.system.Endian",__constructs__:null - ,LITTLE_ENDIAN: {_hx_name:"LITTLE_ENDIAN",_hx_index:0,__enum__:"lime.system.Endian",toString:$estr} - ,BIG_ENDIAN: {_hx_name:"BIG_ENDIAN",_hx_index:1,__enum__:"lime.system.Endian",toString:$estr} +var lime_system_Endian = $hxEnums["lime.system.Endian"] = { __ename__ : "lime.system.Endian", __constructs__ : ["LITTLE_ENDIAN","BIG_ENDIAN"] + ,LITTLE_ENDIAN: {_hx_index:0,__enum__:"lime.system.Endian",toString:$estr} + ,BIG_ENDIAN: {_hx_index:1,__enum__:"lime.system.Endian",toString:$estr} }; -lime_system_Endian.__constructs__ = [lime_system_Endian.LITTLE_ENDIAN,lime_system_Endian.BIG_ENDIAN]; var lime_system_JNI = function() { }; $hxClasses["lime.system.JNI"] = lime_system_JNI; lime_system_JNI.__name__ = "lime.system.JNI"; @@ -109173,10 +108866,9 @@ lime_system_Sensor.prototype = { ,type: null ,__class__: lime_system_Sensor }; -var lime_system_SensorType = $hxEnums["lime.system.SensorType"] = { __ename__:"lime.system.SensorType",__constructs__:null - ,ACCELEROMETER: {_hx_name:"ACCELEROMETER",_hx_index:0,__enum__:"lime.system.SensorType",toString:$estr} +var lime_system_SensorType = $hxEnums["lime.system.SensorType"] = { __ename__ : "lime.system.SensorType", __constructs__ : ["ACCELEROMETER"] + ,ACCELEROMETER: {_hx_index:0,__enum__:"lime.system.SensorType",toString:$estr} }; -lime_system_SensorType.__constructs__ = [lime_system_SensorType.ACCELEROMETER]; var lime_system_System = function() { }; $hxClasses["lime.system.System"] = lime_system_System; lime_system_System.__name__ = "lime.system.System"; @@ -109485,14 +109177,13 @@ lime_system_ThreadPool.prototype = { } ,__class__: lime_system_ThreadPool }; -var lime_system__$ThreadPool_ThreadPoolMessageType = $hxEnums["lime.system._ThreadPool.ThreadPoolMessageType"] = { __ename__:"lime.system._ThreadPool.ThreadPoolMessageType",__constructs__:null - ,COMPLETE: {_hx_name:"COMPLETE",_hx_index:0,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} - ,ERROR: {_hx_name:"ERROR",_hx_index:1,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} - ,EXIT: {_hx_name:"EXIT",_hx_index:2,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} - ,PROGRESS: {_hx_name:"PROGRESS",_hx_index:3,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} - ,WORK: {_hx_name:"WORK",_hx_index:4,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} +var lime_system__$ThreadPool_ThreadPoolMessageType = $hxEnums["lime.system._ThreadPool.ThreadPoolMessageType"] = { __ename__ : "lime.system._ThreadPool.ThreadPoolMessageType", __constructs__ : ["COMPLETE","ERROR","EXIT","PROGRESS","WORK"] + ,COMPLETE: {_hx_index:0,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} + ,ERROR: {_hx_index:1,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} + ,EXIT: {_hx_index:2,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} + ,PROGRESS: {_hx_index:3,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} + ,WORK: {_hx_index:4,__enum__:"lime.system._ThreadPool.ThreadPoolMessageType",toString:$estr} }; -lime_system__$ThreadPool_ThreadPoolMessageType.__constructs__ = [lime_system__$ThreadPool_ThreadPoolMessageType.COMPLETE,lime_system__$ThreadPool_ThreadPoolMessageType.ERROR,lime_system__$ThreadPool_ThreadPoolMessageType.EXIT,lime_system__$ThreadPool_ThreadPoolMessageType.PROGRESS,lime_system__$ThreadPool_ThreadPoolMessageType.WORK]; var lime_system__$ThreadPool_ThreadPoolMessage = function(type,state) { this.type = type; this.state = state; @@ -109852,13 +109543,12 @@ lime_ui_FileDialog.prototype = { } ,__class__: lime_ui_FileDialog }; -var lime_ui_FileDialogType = $hxEnums["lime.ui.FileDialogType"] = { __ename__:"lime.ui.FileDialogType",__constructs__:null - ,OPEN: {_hx_name:"OPEN",_hx_index:0,__enum__:"lime.ui.FileDialogType",toString:$estr} - ,OPEN_MULTIPLE: {_hx_name:"OPEN_MULTIPLE",_hx_index:1,__enum__:"lime.ui.FileDialogType",toString:$estr} - ,SAVE: {_hx_name:"SAVE",_hx_index:2,__enum__:"lime.ui.FileDialogType",toString:$estr} - ,OPEN_DIRECTORY: {_hx_name:"OPEN_DIRECTORY",_hx_index:3,__enum__:"lime.ui.FileDialogType",toString:$estr} +var lime_ui_FileDialogType = $hxEnums["lime.ui.FileDialogType"] = { __ename__ : "lime.ui.FileDialogType", __constructs__ : ["OPEN","OPEN_MULTIPLE","SAVE","OPEN_DIRECTORY"] + ,OPEN: {_hx_index:0,__enum__:"lime.ui.FileDialogType",toString:$estr} + ,OPEN_MULTIPLE: {_hx_index:1,__enum__:"lime.ui.FileDialogType",toString:$estr} + ,SAVE: {_hx_index:2,__enum__:"lime.ui.FileDialogType",toString:$estr} + ,OPEN_DIRECTORY: {_hx_index:3,__enum__:"lime.ui.FileDialogType",toString:$estr} }; -lime_ui_FileDialogType.__constructs__ = [lime_ui_FileDialogType.OPEN,lime_ui_FileDialogType.OPEN_MULTIPLE,lime_ui_FileDialogType.SAVE,lime_ui_FileDialogType.OPEN_DIRECTORY]; var lime_ui_Gamepad = function(id) { this.onDisconnect = new lime_app__$Event_$Void_$Void(); this.onButtonUp = new lime_app__$Event_$lime_$ui_$GamepadButton_$Void(); @@ -110207,29 +109897,27 @@ lime_ui_KeyModifier.set_shiftKey = function(this1,value) { } return value; }; -var lime_ui_MouseCursor = $hxEnums["lime.ui.MouseCursor"] = { __ename__:"lime.ui.MouseCursor",__constructs__:null - ,ARROW: {_hx_name:"ARROW",_hx_index:0,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,CROSSHAIR: {_hx_name:"CROSSHAIR",_hx_index:1,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,DEFAULT: {_hx_name:"DEFAULT",_hx_index:2,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,MOVE: {_hx_name:"MOVE",_hx_index:3,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,POINTER: {_hx_name:"POINTER",_hx_index:4,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,RESIZE_NESW: {_hx_name:"RESIZE_NESW",_hx_index:5,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,RESIZE_NS: {_hx_name:"RESIZE_NS",_hx_index:6,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,RESIZE_NWSE: {_hx_name:"RESIZE_NWSE",_hx_index:7,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,RESIZE_WE: {_hx_name:"RESIZE_WE",_hx_index:8,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,TEXT: {_hx_name:"TEXT",_hx_index:9,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,WAIT: {_hx_name:"WAIT",_hx_index:10,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,WAIT_ARROW: {_hx_name:"WAIT_ARROW",_hx_index:11,__enum__:"lime.ui.MouseCursor",toString:$estr} - ,CUSTOM: {_hx_name:"CUSTOM",_hx_index:12,__enum__:"lime.ui.MouseCursor",toString:$estr} -}; -lime_ui_MouseCursor.__constructs__ = [lime_ui_MouseCursor.ARROW,lime_ui_MouseCursor.CROSSHAIR,lime_ui_MouseCursor.DEFAULT,lime_ui_MouseCursor.MOVE,lime_ui_MouseCursor.POINTER,lime_ui_MouseCursor.RESIZE_NESW,lime_ui_MouseCursor.RESIZE_NS,lime_ui_MouseCursor.RESIZE_NWSE,lime_ui_MouseCursor.RESIZE_WE,lime_ui_MouseCursor.TEXT,lime_ui_MouseCursor.WAIT,lime_ui_MouseCursor.WAIT_ARROW,lime_ui_MouseCursor.CUSTOM]; -var lime_ui_MouseWheelMode = $hxEnums["lime.ui.MouseWheelMode"] = { __ename__:"lime.ui.MouseWheelMode",__constructs__:null - ,PIXELS: {_hx_name:"PIXELS",_hx_index:0,__enum__:"lime.ui.MouseWheelMode",toString:$estr} - ,LINES: {_hx_name:"LINES",_hx_index:1,__enum__:"lime.ui.MouseWheelMode",toString:$estr} - ,PAGES: {_hx_name:"PAGES",_hx_index:2,__enum__:"lime.ui.MouseWheelMode",toString:$estr} - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:3,__enum__:"lime.ui.MouseWheelMode",toString:$estr} -}; -lime_ui_MouseWheelMode.__constructs__ = [lime_ui_MouseWheelMode.PIXELS,lime_ui_MouseWheelMode.LINES,lime_ui_MouseWheelMode.PAGES,lime_ui_MouseWheelMode.UNKNOWN]; +var lime_ui_MouseCursor = $hxEnums["lime.ui.MouseCursor"] = { __ename__ : "lime.ui.MouseCursor", __constructs__ : ["ARROW","CROSSHAIR","DEFAULT","MOVE","POINTER","RESIZE_NESW","RESIZE_NS","RESIZE_NWSE","RESIZE_WE","TEXT","WAIT","WAIT_ARROW","CUSTOM"] + ,ARROW: {_hx_index:0,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,CROSSHAIR: {_hx_index:1,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,DEFAULT: {_hx_index:2,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,MOVE: {_hx_index:3,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,POINTER: {_hx_index:4,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,RESIZE_NESW: {_hx_index:5,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,RESIZE_NS: {_hx_index:6,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,RESIZE_NWSE: {_hx_index:7,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,RESIZE_WE: {_hx_index:8,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,TEXT: {_hx_index:9,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,WAIT: {_hx_index:10,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,WAIT_ARROW: {_hx_index:11,__enum__:"lime.ui.MouseCursor",toString:$estr} + ,CUSTOM: {_hx_index:12,__enum__:"lime.ui.MouseCursor",toString:$estr} +}; +var lime_ui_MouseWheelMode = $hxEnums["lime.ui.MouseWheelMode"] = { __ename__ : "lime.ui.MouseWheelMode", __constructs__ : ["PIXELS","LINES","PAGES","UNKNOWN"] + ,PIXELS: {_hx_index:0,__enum__:"lime.ui.MouseWheelMode",toString:$estr} + ,LINES: {_hx_index:1,__enum__:"lime.ui.MouseWheelMode",toString:$estr} + ,PAGES: {_hx_index:2,__enum__:"lime.ui.MouseWheelMode",toString:$estr} + ,UNKNOWN: {_hx_index:3,__enum__:"lime.ui.MouseWheelMode",toString:$estr} +}; var lime_ui_ScanCode = {}; lime_ui_ScanCode.fromKeyCode = function(keyCode) { return lime_ui_KeyCode.toScanCode(keyCode); @@ -110516,10 +110204,9 @@ lime_ui_Window.prototype = { ,__class__: lime_ui_Window ,__properties__: {set_y:"set_y",get_y:"get_y",set_x:"set_x",get_x:"get_x",set_width:"set_width",get_width:"get_width",set_title:"set_title",get_title:"get_title",set_textInputEnabled:"set_textInputEnabled",get_textInputEnabled:"get_textInputEnabled",get_scale:"get_scale",set_resizable:"set_resizable",get_resizable:"get_resizable",set_mouseLock:"set_mouseLock",get_mouseLock:"get_mouseLock",set_minimized:"set_minimized",get_minimized:"get_minimized",set_maximized:"set_maximized",get_maximized:"get_maximized",get_hidden:"get_hidden",set_height:"set_height",get_height:"get_height",set_fullscreen:"set_fullscreen",get_fullscreen:"get_fullscreen",set_frameRate:"set_frameRate",get_frameRate:"get_frameRate",set_displayMode:"set_displayMode",get_displayMode:"get_displayMode",get_display:"get_display",set_cursor:"set_cursor",get_cursor:"get_cursor",set_borderless:"set_borderless",get_borderless:"get_borderless"} }; -var lime_utils_TAError = $hxEnums["lime.utils.TAError"] = { __ename__:"lime.utils.TAError",__constructs__:null - ,RangeError: {_hx_name:"RangeError",_hx_index:0,__enum__:"lime.utils.TAError",toString:$estr} +var lime_utils_TAError = $hxEnums["lime.utils.TAError"] = { __ename__ : "lime.utils.TAError", __constructs__ : ["RangeError"] + ,RangeError: {_hx_index:0,__enum__:"lime.utils.TAError",toString:$estr} }; -lime_utils_TAError.__constructs__ = [lime_utils_TAError.RangeError]; var lime_utils_AssetBundle = function() { this.data = new haxe_ds_StringMap(); this.paths = []; @@ -110570,7 +110257,7 @@ var lime_utils_AssetCache = function() { this.audio = new haxe_ds_StringMap(); this.font = new haxe_ds_StringMap(); this.image = new haxe_ds_StringMap(); - this.version = 995946; + this.version = 736275; }; $hxClasses["lime.utils.AssetCache"] = lime_utils_AssetCache; lime_utils_AssetCache.__name__ = "lime.utils.AssetCache"; @@ -110625,45 +110312,36 @@ lime_utils_AssetCache.prototype = { this.font = new haxe_ds_StringMap(); this.image = new haxe_ds_StringMap(); } else { - var h = this.audio.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(StringTools.startsWith(key,prefix)) { + var keys = haxe_ds_StringMap.keysIterator(this.audio.h); + var key = keys; + while(key.hasNext()) { + var key1 = key.next(); + if(StringTools.startsWith(key1,prefix)) { var _this = this.audio; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } } - var h = this.font.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(StringTools.startsWith(key,prefix)) { + var keys = haxe_ds_StringMap.keysIterator(this.font.h); + var key = keys; + while(key.hasNext()) { + var key1 = key.next(); + if(StringTools.startsWith(key1,prefix)) { var _this = this.font; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } } - var h = this.image.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(StringTools.startsWith(key,prefix)) { + var keys = haxe_ds_StringMap.keysIterator(this.image.h); + var key = keys; + while(key.hasNext()) { + var key1 = key.next(); + if(StringTools.startsWith(key1,prefix)) { var _this = this.image; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } } @@ -110903,15 +110581,11 @@ lime_utils_AssetLibrary.prototype = { ,list: function(type) { var requestedType = type != null ? js_Boot.__cast(type , String) : null; var items = []; - var h = this.types.h; - var id_h = h; - var id_keys = Object.keys(h); - var id_length = id_keys.length; - var id_current = 0; - while(id_current < id_length) { - var id = id_keys[id_current++]; - if(requestedType == null || this.exists(id,type)) { - items.push(id); + var id = haxe_ds_StringMap.keysIterator(this.types.h); + while(id.hasNext()) { + var id1 = id.next(); + if(requestedType == null || this.exists(id1,type)) { + items.push(id1); } } return items; @@ -110943,114 +110617,110 @@ lime_utils_AssetLibrary.prototype = { this.bytesLoadedCache = new haxe_ds_StringMap(); this.assetsLoaded = 0; this.assetsTotal = 1; - var h = this.preload.h; - var id_h = h; - var id_keys = Object.keys(h); - var id_length = id_keys.length; - var id_current = 0; - while(id_current < id_length) { - var id = id_keys[id_current++]; - if(!this.preload.h[id]) { + var id = haxe_ds_StringMap.keysIterator(this.preload.h); + while(id.hasNext()) { + var id1 = id.next(); + if(!this.preload.h[id1]) { continue; } - lime_utils_Log.verbose("Preloading asset: " + id + " [" + this.types.h[id] + "]",{ fileName : "lime/utils/AssetLibrary.hx", lineNumber : 405, className : "lime.utils.AssetLibrary", methodName : "load"}); - var _g = this.types.h[id]; + lime_utils_Log.verbose("Preloading asset: " + id1 + " [" + this.types.h[id1] + "]",{ fileName : "lime/utils/AssetLibrary.hx", lineNumber : 405, className : "lime.utils.AssetLibrary", methodName : "load"}); + var _g = this.types.h[id1]; if(_g != null) { switch(_g) { case "BINARY": this.assetsTotal++; - var future = this.loadBytes(id); + var future = this.loadBytes(id1); future.onProgress((function(id,_g) { return function(bytesLoaded,bytesTotal) { _g[0](id[0],bytesLoaded,bytesTotal); }; - })([id],[$bind(this,this.load_onProgress)])); + })([id1],[$bind(this,this.load_onProgress)])); future.onError((function(id,_g) { return function(message) { _g[0](id[0],message); }; - })([id],[$bind(this,this.load_onError)])); + })([id1],[$bind(this,this.load_onError)])); future.onComplete((function(id,_g) { return function(bytes) { _g[0](id[0],bytes); }; - })([id],[$bind(this,this.loadBytes_onComplete)])); + })([id1],[$bind(this,this.loadBytes_onComplete)])); break; case "FONT": this.assetsTotal++; - var future1 = this.loadFont(id); + var future1 = this.loadFont(id1); future1.onProgress((function(id,_g) { return function(bytesLoaded,bytesTotal) { _g[0](id[0],bytesLoaded,bytesTotal); }; - })([id],[$bind(this,this.load_onProgress)])); + })([id1],[$bind(this,this.load_onProgress)])); future1.onError((function(id,_g) { return function(message) { _g[0](id[0],message); }; - })([id],[$bind(this,this.load_onError)])); + })([id1],[$bind(this,this.load_onError)])); future1.onComplete((function(id,_g) { return function(font) { _g[0](id[0],font); }; - })([id],[$bind(this,this.loadFont_onComplete)])); + })([id1],[$bind(this,this.loadFont_onComplete)])); break; case "IMAGE": this.assetsTotal++; - var future2 = this.loadImage(id); + var future2 = this.loadImage(id1); future2.onProgress((function(id,_g) { return function(bytesLoaded,bytesTotal) { _g[0](id[0],bytesLoaded,bytesTotal); }; - })([id],[$bind(this,this.load_onProgress)])); + })([id1],[$bind(this,this.load_onProgress)])); future2.onError((function(id,_g) { return function(message) { _g[0](id[0],message); }; - })([id],[$bind(this,this.load_onError)])); + })([id1],[$bind(this,this.load_onError)])); future2.onComplete((function(id,_g) { return function(image) { _g[0](id[0],image); }; - })([id],[$bind(this,this.loadImage_onComplete)])); + })([id1],[$bind(this,this.loadImage_onComplete)])); break; case "MUSIC":case "SOUND": this.assetsTotal++; - var future3 = this.loadAudioBuffer(id); + var future3 = this.loadAudioBuffer(id1); future3.onProgress((function(id,_g) { return function(bytesLoaded,bytesTotal) { _g[0](id[0],bytesLoaded,bytesTotal); }; - })([id],[$bind(this,this.load_onProgress)])); + })([id1],[$bind(this,this.load_onProgress)])); future3.onError((function(id,_g) { return function(message) { _g[0](id[0],message); }; - })([id],[$bind(this,this.loadAudioBuffer_onError)])); + })([id1],[$bind(this,this.loadAudioBuffer_onError)])); future3.onComplete((function(id,_g) { return function(audioBuffer) { _g[0](id[0],audioBuffer); }; - })([id],[$bind(this,this.loadAudioBuffer_onComplete)])); + })([id1],[$bind(this,this.loadAudioBuffer_onComplete)])); break; case "TEXT": this.assetsTotal++; - var future4 = this.loadText(id); + var future4 = this.loadText(id1); future4.onProgress((function(id,_g) { return function(bytesLoaded,bytesTotal) { _g[0](id[0],bytesLoaded,bytesTotal); }; - })([id],[$bind(this,this.load_onProgress)])); + })([id1],[$bind(this,this.load_onProgress)])); future4.onError((function(id,_g) { return function(message) { _g[0](id[0],message); }; - })([id],[$bind(this,this.load_onError)])); + })([id1],[$bind(this,this.load_onError)])); future4.onComplete((function(id,_g) { return function(text) { _g[0](id[0],text); }; - })([id],[$bind(this,this.loadText_onComplete)])); + })([id1],[$bind(this,this.loadText_onComplete)])); break; default: } @@ -111289,22 +110959,18 @@ lime_utils_AssetLibrary.prototype = { this.cachedAudioBuffers.h[id] = audioBuffer; if(Object.prototype.hasOwnProperty.call(this.pathGroups.h,id)) { var pathGroup = this.pathGroups.h[id]; - var h = this.pathGroups.h; - var otherID_h = h; - var otherID_keys = Object.keys(h); - var otherID_length = otherID_keys.length; - var otherID_current = 0; - while(otherID_current < otherID_length) { - var otherID = otherID_keys[otherID_current++]; - if(otherID == id) { + var otherID = haxe_ds_StringMap.keysIterator(this.pathGroups.h); + while(otherID.hasNext()) { + var otherID1 = otherID.next(); + if(otherID1 == id) { continue; } var _g = 0; while(_g < pathGroup.length) { var path = pathGroup[_g]; ++_g; - if(this.pathGroups.h[otherID].indexOf(path) > -1) { - this.cachedAudioBuffers.h[otherID] = audioBuffer; + if(this.pathGroups.h[otherID1].indexOf(path) > -1) { + this.cachedAudioBuffers.h[otherID1] = audioBuffer; break; } } @@ -111661,14 +111327,10 @@ lime_utils_Assets.isValidImage = function(image) { }; lime_utils_Assets.list = function(type) { var items = []; - var h = lime_utils_Assets.libraries.h; - var library_h = h; - var library_keys = Object.keys(h); - var library_length = library_keys.length; - var library_current = 0; - while(library_current < library_length) { - var library = library_h[library_keys[library_current++]]; - var libraryItems = library.list(type); + var library = haxe_ds_StringMap.valueIterator(lime_utils_Assets.libraries.h); + while(library.hasNext()) { + var library1 = library.next(); + var libraryItems = library1.list(type); if(libraryItems != null) { items = items.concat(libraryItems); } @@ -112313,13 +111975,12 @@ lime_utils_Bytes.ofString = function(s) { var bytes = haxe_io_Bytes.ofString(s); return lime_utils_Bytes._new(bytes.length,bytes.b.bufferValue); }; -var lime_utils_CompressionAlgorithm = $hxEnums["lime.utils.CompressionAlgorithm"] = { __ename__:"lime.utils.CompressionAlgorithm",__constructs__:null - ,DEFLATE: {_hx_name:"DEFLATE",_hx_index:0,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} - ,GZIP: {_hx_name:"GZIP",_hx_index:1,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} - ,LZMA: {_hx_name:"LZMA",_hx_index:2,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} - ,ZLIB: {_hx_name:"ZLIB",_hx_index:3,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} +var lime_utils_CompressionAlgorithm = $hxEnums["lime.utils.CompressionAlgorithm"] = { __ename__ : "lime.utils.CompressionAlgorithm", __constructs__ : ["DEFLATE","GZIP","LZMA","ZLIB"] + ,DEFLATE: {_hx_index:0,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} + ,GZIP: {_hx_index:1,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} + ,LZMA: {_hx_index:2,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} + ,ZLIB: {_hx_index:3,__enum__:"lime.utils.CompressionAlgorithm",toString:$estr} }; -lime_utils_CompressionAlgorithm.__constructs__ = [lime_utils_CompressionAlgorithm.DEFLATE,lime_utils_CompressionAlgorithm.GZIP,lime_utils_CompressionAlgorithm.LZMA,lime_utils_CompressionAlgorithm.ZLIB]; var lime_utils_DataPointer = {}; lime_utils_DataPointer._new = function(data) { var this1 = data; @@ -113181,6 +112842,13 @@ motion_actuators_SimpleActuator.prototype = $extend(motion_actuators_GenericActu ,setVisible: null ,startTime: null ,toggleVisible: null + ,reverse: function(value) { + var ga = motion_actuators_GenericActuator.prototype.reverse.call(this,value); + var startTime = 0; + startTime = openfl_Lib.getTimer() / 1000; + this.update(startTime); + return ga; + } ,apply: function() { motion_actuators_GenericActuator.prototype.apply.call(this); if(this.toggleVisible && Object.prototype.hasOwnProperty.call(this.properties,"alpha")) { @@ -113392,12 +113060,7 @@ motion_actuators_SimpleActuator.prototype = $extend(motion_actuators_GenericActu while(_g < _g1) { var i = _g++; details = this.propertyDetails[i]; - var value = details.start + details.change * easing; - if(details.isField) { - details.target[details.propertyName] = value; - } else { - Reflect.setProperty(details.target,details.propertyName,value); - } + this.setProperty(details,details.start + details.change * easing); } } else { if(!this._reverse) { @@ -113423,19 +113086,9 @@ motion_actuators_SimpleActuator.prototype = $extend(motion_actuators_GenericActu endValue = details.start + details.change * easing; } if(!this._snapping) { - var value = endValue; - if(details.isField) { - details.target[details.propertyName] = value; - } else { - Reflect.setProperty(details.target,details.propertyName,value); - } + this.setProperty(details,endValue); } else { - var value1 = Math.round(endValue); - if(details.isField) { - details.target[details.propertyName] = value1; - } else { - Reflect.setProperty(details.target,details.propertyName,value1); - } + this.setProperty(details,Math.round(endValue)); } } } @@ -113942,7 +113595,7 @@ motion__$MotionPath_ComponentPath.prototype = { while(_g < _g1.length) { var path = _g1[_g]; ++_g; - if(ratio > path.strength) { + if(ratio - path.strength > 1e-7) { ratio -= path.strength; } else { return path.calculate(ratio / path.strength); @@ -114280,18 +113933,20 @@ motion_actuators_MethodActuator.prototype = $extend(motion_actuators_SimpleActua if(sendEvent == null) { sendEvent = true; } - var _g = 0; - var _g1 = this.properties.start.length; - while(_g < _g1) { - var i = _g++; - this.currentParameters[i] = Reflect.field(this.tweenProperties,"param" + i); - } - var method = this.target; - var params = this.currentParameters; - if(params == null) { - params = []; + if(this.initialized) { + var _g = 0; + var _g1 = this.properties.start.length; + while(_g < _g1) { + var i = _g++; + this.currentParameters[i] = Reflect.field(this.tweenProperties,"param" + i); + } + var method = this.target; + var params = this.currentParameters; + if(params == null) { + params = []; + } + method.apply(method,params); } - method.apply(method,params); motion_actuators_SimpleActuator.prototype.complete.call(this,sendEvent); } ,initialize: function() { @@ -118292,17 +117947,7 @@ openfl_text_TextField.prototype = $extend(openfl_display_InteractiveObject.proto } else if(range.start <= beginIndex && range.end > endIndex) { range.end += offset; } else if(range.start >= beginIndex && range.end <= endIndex) { - var this1 = this.__textEngine.textFormatRanges; - var this2 = []; - this1.__tempIndex = i--; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,1); + this.__textEngine.textFormatRanges.splice(i--,1); } else if(range.end > endIndex && range.start > beginIndex && range.start <= endIndex) { range.start = beginIndex; range.end += offset; @@ -118382,10 +118027,12 @@ openfl_text_TextField.prototype = $extend(openfl_display_InteractiveObject.proto if(this.__textEngine.width != cacheWidth) { switch(this.__textEngine.autoSize) { case 0: - this.set_x(this.get_x() + (cacheWidth - this.__textEngine.width) / 2); + var _g = this; + _g.set_x(_g.get_x() + (cacheWidth - this.__textEngine.width) / 2); break; case 3: - this.set_x(this.get_x() + (cacheWidth - this.__textEngine.width)); + var _g = this; + _g.set_x(_g.get_x() + (cacheWidth - this.__textEngine.width)); break; default: } @@ -118466,16 +118113,19 @@ openfl_text_TextField.prototype = $extend(openfl_display_InteractiveObject.proto return; } if(this.get_mouseX() > this.get_width() - 1) { - this.set_scrollH(this.get_scrollH() + (Math.max(Math.min((this.get_mouseX() - this.get_width()) * .1,10),1) | 0)); + var _g = this; + _g.set_scrollH(_g.get_scrollH() + (Math.max(Math.min((this.get_mouseX() - this.get_width()) * .1,10),1) | 0)); } else if(this.get_mouseX() < 1) { - this.set_scrollH(this.get_scrollH() - (Math.max(Math.min(this.get_mouseX() * -.1,10),1) | 0)); + var _g = this; + _g.set_scrollH(_g.get_scrollH() - (Math.max(Math.min(this.get_mouseX() * -.1,10),1) | 0)); } this.__mouseScrollVCounter++; if(this.__mouseScrollVCounter > this.stage.get_frameRate() / 10) { if(this.get_mouseY() > this.get_height() - 2) { this.set_scrollV(Math.min(this.get_scrollV() + Math.max(Math.min((this.get_mouseY() - this.get_height()) * .03,5),1),this.get_maxScrollV()) | 0); } else if(this.get_mouseY() < 2) { - this.set_scrollV(this.get_scrollV() - (Math.max(Math.min(this.get_mouseY() * -.03,5),1) | 0)); + var _g = this; + _g.set_scrollV(_g.get_scrollV() - (Math.max(Math.min(this.get_mouseY() * -.03,5),1) | 0)); } this.__mouseScrollVCounter = 0; } @@ -118856,18 +118506,7 @@ openfl_text_TextField.prototype = $extend(openfl_display_InteractiveObject.proto return value; } if(this.__textEngine.textFormatRanges.get_length() > 1) { - var this1 = this.__textEngine.textFormatRanges; - var deleteCount = this.__textEngine.textFormatRanges.get_length() - 1; - var this2 = []; - this1.__tempIndex = 1; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,deleteCount); + this.__textEngine.textFormatRanges.splice(1,this.__textEngine.textFormatRanges.get_length() - 1); } var utfValue = value; var range = this.__textEngine.textFormatRanges.get(0); @@ -124415,17 +124054,7 @@ openfl_display_SimpleButton.prototype = $extend(openfl_display_InteractiveObject } var index = this.__previousStates.indexOf(value,0); if(index > -1) { - var this1 = this.__previousStates; - var this2 = []; - this1.__tempIndex = index; - var _g_current = 0; - var _g_args = this2; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - this1.insertAt(this1.__tempIndex,item); - this1.__tempIndex++; - } - this1.splice(this1.__tempIndex,1); + this.__previousStates.splice(index,1); } } if(value != null) { @@ -138749,12 +138378,11 @@ openfl_display__$internal_Context3DBuffer.prototype = { } ,__class__: openfl_display__$internal_Context3DBuffer }; -var openfl_display__$internal_Context3DElementType = $hxEnums["openfl.display._internal.Context3DElementType"] = { __ename__:"openfl.display._internal.Context3DElementType",__constructs__:null - ,QUADS: {_hx_name:"QUADS",_hx_index:0,__enum__:"openfl.display._internal.Context3DElementType",toString:$estr} - ,TRIANGLES: {_hx_name:"TRIANGLES",_hx_index:1,__enum__:"openfl.display._internal.Context3DElementType",toString:$estr} - ,TRIANGLE_INDICES: {_hx_name:"TRIANGLE_INDICES",_hx_index:2,__enum__:"openfl.display._internal.Context3DElementType",toString:$estr} +var openfl_display__$internal_Context3DElementType = $hxEnums["openfl.display._internal.Context3DElementType"] = { __ename__ : "openfl.display._internal.Context3DElementType", __constructs__ : ["QUADS","TRIANGLES","TRIANGLE_INDICES"] + ,QUADS: {_hx_index:0,__enum__:"openfl.display._internal.Context3DElementType",toString:$estr} + ,TRIANGLES: {_hx_index:1,__enum__:"openfl.display._internal.Context3DElementType",toString:$estr} + ,TRIANGLE_INDICES: {_hx_index:2,__enum__:"openfl.display._internal.Context3DElementType",toString:$estr} }; -openfl_display__$internal_Context3DElementType.__constructs__ = [openfl_display__$internal_Context3DElementType.QUADS,openfl_display__$internal_Context3DElementType.TRIANGLES,openfl_display__$internal_Context3DElementType.TRIANGLE_INDICES]; var openfl_display__$internal_Context3DDisplayObject = function() { }; $hxClasses["openfl.display._internal.Context3DDisplayObject"] = openfl_display__$internal_Context3DDisplayObject; openfl_display__$internal_Context3DDisplayObject.__name__ = "openfl.display._internal.Context3DDisplayObject"; @@ -146174,33 +145802,32 @@ openfl_display__$internal_WindingNonZeroView._new = function(d) { var this1 = d; return this1; }; -var openfl_display__$internal_DrawCommandType = $hxEnums["openfl.display._internal.DrawCommandType"] = { __ename__:"openfl.display._internal.DrawCommandType",__constructs__:null - ,BEGIN_BITMAP_FILL: {_hx_name:"BEGIN_BITMAP_FILL",_hx_index:0,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,BEGIN_FILL: {_hx_name:"BEGIN_FILL",_hx_index:1,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,BEGIN_GRADIENT_FILL: {_hx_name:"BEGIN_GRADIENT_FILL",_hx_index:2,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,BEGIN_SHADER_FILL: {_hx_name:"BEGIN_SHADER_FILL",_hx_index:3,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,CUBIC_CURVE_TO: {_hx_name:"CUBIC_CURVE_TO",_hx_index:4,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,CURVE_TO: {_hx_name:"CURVE_TO",_hx_index:5,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_CIRCLE: {_hx_name:"DRAW_CIRCLE",_hx_index:6,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_ELLIPSE: {_hx_name:"DRAW_ELLIPSE",_hx_index:7,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_QUADS: {_hx_name:"DRAW_QUADS",_hx_index:8,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_RECT: {_hx_name:"DRAW_RECT",_hx_index:9,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_ROUND_RECT: {_hx_name:"DRAW_ROUND_RECT",_hx_index:10,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_TILES: {_hx_name:"DRAW_TILES",_hx_index:11,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,DRAW_TRIANGLES: {_hx_name:"DRAW_TRIANGLES",_hx_index:12,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,END_FILL: {_hx_name:"END_FILL",_hx_index:13,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,LINE_BITMAP_STYLE: {_hx_name:"LINE_BITMAP_STYLE",_hx_index:14,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,LINE_GRADIENT_STYLE: {_hx_name:"LINE_GRADIENT_STYLE",_hx_index:15,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,LINE_STYLE: {_hx_name:"LINE_STYLE",_hx_index:16,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,LINE_TO: {_hx_name:"LINE_TO",_hx_index:17,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,MOVE_TO: {_hx_name:"MOVE_TO",_hx_index:18,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,OVERRIDE_BLEND_MODE: {_hx_name:"OVERRIDE_BLEND_MODE",_hx_index:19,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,OVERRIDE_MATRIX: {_hx_name:"OVERRIDE_MATRIX",_hx_index:20,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,WINDING_EVEN_ODD: {_hx_name:"WINDING_EVEN_ODD",_hx_index:21,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,WINDING_NON_ZERO: {_hx_name:"WINDING_NON_ZERO",_hx_index:22,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:23,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} -}; -openfl_display__$internal_DrawCommandType.__constructs__ = [openfl_display__$internal_DrawCommandType.BEGIN_BITMAP_FILL,openfl_display__$internal_DrawCommandType.BEGIN_FILL,openfl_display__$internal_DrawCommandType.BEGIN_GRADIENT_FILL,openfl_display__$internal_DrawCommandType.BEGIN_SHADER_FILL,openfl_display__$internal_DrawCommandType.CUBIC_CURVE_TO,openfl_display__$internal_DrawCommandType.CURVE_TO,openfl_display__$internal_DrawCommandType.DRAW_CIRCLE,openfl_display__$internal_DrawCommandType.DRAW_ELLIPSE,openfl_display__$internal_DrawCommandType.DRAW_QUADS,openfl_display__$internal_DrawCommandType.DRAW_RECT,openfl_display__$internal_DrawCommandType.DRAW_ROUND_RECT,openfl_display__$internal_DrawCommandType.DRAW_TILES,openfl_display__$internal_DrawCommandType.DRAW_TRIANGLES,openfl_display__$internal_DrawCommandType.END_FILL,openfl_display__$internal_DrawCommandType.LINE_BITMAP_STYLE,openfl_display__$internal_DrawCommandType.LINE_GRADIENT_STYLE,openfl_display__$internal_DrawCommandType.LINE_STYLE,openfl_display__$internal_DrawCommandType.LINE_TO,openfl_display__$internal_DrawCommandType.MOVE_TO,openfl_display__$internal_DrawCommandType.OVERRIDE_BLEND_MODE,openfl_display__$internal_DrawCommandType.OVERRIDE_MATRIX,openfl_display__$internal_DrawCommandType.WINDING_EVEN_ODD,openfl_display__$internal_DrawCommandType.WINDING_NON_ZERO,openfl_display__$internal_DrawCommandType.UNKNOWN]; +var openfl_display__$internal_DrawCommandType = $hxEnums["openfl.display._internal.DrawCommandType"] = { __ename__ : "openfl.display._internal.DrawCommandType", __constructs__ : ["BEGIN_BITMAP_FILL","BEGIN_FILL","BEGIN_GRADIENT_FILL","BEGIN_SHADER_FILL","CUBIC_CURVE_TO","CURVE_TO","DRAW_CIRCLE","DRAW_ELLIPSE","DRAW_QUADS","DRAW_RECT","DRAW_ROUND_RECT","DRAW_TILES","DRAW_TRIANGLES","END_FILL","LINE_BITMAP_STYLE","LINE_GRADIENT_STYLE","LINE_STYLE","LINE_TO","MOVE_TO","OVERRIDE_BLEND_MODE","OVERRIDE_MATRIX","WINDING_EVEN_ODD","WINDING_NON_ZERO","UNKNOWN"] + ,BEGIN_BITMAP_FILL: {_hx_index:0,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,BEGIN_FILL: {_hx_index:1,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,BEGIN_GRADIENT_FILL: {_hx_index:2,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,BEGIN_SHADER_FILL: {_hx_index:3,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,CUBIC_CURVE_TO: {_hx_index:4,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,CURVE_TO: {_hx_index:5,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_CIRCLE: {_hx_index:6,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_ELLIPSE: {_hx_index:7,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_QUADS: {_hx_index:8,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_RECT: {_hx_index:9,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_ROUND_RECT: {_hx_index:10,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_TILES: {_hx_index:11,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,DRAW_TRIANGLES: {_hx_index:12,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,END_FILL: {_hx_index:13,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,LINE_BITMAP_STYLE: {_hx_index:14,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,LINE_GRADIENT_STYLE: {_hx_index:15,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,LINE_STYLE: {_hx_index:16,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,LINE_TO: {_hx_index:17,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,MOVE_TO: {_hx_index:18,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,OVERRIDE_BLEND_MODE: {_hx_index:19,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,OVERRIDE_MATRIX: {_hx_index:20,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,WINDING_EVEN_ODD: {_hx_index:21,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,WINDING_NON_ZERO: {_hx_index:22,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} + ,UNKNOWN: {_hx_index:23,__enum__:"openfl.display._internal.DrawCommandType",toString:$estr} +}; var openfl_display__$internal_FlashRenderer = function() { }; $hxClasses["openfl.display._internal.FlashRenderer"] = openfl_display__$internal_FlashRenderer; openfl_display__$internal_FlashRenderer.__name__ = "openfl.display._internal.FlashRenderer"; @@ -149696,11 +149323,10 @@ openfl_display3D__$internal__$AGALConverter_DestRegister.prototype = { } ,__class__: openfl_display3D__$internal__$AGALConverter_DestRegister }; -var openfl_display3D__$internal__$AGALConverter_ProgramType = $hxEnums["openfl.display3D._internal._AGALConverter.ProgramType"] = { __ename__:"openfl.display3D._internal._AGALConverter.ProgramType",__constructs__:null - ,VERTEX: {_hx_name:"VERTEX",_hx_index:0,__enum__:"openfl.display3D._internal._AGALConverter.ProgramType",toString:$estr} - ,FRAGMENT: {_hx_name:"FRAGMENT",_hx_index:1,__enum__:"openfl.display3D._internal._AGALConverter.ProgramType",toString:$estr} +var openfl_display3D__$internal__$AGALConverter_ProgramType = $hxEnums["openfl.display3D._internal._AGALConverter.ProgramType"] = { __ename__ : "openfl.display3D._internal._AGALConverter.ProgramType", __constructs__ : ["VERTEX","FRAGMENT"] + ,VERTEX: {_hx_index:0,__enum__:"openfl.display3D._internal._AGALConverter.ProgramType",toString:$estr} + ,FRAGMENT: {_hx_index:1,__enum__:"openfl.display3D._internal._AGALConverter.ProgramType",toString:$estr} }; -openfl_display3D__$internal__$AGALConverter_ProgramType.__constructs__ = [openfl_display3D__$internal__$AGALConverter_ProgramType.VERTEX,openfl_display3D__$internal__$AGALConverter_ProgramType.FRAGMENT]; var openfl_display3D__$internal_RegisterMap = function() { this.mEntries = []; }; @@ -149875,17 +149501,16 @@ openfl_display3D__$internal__$AGALConverter_RegisterMapEntry.prototype = { ,usage: null ,__class__: openfl_display3D__$internal__$AGALConverter_RegisterMapEntry }; -var openfl_display3D__$internal__$AGALConverter_RegisterUsage = $hxEnums["openfl.display3D._internal._AGALConverter.RegisterUsage"] = { __ename__:"openfl.display3D._internal._AGALConverter.RegisterUsage",__constructs__:null - ,UNUSED: {_hx_name:"UNUSED",_hx_index:0,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,VECTOR_4: {_hx_name:"VECTOR_4",_hx_index:1,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,MATRIX_4_4: {_hx_name:"MATRIX_4_4",_hx_index:2,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,SAMPLER_2D: {_hx_name:"SAMPLER_2D",_hx_index:3,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,SAMPLER_2D_ALPHA: {_hx_name:"SAMPLER_2D_ALPHA",_hx_index:4,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,SAMPLER_CUBE: {_hx_name:"SAMPLER_CUBE",_hx_index:5,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,SAMPLER_CUBE_ALPHA: {_hx_name:"SAMPLER_CUBE_ALPHA",_hx_index:6,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} - ,VECTOR_4_ARRAY: {_hx_name:"VECTOR_4_ARRAY",_hx_index:7,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} -}; -openfl_display3D__$internal__$AGALConverter_RegisterUsage.__constructs__ = [openfl_display3D__$internal__$AGALConverter_RegisterUsage.UNUSED,openfl_display3D__$internal__$AGALConverter_RegisterUsage.VECTOR_4,openfl_display3D__$internal__$AGALConverter_RegisterUsage.MATRIX_4_4,openfl_display3D__$internal__$AGALConverter_RegisterUsage.SAMPLER_2D,openfl_display3D__$internal__$AGALConverter_RegisterUsage.SAMPLER_2D_ALPHA,openfl_display3D__$internal__$AGALConverter_RegisterUsage.SAMPLER_CUBE,openfl_display3D__$internal__$AGALConverter_RegisterUsage.SAMPLER_CUBE_ALPHA,openfl_display3D__$internal__$AGALConverter_RegisterUsage.VECTOR_4_ARRAY]; +var openfl_display3D__$internal__$AGALConverter_RegisterUsage = $hxEnums["openfl.display3D._internal._AGALConverter.RegisterUsage"] = { __ename__ : "openfl.display3D._internal._AGALConverter.RegisterUsage", __constructs__ : ["UNUSED","VECTOR_4","MATRIX_4_4","SAMPLER_2D","SAMPLER_2D_ALPHA","SAMPLER_CUBE","SAMPLER_CUBE_ALPHA","VECTOR_4_ARRAY"] + ,UNUSED: {_hx_index:0,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,VECTOR_4: {_hx_index:1,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,MATRIX_4_4: {_hx_index:2,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,SAMPLER_2D: {_hx_index:3,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,SAMPLER_2D_ALPHA: {_hx_index:4,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,SAMPLER_CUBE: {_hx_index:5,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,SAMPLER_CUBE_ALPHA: {_hx_index:6,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} + ,VECTOR_4_ARRAY: {_hx_index:7,__enum__:"openfl.display3D._internal._AGALConverter.RegisterUsage",toString:$estr} +}; var openfl_display3D__$internal__$AGALConverter_SamplerRegister = function() { }; $hxClasses["openfl.display3D._internal._AGALConverter.SamplerRegister"] = openfl_display3D__$internal__$AGALConverter_SamplerRegister; @@ -154539,7 +154164,7 @@ openfl_net_FileReference.prototype = $extend(openfl_events_EventDispatcher.proto var saveFileDialog = new lime_ui_FileDialog(); saveFileDialog.onCancel.add($bind(this,this.saveFileDialog_onCancel)); saveFileDialog.onSave.add($bind(this,this.saveFileDialog_onSave)); - saveFileDialog.save(this.__data,defaultFileName != null ? haxe_io_Path.extension(defaultFileName) : null,defaultFileName); + saveFileDialog.save(openfl_utils_ByteArray.toBytes(this.__data),defaultFileName != null ? haxe_io_Path.extension(defaultFileName) : null,defaultFileName); } ,upload: function(request,uploadDataFieldName,testUpload) { if(testUpload == null) { @@ -154988,14 +154613,10 @@ openfl_net_SharedObject.__resolveClass = function(name) { return null; }; openfl_net_SharedObject.application_onExit = function(_) { - var h = openfl_net_SharedObject.__sharedObjects.h; - var sharedObject_h = h; - var sharedObject_keys = Object.keys(h); - var sharedObject_length = sharedObject_keys.length; - var sharedObject_current = 0; - while(sharedObject_current < sharedObject_length) { - var sharedObject = sharedObject_h[sharedObject_keys[sharedObject_current++]]; - sharedObject.flush(); + var sharedObject = haxe_ds_StringMap.valueIterator(openfl_net_SharedObject.__sharedObjects.h); + while(sharedObject.hasNext()) { + var sharedObject1 = sharedObject.next(); + sharedObject1.flush(); } }; openfl_net_SharedObject.__super__ = openfl_events_EventDispatcher; @@ -155977,14 +155598,10 @@ openfl_text_StyleSheet.prototype = $extend(openfl_events_EventDispatcher.prototy ,get_styleNames: function() { if(this.__styleNames == null || this.__styleNamesDirty) { this.__styleNames = []; - var h = this.__styles.h; - var style_h = h; - var style_keys = Object.keys(h); - var style_length = style_keys.length; - var style_current = 0; - while(style_current < style_length) { - var style = style_keys[style_current++]; - this.__styleNames.push(style); + var style = haxe_ds_StringMap.keysIterator(this.__styles.h); + while(style.hasNext()) { + var style1 = style.next(); + this.__styleNames.push(style1); } this.__styleNamesDirty = false; } @@ -156704,17 +156321,7 @@ openfl_text__$internal_HTMLParser.parse = function(value,multiline,styleSheet,te if(segments.length == 1) { value = StringTools.htmlUnescape(value.replace(openfl_text__$internal_HTMLParser.__regexHTMLTag.r,"")); if(textFormatRanges.get_length() > 1) { - var deleteCount = textFormatRanges.get_length() - 1; - var this1 = []; - textFormatRanges.__tempIndex = 1; - var _g_current = 0; - var _g_args = this1; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - textFormatRanges.insertAt(textFormatRanges.__tempIndex,item); - textFormatRanges.__tempIndex++; - } - textFormatRanges.splice(textFormatRanges.__tempIndex,deleteCount); + textFormatRanges.splice(1,textFormatRanges.get_length() - 1); } var range = textFormatRanges.get(0); range.format = textFormat; @@ -156722,18 +156329,9 @@ openfl_text__$internal_HTMLParser.parse = function(value,multiline,styleSheet,te range.end = value.length; return value; } else { - var deleteCount = textFormatRanges.get_length(); - var this1 = []; - textFormatRanges.__tempIndex = 0; - var _g_current = 0; - var _g_args = this1; - while(_g_current < _g_args.length) { - var item = _g_args[_g_current++]; - textFormatRanges.insertAt(textFormatRanges.__tempIndex,item); - textFormatRanges.__tempIndex++; - } - textFormatRanges.splice(textFormatRanges.__tempIndex,deleteCount); + textFormatRanges.splice(0,textFormatRanges.get_length()); value = ""; + var segment; var formatStack = [textFormat.clone()]; var tagStack = []; var sub; @@ -159733,37 +159331,28 @@ openfl_utils_AssetCache.prototype = { this.font = new haxe_ds_StringMap(); this.sound = new haxe_ds_StringMap(); } else { - var h = this.bitmapData.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(StringTools.startsWith(key,prefix)) { - this.removeBitmapData(key); + var keys = haxe_ds_StringMap.keysIterator(this.bitmapData.h); + var key = keys; + while(key.hasNext()) { + var key1 = key.next(); + if(StringTools.startsWith(key1,prefix)) { + this.removeBitmapData(key1); } } - var h = this.font.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(StringTools.startsWith(key,prefix)) { - this.removeFont(key); + var keys = haxe_ds_StringMap.keysIterator(this.font.h); + var key = keys; + while(key.hasNext()) { + var key1 = key.next(); + if(StringTools.startsWith(key1,prefix)) { + this.removeFont(key1); } } - var h = this.sound.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(StringTools.startsWith(key,prefix)) { - this.removeSound(key); + var keys = haxe_ds_StringMap.keysIterator(this.sound.h); + var key = keys; + while(key.hasNext()) { + var key1 = key.next(); + if(StringTools.startsWith(key1,prefix)) { + this.removeSound(key1); } } } @@ -159863,7 +159452,7 @@ openfl_utils_AssetLibrary.fromBundle = function(bundle) { } }; openfl_utils_AssetLibrary.fromBytes = function(bytes,rootPath) { - return openfl_utils_AssetLibrary.fromManifest(lime_utils_AssetManifest.fromBytes(openfl_utils_ByteArray.toLimeBytes(bytes),rootPath)); + return openfl_utils_AssetLibrary.fromManifest(lime_utils_AssetManifest.fromBytes(openfl_utils_ByteArray.toBytes(bytes),rootPath)); }; openfl_utils_AssetLibrary.fromFile = function(path,rootPath) { return openfl_utils_AssetLibrary.fromManifest(lime_utils_AssetManifest.fromFile(path,rootPath)); @@ -159883,7 +159472,7 @@ openfl_utils_AssetLibrary.fromManifest = function(manifest) { } }; openfl_utils_AssetLibrary.loadFromBytes = function(bytes,rootPath) { - return lime_utils_AssetManifest.loadFromBytes(openfl_utils_ByteArray.toLimeBytes(bytes),rootPath).then(function(manifest) { + return lime_utils_AssetManifest.loadFromBytes(openfl_utils_ByteArray.toBytes(bytes),rootPath).then(function(manifest) { return openfl_utils_AssetLibrary.loadFromManifest(manifest); }); }; @@ -160148,7 +159737,7 @@ openfl_utils_Assets.getBitmapData = function(id,useCache) { return null; }; openfl_utils_Assets.getBytes = function(id) { - return openfl_utils_ByteArray.fromLimeBytes(lime_utils_Assets.getBytes(id)); + return openfl_utils_ByteArray.fromBytes(lime_utils_Assets.getBytes(id)); }; openfl_utils_Assets.getFont = function(id,useCache) { if(useCache == null) { @@ -160315,7 +159904,7 @@ openfl_utils_Assets.loadBytes = function(id) { var promise = new lime_app_Promise(); var future = lime_utils_Assets.loadBytes(id); future.onComplete(function(bytes) { - promise.complete(openfl_utils_ByteArray.fromLimeBytes(bytes)); + promise.complete(openfl_utils_ByteArray.fromBytes(bytes)); }); future.onProgress(function(progress,total) { promise.progress(progress,total); @@ -160492,7 +160081,7 @@ openfl_utils_ByteArray.fromBytesData = function(bytesData) { return openfl_utils_ByteArrayData.fromBytes(haxe_io_Bytes.ofData(bytesData)); }; openfl_utils_ByteArray.fromFile = function(path) { - return openfl_utils_ByteArray.fromLimeBytes(lime_utils_Bytes.fromFile(path)); + return openfl_utils_ByteArray.fromBytes(lime_utils_Bytes.fromFile(path)); }; openfl_utils_ByteArray.fromLimeBytes = function(bytes) { return openfl_utils_ByteArray.fromBytes(bytes); @@ -160505,13 +160094,13 @@ openfl_utils_ByteArray.inflate = function(this1) { }; openfl_utils_ByteArray.loadFromBytes = function(bytes) { return lime_utils_Bytes.loadFromBytes(bytes).then(function(limeBytes) { - var byteArray = openfl_utils_ByteArray.fromLimeBytes(limeBytes); + var byteArray = openfl_utils_ByteArray.fromBytes(limeBytes); return lime_app_Future.withValue(byteArray); }); }; openfl_utils_ByteArray.loadFromFile = function(path) { return lime_utils_Bytes.loadFromFile(path).then(function(limeBytes) { - var byteArray = openfl_utils_ByteArray.fromLimeBytes(limeBytes); + var byteArray = openfl_utils_ByteArray.fromBytes(limeBytes); return lime_app_Future.withValue(byteArray); }); }; @@ -160813,10 +160402,10 @@ openfl_utils__$Dictionary_ClassMap.prototype = { return new haxe_iterators_MapKeyValueIterator(this); } ,keys: function() { - return new haxe_ds__$StringMap_StringMapValueIterator(this.types.h); + return haxe_ds_StringMap.valueIterator(this.types.h); } ,iterator: function() { - return new haxe_ds__$StringMap_StringMapValueIterator(this.values.h); + return haxe_ds_StringMap.valueIterator(this.values.h); } ,remove: function(key) { var name = key.__name__; @@ -161529,17 +161118,16 @@ openfl_utils__$internal_TouchData.prototype = { } ,__class__: openfl_utils__$internal_TouchData }; -var polymod_Framework = $hxEnums["polymod.Framework"] = { __ename__:"polymod.Framework",__constructs__:null - ,NME: {_hx_name:"NME",_hx_index:0,__enum__:"polymod.Framework",toString:$estr} - ,LIME: {_hx_name:"LIME",_hx_index:1,__enum__:"polymod.Framework",toString:$estr} - ,OPENFL: {_hx_name:"OPENFL",_hx_index:2,__enum__:"polymod.Framework",toString:$estr} - ,OPENFL_WITH_NODE: {_hx_name:"OPENFL_WITH_NODE",_hx_index:3,__enum__:"polymod.Framework",toString:$estr} - ,HEAPS: {_hx_name:"HEAPS",_hx_index:4,__enum__:"polymod.Framework",toString:$estr} - ,KHA: {_hx_name:"KHA",_hx_index:5,__enum__:"polymod.Framework",toString:$estr} - ,CUSTOM: {_hx_name:"CUSTOM",_hx_index:6,__enum__:"polymod.Framework",toString:$estr} - ,UNKNOWN: {_hx_name:"UNKNOWN",_hx_index:7,__enum__:"polymod.Framework",toString:$estr} -}; -polymod_Framework.__constructs__ = [polymod_Framework.NME,polymod_Framework.LIME,polymod_Framework.OPENFL,polymod_Framework.OPENFL_WITH_NODE,polymod_Framework.HEAPS,polymod_Framework.KHA,polymod_Framework.CUSTOM,polymod_Framework.UNKNOWN]; +var polymod_Framework = $hxEnums["polymod.Framework"] = { __ename__ : "polymod.Framework", __constructs__ : ["NME","LIME","OPENFL","OPENFL_WITH_NODE","HEAPS","KHA","CUSTOM","UNKNOWN"] + ,NME: {_hx_index:0,__enum__:"polymod.Framework",toString:$estr} + ,LIME: {_hx_index:1,__enum__:"polymod.Framework",toString:$estr} + ,OPENFL: {_hx_index:2,__enum__:"polymod.Framework",toString:$estr} + ,OPENFL_WITH_NODE: {_hx_index:3,__enum__:"polymod.Framework",toString:$estr} + ,HEAPS: {_hx_index:4,__enum__:"polymod.Framework",toString:$estr} + ,KHA: {_hx_index:5,__enum__:"polymod.Framework",toString:$estr} + ,CUSTOM: {_hx_index:6,__enum__:"polymod.Framework",toString:$estr} + ,UNKNOWN: {_hx_index:7,__enum__:"polymod.Framework",toString:$estr} +}; var polymod_Polymod = function() { }; $hxClasses["polymod.Polymod"] = polymod_Polymod; polymod_Polymod.__name__ = "polymod.Polymod"; @@ -161803,14 +161391,10 @@ polymod_ModMetadata.prototype = { json["license"] = this.license; json["license_ref"] = this.licenseRef; var meta = { }; - var h = this.metaData.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - meta[key] = this.metaData.h[key]; + var key = haxe_ds_StringMap.keysIterator(this.metaData.h); + while(key.hasNext()) { + var key1 = key.next(); + meta[key1] = this.metaData.h[key1]; } json["metadata"] = meta; return JSON.stringify(json,null," "); @@ -161832,12 +161416,11 @@ polymod_PolymodError.prototype = { ,origin: null ,__class__: polymod_PolymodError }; -var polymod_PolymodErrorType = $hxEnums["polymod.PolymodErrorType"] = { __ename__:"polymod.PolymodErrorType",__constructs__:null - ,NOTICE: {_hx_name:"NOTICE",_hx_index:0,__enum__:"polymod.PolymodErrorType",toString:$estr} - ,WARNING: {_hx_name:"WARNING",_hx_index:1,__enum__:"polymod.PolymodErrorType",toString:$estr} - ,ERROR: {_hx_name:"ERROR",_hx_index:2,__enum__:"polymod.PolymodErrorType",toString:$estr} +var polymod_PolymodErrorType = $hxEnums["polymod.PolymodErrorType"] = { __ename__ : "polymod.PolymodErrorType", __constructs__ : ["NOTICE","WARNING","ERROR"] + ,NOTICE: {_hx_index:0,__enum__:"polymod.PolymodErrorType",toString:$estr} + ,WARNING: {_hx_index:1,__enum__:"polymod.PolymodErrorType",toString:$estr} + ,ERROR: {_hx_index:2,__enum__:"polymod.PolymodErrorType",toString:$estr} }; -polymod_PolymodErrorType.__constructs__ = [polymod_PolymodErrorType.NOTICE,polymod_PolymodErrorType.WARNING,polymod_PolymodErrorType.ERROR]; var polymod_PolymodConfig = function() { }; $hxClasses["polymod.PolymodConfig"] = polymod_PolymodConfig; polymod_PolymodConfig.__name__ = "polymod.PolymodConfig"; @@ -161990,30 +161573,22 @@ polymod_backends_LimeBackend.getDefaultAssetLibraries = function() { if(polymod_backends_LimeBackend.defaultAssetLibraries == null) { polymod_backends_LimeBackend.defaultAssetLibraries = new haxe_ds_StringMap(); var libraries = lime_utils_Assets.libraries; - var h = libraries.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(libraries.h); + while(key.hasNext()) { + var key1 = key.next(); var this1 = polymod_backends_LimeBackend.defaultAssetLibraries; - var value = lime_utils_Assets.getLibrary(key); - this1.h[key] = value; + var value = lime_utils_Assets.getLibrary(key1); + this1.h[key1] = value; } } return polymod_backends_LimeBackend.defaultAssetLibraries; }; polymod_backends_LimeBackend.restoreDefaultAssetLibraries = function() { if(polymod_backends_LimeBackend.defaultAssetLibraries != null) { - var h = polymod_backends_LimeBackend.defaultAssetLibraries.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - lime_utils_Assets.registerLibrary(key,polymod_backends_LimeBackend.defaultAssetLibraries.h[key]); + var key = haxe_ds_StringMap.keysIterator(polymod_backends_LimeBackend.defaultAssetLibraries.h); + while(key.hasNext()) { + var key1 = key.next(); + lime_utils_Assets.registerLibrary(key1,polymod_backends_LimeBackend.defaultAssetLibraries.h[key1]); } } }; @@ -162024,14 +161599,10 @@ polymod_backends_LimeBackend.prototype = { var defaultLibraries = polymod_backends_LimeBackend.getDefaultAssetLibraries(); this.modLibraries = new haxe_ds_StringMap(); var hasMoreThanDefault = false; - var h = defaultLibraries.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - if(key != "default") { + var key = haxe_ds_StringMap.keysIterator(defaultLibraries.h); + while(key.hasNext()) { + var key1 = key.next(); + if(key1 != "default") { hasMoreThanDefault = true; break; } @@ -162040,36 +161611,28 @@ polymod_backends_LimeBackend.prototype = { polymod_Polymod.error("lime_missing_asset_library_info","Your Lime/OpenFL configuration is using custom asset libraries, but you have not provided any frameworkParams in Polymod.init() that tells Polymod which asset libraries to expect and what their mod sub-directory prefixes should be.","init"); return false; } - var h = defaultLibraries.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(defaultLibraries.h); + while(key.hasNext()) { + var key1 = key.next(); var pathPrefix = ""; if(hasMoreThanDefault) { - if(!Object.prototype.hasOwnProperty.call(params.assetLibraryPaths.h,key) && key != "default") { - polymod_Polymod.error("lime_missing_asset_library_reference","Your Lime/OpenFL configuration is using custom asset libraries, and you provided frameworkParams in Polymod.init(), but we couldn't find a match for this asset library: (" + key + ")","init"); + if(!Object.prototype.hasOwnProperty.call(params.assetLibraryPaths.h,key1) && key1 != "default") { + polymod_Polymod.error("lime_missing_asset_library_reference","Your Lime/OpenFL configuration is using custom asset libraries, and you provided frameworkParams in Polymod.init(), but we couldn't find a match for this asset library: (" + key1 + ")","init"); return false; - } else if(key == "default") { + } else if(key1 == "default") { pathPrefix = ""; } else { - pathPrefix = params.assetLibraryPaths.h[key]; + pathPrefix = params.assetLibraryPaths.h[key1]; } } - var fallbackLibrary = defaultLibraries.h[key]; + var fallbackLibrary = defaultLibraries.h[key1]; var modLibrary = this.getModLibrary(fallbackLibrary,pathPrefix); - this.modLibraries.h[key] = modLibrary; + this.modLibraries.h[key1] = modLibrary; } - var h = this.modLibraries.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - lime_utils_Assets.registerLibrary(key,this.modLibraries.h[key]); + var key = haxe_ds_StringMap.keysIterator(this.modLibraries.h); + while(key.hasNext()) { + var key1 = key.next(); + lime_utils_Assets.registerLibrary(key1,this.modLibraries.h[key1]); } return true; } @@ -162079,18 +161642,14 @@ polymod_backends_LimeBackend.prototype = { ,destroy: function() { this.polymodLibrary = null; polymod_backends_LimeBackend.restoreDefaultAssetLibraries(); - var h = this.modLibraries.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; - var modLibrary = this.modLibraries.h[key]; + var key = haxe_ds_StringMap.keysIterator(this.modLibraries.h); + while(key.hasNext()) { + var key1 = key.next(); + var modLibrary = this.modLibraries.h[key1]; modLibrary.destroy(); var _this = this.modLibraries; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } this.modLibraries = null; @@ -162197,53 +161756,37 @@ polymod_backends_LimeBackend.prototype = { } ,list: function(type) { var arr = []; - var h = this.modLibraries.h; - var modLibrary_h = h; - var modLibrary_keys = Object.keys(h); - var modLibrary_length = modLibrary_keys.length; - var modLibrary_current = 0; - while(modLibrary_current < modLibrary_length) { - var modLibrary = modLibrary_h[modLibrary_keys[modLibrary_current++]]; - arr = arr.concat(modLibrary.list(type == null ? null : polymod_backends_LimeModLibrary.PolyToLime(type))); + var modLibrary = haxe_ds_StringMap.valueIterator(this.modLibraries.h); + while(modLibrary.hasNext()) { + var modLibrary1 = modLibrary.next(); + arr = arr.concat(modLibrary1.list(type == null ? null : polymod_backends_LimeModLibrary.PolyToLime(type))); } return arr; } ,clearCache: function() { if(polymod_backends_LimeBackend.defaultAssetLibraries != null) { - var h = lime_utils_Assets.cache.audio.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(lime_utils_Assets.cache.audio.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = lime_utils_Assets.cache.audio; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } - var h = lime_utils_Assets.cache.font.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(lime_utils_Assets.cache.font.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = lime_utils_Assets.cache.font; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } - var h = lime_utils_Assets.cache.image.h; - var key_h = h; - var key_keys = Object.keys(h); - var key_length = key_keys.length; - var key_current = 0; - while(key_current < key_length) { - var key = key_keys[key_current++]; + var key = haxe_ds_StringMap.keysIterator(lime_utils_Assets.cache.image.h); + while(key.hasNext()) { + var key1 = key.next(); var _this = lime_utils_Assets.cache.image; - if(Object.prototype.hasOwnProperty.call(_this.h,key)) { - delete(_this.h[key]); + if(Object.prototype.hasOwnProperty.call(_this.h,key1)) { + delete(_this.h[key1]); } } } @@ -162654,18 +162197,14 @@ polymod_backends_LimeModLibrary.prototype = $extend(lime_utils_AssetLibrary.prot var otherList = this.hasFallback ? this.fallback.list(type) : []; var requestedType = type != null ? js_Boot.__cast(type , String) : null; var items = []; - var h = this.p.type.h; - var id_h = h; - var id_keys = Object.keys(h); - var id_length = id_keys.length; - var id_current = 0; - while(id_current < id_length) { - var id = id_keys[id_current++]; - if(id.indexOf(polymod_PolymodConfig.get_appendFolder()) == 0 || id.indexOf(polymod_PolymodConfig.get_mergeFolder()) == 0) { + var id = haxe_ds_StringMap.keysIterator(this.p.type.h); + while(id.hasNext()) { + var id1 = id.next(); + if(id1.indexOf(polymod_PolymodConfig.get_appendFolder()) == 0 || id1.indexOf(polymod_PolymodConfig.get_mergeFolder()) == 0) { continue; } - if(requestedType == null || this.exists(id,requestedType)) { - items.push(id); + if(requestedType == null || this.exists(id1,requestedType)) { + items.push(id1); } } var _g = 0; @@ -162816,18 +162355,14 @@ polymod_backends_PolymodAssetLibrary.prototype = { } ,listModFiles: function(type) { var items = []; - var h = this.type.h; - var id_h = h; - var id_keys = Object.keys(h); - var id_length = id_keys.length; - var id_current = 0; - while(id_current < id_length) { - var id = id_keys[id_current++]; - if(id.indexOf("_append") == 0 || id.indexOf("_merge") == 0) { + var id = haxe_ds_StringMap.keysIterator(this.type.h); + while(id.hasNext()) { + var id1 = id.next(); + if(id1.indexOf("_append") == 0 || id1.indexOf("_merge") == 0) { continue; } - if(type == null || type == "BYTES" || this.check(id,type)) { - items.push(id); + if(type == null || type == "BYTES" || this.check(id1,type)) { + items.push(id1); } } return items; @@ -164173,22 +163708,20 @@ polymod_format_PlainTextParseFormat.prototype = { } ,__class__: polymod_format_PlainTextParseFormat }; -var polymod_format_TextFileFormat = $hxEnums["polymod.format.TextFileFormat"] = { __ename__:"polymod.format.TextFileFormat",__constructs__:null - ,PLAINTEXT: {_hx_name:"PLAINTEXT",_hx_index:0,__enum__:"polymod.format.TextFileFormat",toString:$estr} - ,LINES: {_hx_name:"LINES",_hx_index:1,__enum__:"polymod.format.TextFileFormat",toString:$estr} - ,CSV: {_hx_name:"CSV",_hx_index:2,__enum__:"polymod.format.TextFileFormat",toString:$estr} - ,TSV: {_hx_name:"TSV",_hx_index:3,__enum__:"polymod.format.TextFileFormat",toString:$estr} - ,XML: {_hx_name:"XML",_hx_index:4,__enum__:"polymod.format.TextFileFormat",toString:$estr} - ,JSON: {_hx_name:"JSON",_hx_index:5,__enum__:"polymod.format.TextFileFormat",toString:$estr} -}; -polymod_format_TextFileFormat.__constructs__ = [polymod_format_TextFileFormat.PLAINTEXT,polymod_format_TextFileFormat.LINES,polymod_format_TextFileFormat.CSV,polymod_format_TextFileFormat.TSV,polymod_format_TextFileFormat.XML,polymod_format_TextFileFormat.JSON]; -var polymod_format_EndLineType = $hxEnums["polymod.format.EndLineType"] = { __ename__:"polymod.format.EndLineType",__constructs__:null - ,LF: {_hx_name:"LF",_hx_index:0,__enum__:"polymod.format.EndLineType",toString:$estr} - ,CR: {_hx_name:"CR",_hx_index:1,__enum__:"polymod.format.EndLineType",toString:$estr} - ,CRLF: {_hx_name:"CRLF",_hx_index:2,__enum__:"polymod.format.EndLineType",toString:$estr} - ,ANY: {_hx_name:"ANY",_hx_index:3,__enum__:"polymod.format.EndLineType",toString:$estr} -}; -polymod_format_EndLineType.__constructs__ = [polymod_format_EndLineType.LF,polymod_format_EndLineType.CR,polymod_format_EndLineType.CRLF,polymod_format_EndLineType.ANY]; +var polymod_format_TextFileFormat = $hxEnums["polymod.format.TextFileFormat"] = { __ename__ : "polymod.format.TextFileFormat", __constructs__ : ["PLAINTEXT","LINES","CSV","TSV","XML","JSON"] + ,PLAINTEXT: {_hx_index:0,__enum__:"polymod.format.TextFileFormat",toString:$estr} + ,LINES: {_hx_index:1,__enum__:"polymod.format.TextFileFormat",toString:$estr} + ,CSV: {_hx_index:2,__enum__:"polymod.format.TextFileFormat",toString:$estr} + ,TSV: {_hx_index:3,__enum__:"polymod.format.TextFileFormat",toString:$estr} + ,XML: {_hx_index:4,__enum__:"polymod.format.TextFileFormat",toString:$estr} + ,JSON: {_hx_index:5,__enum__:"polymod.format.TextFileFormat",toString:$estr} +}; +var polymod_format_EndLineType = $hxEnums["polymod.format.EndLineType"] = { __ename__ : "polymod.format.EndLineType", __constructs__ : ["LF","CR","CRLF","ANY"] + ,LF: {_hx_index:0,__enum__:"polymod.format.EndLineType",toString:$estr} + ,CR: {_hx_index:1,__enum__:"polymod.format.EndLineType",toString:$estr} + ,CRLF: {_hx_index:2,__enum__:"polymod.format.EndLineType",toString:$estr} + ,ANY: {_hx_index:3,__enum__:"polymod.format.EndLineType",toString:$estr} +}; var polymod_format_TSV = function() { polymod_format_CSV.call(this); }; @@ -164776,16 +164309,12 @@ polymod_format_XMLMerge.mergeMapsDestructively = function(a,b) { if(b == null) { return a; } - var h = b.h; - var bkey_h = h; - var bkey_keys = Object.keys(h); - var bkey_length = bkey_keys.length; - var bkey_current = 0; - while(bkey_current < bkey_length) { - var bkey = bkey_keys[bkey_current++]; - if(Object.prototype.hasOwnProperty.call(a.h,bkey)) { - var aArr = a.h[bkey]; - var bArr = b.h[bkey]; + var bkey = haxe_ds_StringMap.keysIterator(b.h); + while(bkey.hasNext()) { + var bkey1 = bkey.next(); + if(Object.prototype.hasOwnProperty.call(a.h,bkey1)) { + var aArr = a.h[bkey1]; + var bArr = b.h[bkey1]; var _g = 0; while(_g < bArr.length) { var bVal = bArr[_g]; @@ -164793,10 +164322,10 @@ polymod_format_XMLMerge.mergeMapsDestructively = function(a,b) { aArr.push(bVal); } } else { - var bArr1 = b.h[bkey]; - a.h[bkey] = bArr1; - if(Object.prototype.hasOwnProperty.call(b.h,bkey)) { - delete(b.h[bkey]); + var bArr1 = b.h[bkey1]; + a.h[bkey1] = bArr1; + if(Object.prototype.hasOwnProperty.call(b.h,bkey1)) { + delete(b.h[bkey1]); } } } @@ -165584,8 +165113,8 @@ if(console.log == null) { console.log = function() { }; } -openfl_display__$internal_CanvasGraphics.hitTestCanvas = js_Browser.get_supported() ? window.document.createElement("canvas") : null; -openfl_display__$internal_CanvasGraphics.hitTestContext = js_Browser.get_supported() ? openfl_display__$internal_CanvasGraphics.hitTestCanvas.getContext("2d") : null; +openfl_display__$internal_CanvasGraphics.hitTestCanvas = typeof(window) != "undefined" ? window.document.createElement("canvas") : null; +openfl_display__$internal_CanvasGraphics.hitTestContext = typeof(window) != "undefined" ? openfl_display__$internal_CanvasGraphics.hitTestCanvas.getContext("2d") : null; openfl_ui_Multitouch.maxTouchPoints = 2; openfl_ui_Multitouch.supportedGestures = null; openfl_ui_Multitouch.supportsGestureEvents = false; @@ -168562,7 +168091,7 @@ openfl_display_LineScaleMode.NORMAL = 2; openfl_display_LineScaleMode.VERTICAL = 3; openfl_display_Loader.__meta__ = { fields : { BitmapData_onError : { SuppressWarnings : ["checkstyle:Dynamic"]}}}; openfl_display_LoaderInfo.__meta__ = { statics : { create : { SuppressWarnings : ["checkstyle:FieldDocComment"]}}, fields : { parameters : { SuppressWarnings : ["checkstyle:Dynamic"]}}}; -openfl_display_LoaderInfo.__rootURL = js_Browser.get_supported() ? window.document.URL : ""; +openfl_display_LoaderInfo.__rootURL = typeof(window) != "undefined" ? window.document.URL : ""; openfl_display_OpenGLRenderer.__meta__ = { fields : { gl : { SuppressWarnings : ["checkstyle:Dynamic"]}, __gl : { SuppressWarnings : ["checkstyle:Dynamic"]}, __matrix : { SuppressWarnings : ["checkstyle:Dynamic"]}, __projection : { SuppressWarnings : ["checkstyle:Dynamic"]}, __projectionFlipped : { SuppressWarnings : ["checkstyle:Dynamic"]}, getMatrix : { SuppressWarnings : ["checkstyle:Dynamic"]}}}; openfl_display_OpenGLRenderer.__alphaValue = [1]; openfl_display_OpenGLRenderer.__colorMultipliersValue = [0,0,0,0]; diff --git a/assets/music/freakyMenu.mp3 b/assets/music/freakyMenu.mp3 index e149430..b7e8d5b 100644 Binary files a/assets/music/freakyMenu.mp3 and b/assets/music/freakyMenu.mp3 differ diff --git a/assets/shared/sounds/CLAP.mp3 b/assets/shared/sounds/CLAP.mp3 index 7b25291..4fe8979 100644 Binary files a/assets/shared/sounds/CLAP.mp3 and b/assets/shared/sounds/CLAP.mp3 differ diff --git a/assets/shared/sounds/SNAP.mp3 b/assets/shared/sounds/SNAP.mp3 index f22e35a..6a33ed9 100644 Binary files a/assets/shared/sounds/SNAP.mp3 and b/assets/shared/sounds/SNAP.mp3 differ diff --git a/assets/shared/sounds/bf.mp3 b/assets/shared/sounds/bf.mp3 index d04be72..e2c6aa1 100644 Binary files a/assets/shared/sounds/bf.mp3 and b/assets/shared/sounds/bf.mp3 differ diff --git a/assets/shared/sounds/blaster_shoot.mp3 b/assets/shared/sounds/blaster_shoot.mp3 index 832e417..5aadef5 100644 Binary files a/assets/shared/sounds/blaster_shoot.mp3 and b/assets/shared/sounds/blaster_shoot.mp3 differ diff --git a/assets/shared/sounds/bone.mp3 b/assets/shared/sounds/bone.mp3 index 75456ba..c4e1f07 100644 Binary files a/assets/shared/sounds/bone.mp3 and b/assets/shared/sounds/bone.mp3 differ diff --git a/assets/shared/sounds/cameraFlip.mp3 b/assets/shared/sounds/cameraFlip.mp3 index 9abfa98..bf36b52 100644 Binary files a/assets/shared/sounds/cameraFlip.mp3 and b/assets/shared/sounds/cameraFlip.mp3 differ diff --git a/assets/shared/sounds/clickText.mp3 b/assets/shared/sounds/clickText.mp3 index dceebf7..05ad896 100644 Binary files a/assets/shared/sounds/clickText.mp3 and b/assets/shared/sounds/clickText.mp3 differ diff --git a/assets/shared/sounds/dust.mp3 b/assets/shared/sounds/dust.mp3 index 55cfd64..8db85fd 100644 Binary files a/assets/shared/sounds/dust.mp3 and b/assets/shared/sounds/dust.mp3 differ diff --git a/assets/shared/sounds/slash_effect.mp3 b/assets/shared/sounds/slash_effect.mp3 index 70534db..ec97e40 100644 Binary files a/assets/shared/sounds/slash_effect.mp3 and b/assets/shared/sounds/slash_effect.mp3 differ diff --git a/assets/shared/sounds/voice_sans.mp3 b/assets/shared/sounds/voice_sans.mp3 index 7e3d248..41cd583 100644 Binary files a/assets/shared/sounds/voice_sans.mp3 and b/assets/shared/sounds/voice_sans.mp3 differ diff --git a/assets/shared/sounds/warning.mp3 b/assets/shared/sounds/warning.mp3 index 8bc251c..c1ec307 100644 Binary files a/assets/shared/sounds/warning.mp3 and b/assets/shared/sounds/warning.mp3 differ diff --git a/assets/songs/anthropophobia/Inst.mp3 b/assets/songs/anthropophobia/Inst.mp3 index f50bf11..de0bacf 100644 Binary files a/assets/songs/anthropophobia/Inst.mp3 and b/assets/songs/anthropophobia/Inst.mp3 differ diff --git a/assets/songs/anthropophobia/Voices.mp3 b/assets/songs/anthropophobia/Voices.mp3 index f48d3f6..ebdcbed 100644 Binary files a/assets/songs/anthropophobia/Voices.mp3 and b/assets/songs/anthropophobia/Voices.mp3 differ diff --git a/assets/songs/cringe/Inst.mp3 b/assets/songs/cringe/Inst.mp3 index bc1a82b..816c809 100644 Binary files a/assets/songs/cringe/Inst.mp3 and b/assets/songs/cringe/Inst.mp3 differ diff --git a/assets/songs/d.i.e/Inst.mp3 b/assets/songs/d.i.e/Inst.mp3 index 7cb98df..522a002 100644 Binary files a/assets/songs/d.i.e/Inst.mp3 and b/assets/songs/d.i.e/Inst.mp3 differ diff --git a/assets/songs/d.i.e/Voices.mp3 b/assets/songs/d.i.e/Voices.mp3 index 161177e..f3b6581 100644 Binary files a/assets/songs/d.i.e/Voices.mp3 and b/assets/songs/d.i.e/Voices.mp3 differ diff --git a/assets/songs/drowning/Inst.mp3 b/assets/songs/drowning/Inst.mp3 index 4a4d64f..bcd8796 100644 Binary files a/assets/songs/drowning/Inst.mp3 and b/assets/songs/drowning/Inst.mp3 differ diff --git a/assets/songs/drowning/Voices.mp3 b/assets/songs/drowning/Voices.mp3 index bdc829f..45d8e02 100644 Binary files a/assets/songs/drowning/Voices.mp3 and b/assets/songs/drowning/Voices.mp3 differ diff --git a/assets/songs/hallucinations/Inst.mp3 b/assets/songs/hallucinations/Inst.mp3 index 6081363..121f2af 100644 Binary files a/assets/songs/hallucinations/Inst.mp3 and b/assets/songs/hallucinations/Inst.mp3 differ diff --git a/assets/songs/hallucinations/Voices.mp3 b/assets/songs/hallucinations/Voices.mp3 index 7c48fc2..0992ffa 100644 Binary files a/assets/songs/hallucinations/Voices.mp3 and b/assets/songs/hallucinations/Voices.mp3 differ diff --git a/assets/songs/last-hope/Inst.mp3 b/assets/songs/last-hope/Inst.mp3 index 364f56f..93b21e5 100644 Binary files a/assets/songs/last-hope/Inst.mp3 and b/assets/songs/last-hope/Inst.mp3 differ diff --git a/assets/songs/last-hope/Voices.mp3 b/assets/songs/last-hope/Voices.mp3 index 7c0b4dc..ff08e9f 100644 Binary files a/assets/songs/last-hope/Voices.mp3 and b/assets/songs/last-hope/Voices.mp3 differ diff --git a/assets/songs/psychotic-breakdown/Inst.mp3 b/assets/songs/psychotic-breakdown/Inst.mp3 index b07dcc1..e5202c9 100644 Binary files a/assets/songs/psychotic-breakdown/Inst.mp3 and b/assets/songs/psychotic-breakdown/Inst.mp3 differ diff --git a/assets/songs/psychotic-breakdown/Voices.mp3 b/assets/songs/psychotic-breakdown/Voices.mp3 index ec54a6b..c730c42 100644 Binary files a/assets/songs/psychotic-breakdown/Voices.mp3 and b/assets/songs/psychotic-breakdown/Voices.mp3 differ diff --git a/assets/songs/reality-check/Inst.mp3 b/assets/songs/reality-check/Inst.mp3 index 865b1e8..c7f83e2 100644 Binary files a/assets/songs/reality-check/Inst.mp3 and b/assets/songs/reality-check/Inst.mp3 differ diff --git a/assets/songs/reality-check/Voices.mp3 b/assets/songs/reality-check/Voices.mp3 index 935ded4..e7ab1ef 100644 Binary files a/assets/songs/reality-check/Voices.mp3 and b/assets/songs/reality-check/Voices.mp3 differ diff --git a/assets/songs/red-megalovania/Inst.mp3 b/assets/songs/red-megalovania/Inst.mp3 index a168161..4add39d 100644 Binary files a/assets/songs/red-megalovania/Inst.mp3 and b/assets/songs/red-megalovania/Inst.mp3 differ diff --git a/assets/songs/red-megalovania/Voices.mp3 b/assets/songs/red-megalovania/Voices.mp3 index afbe259..4650168 100644 Binary files a/assets/songs/red-megalovania/Voices.mp3 and b/assets/songs/red-megalovania/Voices.mp3 differ diff --git a/assets/songs/the-murderer/Inst.mp3 b/assets/songs/the-murderer/Inst.mp3 index 58c8906..d5ae27f 100644 Binary files a/assets/songs/the-murderer/Inst.mp3 and b/assets/songs/the-murderer/Inst.mp3 differ diff --git a/assets/songs/the-murderer/Voices.mp3 b/assets/songs/the-murderer/Voices.mp3 index 08b333e..7429eb0 100644 Binary files a/assets/songs/the-murderer/Voices.mp3 and b/assets/songs/the-murderer/Voices.mp3 differ diff --git a/assets/songs/wounded-shooting/Inst.mp3 b/assets/songs/wounded-shooting/Inst.mp3 index 5e2acf8..9a17222 100644 Binary files a/assets/songs/wounded-shooting/Inst.mp3 and b/assets/songs/wounded-shooting/Inst.mp3 differ diff --git a/assets/songs/wounded-shooting/Voices.mp3 b/assets/songs/wounded-shooting/Voices.mp3 index 7651ca3..5009c99 100644 Binary files a/assets/songs/wounded-shooting/Voices.mp3 and b/assets/songs/wounded-shooting/Voices.mp3 differ