Merge pull request #4 from LuaxY/master2

Dofus Beta 2.18.2.82009.1

Author: vendethiel

Dofus.as

@@ -128,14 +128,14 @@ package
             clientDimentionSo = CustomSharedObject.getLocal("clientData");
             osId = Capabilities.os.substr(0,3);
             sizeInitialised = false;
-            if(!(clientDimentionSo.data == null) && clientDimentionSo.data.width > 0 && clientDimentionSo.data.height > 0)
+            if((!(clientDimentionSo.data == null)) && (clientDimentionSo.data.width > 0) && (clientDimentionSo.data.height > 0))
             {
-               if(clientDimentionSo.data.displayState == NativeWindowDisplayState.MAXIMIZED && osId == "Win" && !(stage.displayState == StageDisplayState["FULL_SCREEN_INTERACTIVE"]))
+               if((clientDimentionSo.data.displayState == NativeWindowDisplayState.MAXIMIZED) && (osId == "Win") && (!(stage.displayState == StageDisplayState["FULL_SCREEN_INTERACTIVE"])))
                {
                   stage.nativeWindow.maximize();
                   this._displayState = NativeWindowDisplayState.MAXIMIZED;
                }
-               if(clientDimentionSo.data.width > 0 && clientDimentionSo.data.height > 0)
+               if((clientDimentionSo.data.width > 0) && (clientDimentionSo.data.height > 0))
                {
                   mainWindow.width = clientDimentionSo.data.width;
                   mainWindow.height = clientDimentionSo.data.height;
@@ -197,6 +197,7 @@ package
             }
             catch(e:Error)
             {
+               trace("Erreur sur la gestion du multicompte :\n" + e.getStackTrace());
             }
          }
          if(AirScanner.hasAir())
@@ -243,7 +244,7 @@ package
 
       public var REG_LOCAL_CONNECTION_ID:uint = 0;
 
-      private function onCall(param1:InvokeEvent) : void {
+      private function onCall(e:InvokeEvent) : void {
          var file:File = null;
          var stream:FileStream = null;
          var content:String = null;
@@ -254,7 +255,6 @@ package
          var versionSplitted:Array = null;
          var version:String = null;
          var part:ContentPart = null;
-         var e:InvokeEvent = param1;
          if(!this._initialized)
          {
             CommandLineArguments.getInstance().setArguments(e.arguments);
@@ -279,7 +279,7 @@ package
                      part.id = configNode.attributes["name"];
                      part.state = version?PartStateEnum.PART_UP_TO_DATE:PartStateEnum.PART_NOT_INSTALLED;
                      PartManager.getInstance().updatePart(part);
-                     if((version) && (upperVersion == null) || version > upperVersion)
+                     if((version) && (upperVersion == null) || (version > upperVersion))
                      {
                         upperVersion = version;
                      }
@@ -333,9 +333,11 @@ package
             }
             catch(e:Error)
             {
+               trace(e.toString());
                BuildInfos.BUILD_VERSION.revision = BuildInfos.BUILD_REVISION;
                BuildInfos.BUILD_VERSION.patch = BuildInfos.BUILD_PATCH;
             }
+            trace("Version : " + BuildInfos.BUILD_VERSION.major + "." + BuildInfos.BUILD_VERSION.minor + "." + BuildInfos.BUILD_VERSION.release + "." + BuildInfos.BUILD_REVISION + "." + BuildInfos.BUILD_PATCH);
             if(BuildInfos.BUILD_TYPE < BuildTypeEnum.INTERNAL)
             {
                Uri.enableSecureURI();
@@ -367,7 +369,7 @@ package
          }
       }
 
-      private function onResize(param1:NativeWindowBoundsEvent) : void {
+      private function onResize(e:NativeWindowBoundsEvent) : void {
          this._displayState = stage.nativeWindow.displayState;
          if(this._displayState != NativeWindowDisplayState.MAXIMIZED)
          {
@@ -396,37 +398,37 @@ package
          return this._forcedLang;
       }
 
-      public function setDisplayOptions(param1:DofusOptions) : void {
-         this._doOptions = param1;
+      public function setDisplayOptions(opt:DofusOptions) : void {
+         this._doOptions = opt;
          this._doOptions.addEventListener(PropertyChangeEvent.PROPERTY_CHANGED,this.onOptionChange);
          this._doOptions.flashQuality = this._doOptions.flashQuality;
          this._doOptions.fullScreen = this._doOptions.fullScreen;
       }
 
-      public function init(param1:DisplayObject, param2:uint=0, param3:String=null, param4:Array=null) : void {
-         if(param4)
+      public function init(rootClip:DisplayObject, instanceId:uint=0, forcedLang:String=null, args:Array=null) : void {
+         if(args)
          {
-            CommandLineArguments.getInstance().setArguments(param4);
+            CommandLineArguments.getInstance().setArguments(args);
          }
-         this._instanceId = param2;
-         this._forcedLang = param3;
-         var _loc5_:Sprite = new Sprite();
-         _loc5_.name = "catchMouseEventCtr";
-         _loc5_.graphics.beginFill(0);
-         _loc5_.graphics.drawRect(0,0,StageShareManager.startWidth,StageShareManager.startHeight);
-         _loc5_.graphics.endFill();
-         addChild(_loc5_);
-         var _loc6_:CustomSharedObject = CustomSharedObject.getLocal("appVersion");
-         if(!_loc6_.data.lastBuildVersion || !(_loc6_.data.lastBuildVersion == BuildInfos.BUILD_REVISION) && BuildInfos.BUILD_TYPE < BuildTypeEnum.INTERNAL)
+         this._instanceId = instanceId;
+         this._forcedLang = forcedLang;
+         var catchMouseEventCtr:Sprite = new Sprite();
+         catchMouseEventCtr.name = "catchMouseEventCtr";
+         catchMouseEventCtr.graphics.beginFill(0);
+         catchMouseEventCtr.graphics.drawRect(0,0,StageShareManager.startWidth,StageShareManager.startHeight);
+         catchMouseEventCtr.graphics.endFill();
+         addChild(catchMouseEventCtr);
+         var so:CustomSharedObject = CustomSharedObject.getLocal("appVersion");
+         if((!so.data.lastBuildVersion) || (!(so.data.lastBuildVersion == BuildInfos.BUILD_REVISION)) && (BuildInfos.BUILD_TYPE < BuildTypeEnum.INTERNAL))
          {
             this.clearCache(true);
          }
-         _loc6_ = CustomSharedObject.getLocal("appVersion");
-         _loc6_.data.lastBuildVersion = BuildInfos.BUILD_REVISION;
-         _loc6_.flush();
-         _loc6_.close();
+         so = CustomSharedObject.getLocal("appVersion");
+         so.data.lastBuildVersion = BuildInfos.BUILD_REVISION;
+         so.flush();
+         so.close();
          SignedFileAdapter.defaultSignatureKey = SignatureKey.fromByte(new Constants.SIGNATURE_KEY_DATA() as ByteArray);
-         this.initKernel(this.stage,param1);
+         this.initKernel(this.stage,rootClip);
          this.initWorld();
          this.initUi();
          if(BuildInfos.BUILD_TYPE > BuildTypeEnum.ALPHA)
@@ -443,18 +445,18 @@ package
          Atouin.getInstance().addListener(SoundManager.getInstance().manager);
       }
 
-      private function onExiting(param1:Event) : void {
+      private function onExiting(pEvt:Event) : void {
          this.saveClientSize();
          if(WebServiceDataHandler.getInstance().quit())
          {
-            param1.preventDefault();
-            param1.stopPropagation();
+            pEvt.preventDefault();
+            pEvt.stopPropagation();
             WebServiceDataHandler.getInstance().addEventListener(WebServiceDataHandler.ALL_DATA_SENT,this.quitHandler);
          }
       }
 
-      public function quit(param1:int=0) : void {
-         this._returnCode = param1;
+      public function quit(returnCode:int=0) : void {
+         this._returnCode = returnCode;
          if(!WebServiceDataHandler.getInstance().quit())
          {
             this.quitHandler();
@@ -467,10 +469,10 @@ package
          }
       }
 
-      private function quitHandler(param1:Event=null) : void {
-         if(param1 != null)
+      private function quitHandler(pEvt:Event=null) : void {
+         if(pEvt != null)
          {
-            param1.currentTarget.removeEventListener(WebServiceDataHandler.ALL_DATA_SENT,this.quitHandler);
+            pEvt.currentTarget.removeEventListener(WebServiceDataHandler.ALL_DATA_SENT,this.quitHandler);
             _log.trace("Data sent. Good to go. Bye bye");
          }
          if(Constants.EVENT_MODE)
@@ -495,12 +497,10 @@ package
          InterClientManager.destroy();
       }
 
-      public function clearCache(param1:Boolean=false, param2:Boolean=false) : void {
+      public function clearCache(selective:Boolean=false, reboot:Boolean=false) : void {
          var soList:Array = null;
          var file:File = null;
          var fileName:String = null;
-         var selective:Boolean = param1;
-         var reboot:Boolean = param2;
          StoreDataManager.getInstance().reset();
          var soFolder:File = new File(CustomSharedObject.getCustomSharedObjectDirectory());
          if((soFolder) && (soFolder.exists))
@@ -545,23 +545,25 @@ package
                }
                catch(e:Error)
                {
+                  trace("ClearCache method cannot delete " + file.nativePath);
                   continue;
                }
             }
          }
          if(reboot)
          {
             AppIdModifier.getInstance().invalideCache();
+            trace("REBOOT");
             this.reboot();
          }
       }
 
       public function reboot() : void {
          this.saveClientSize();
-         var _loc1_:Worker = Kernel.getWorker();
-         if(_loc1_)
+         var w:Worker = Kernel.getWorker();
+         if(w)
          {
-            _loc1_.clear();
+            w.clear();
          }
          _log.fatal("REBOOT");
          if(AirScanner.hasAir())
@@ -572,15 +574,15 @@ package
          throw new Error("Reboot not implemented with flash");
       }
 
-      public function renameApp(param1:String) : void {
+      public function renameApp(name:String) : void {
          if(AirScanner.hasAir())
          {
-            stage["nativeWindow"].title = param1;
+            stage["nativeWindow"].title = name;
          }
       }
 
-      private function initKernel(param1:Stage, param2:DisplayObject) : void {
-         Kernel.getInstance().init(param1,param2);
+      private function initKernel(stage:Stage, rootClip:DisplayObject) : void {
+         Kernel.getInstance().init(stage,rootClip);
          LangManager.getInstance().handler = Kernel.getWorker();
          FontManager.getInstance().handler = Kernel.getWorker();
          Berilia.getInstance().handler = Kernel.getWorker();
@@ -605,16 +607,16 @@ package
          this._uiContainer = new Sprite();
          addChild(this._uiContainer);
          this._uiContainer.mouseEnabled = false;
-         var _loc1_:* = BuildInfos.BUILD_TYPE == BuildTypeEnum.DEBUG;
-         Berilia.getInstance().verboseException = _loc1_;
-         Berilia.getInstance().init(this._uiContainer,_loc1_,BuildInfos.BUILD_REVISION,!_loc1_);
+         var isDebugMode:Boolean = BuildInfos.BUILD_TYPE == BuildTypeEnum.DEBUG;
+         Berilia.getInstance().verboseException = isDebugMode;
+         Berilia.getInstance().init(this._uiContainer,isDebugMode,BuildInfos.BUILD_REVISION,!isDebugMode);
          if(AirScanner.isStreamingVersion())
          {
             Berilia.embedIcons.SLOT_DEFAULT_ICON = EmbedAssets.getBitmap("DefaultBeriliaSlotIcon",true).bitmapData;
          }
-         var _loc2_:Uri = new Uri("SharedDefinitions.swf");
-         _loc2_.loaderContext = new LoaderContext(false,new ApplicationDomain());
-         UiModuleManager.getInstance(BuildInfos.BUILD_TYPE == BuildTypeEnum.RELEASE).sharedDefinitionContainer = _loc2_;
+         var sharedDefUri:Uri = new Uri("SharedDefinitions.swf");
+         sharedDefUri.loaderContext = new LoaderContext(false,new ApplicationDomain());
+         UiModuleManager.getInstance(BuildInfos.BUILD_TYPE == BuildTypeEnum.RELEASE).sharedDefinitionContainer = sharedDefUri;
          EntityDisplayer.setAnimationModifier(1,new CustomAnimStatiqueAnimationModifier());
          EntityDisplayer.setAnimationModifier(2,new CustomAnimStatiqueAnimationModifier());
          EntityDisplayer.setSkinModifier(1,new BreedSkinModifier());
@@ -654,56 +656,56 @@ package
          this._fpsDisplay.visible = !this._fpsDisplay.visible;
       }
 
-      private function onClosed(param1:Event) : void {
+      private function onClosed(e:Event) : void {
          Console.getInstance().close();
          ConsoleLUA.getInstance().close();
          HttpServer.getInstance().close();
       }
 
-      private function onOptionChange(param1:PropertyChangeEvent) : void {
-         if(param1.propertyName == "flashQuality")
+      private function onOptionChange(e:PropertyChangeEvent) : void {
+         if(e.propertyName == "flashQuality")
          {
-            if(param1.propertyValue == 0)
+            if(e.propertyValue == 0)
             {
                StageShareManager.stage.quality = StageQuality.LOW;
             }
             else
             {
-               if(param1.propertyValue == 1)
+               if(e.propertyValue == 1)
                {
                   StageShareManager.stage.quality = StageQuality.MEDIUM;
                }
                else
                {
-                  if(param1.propertyValue == 2)
+                  if(e.propertyValue == 2)
                   {
                      StageShareManager.stage.quality = StageQuality.HIGH;
                   }
                }
             }
          }
-         if(param1.propertyName == "fullScreen")
+         if(e.propertyName == "fullScreen")
          {
-            StageShareManager.setFullScreen(param1.propertyValue,false);
+            StageShareManager.setFullScreen(e.propertyValue,false);
          }
       }
 
-      public function onFps(param1:uint) : void {
-         var _loc2_:Object = null;
+      public function onFps(fps:uint) : void {
+         var framesInfo:Object = null;
          if(this._fpsDisplay.visible)
          {
-            _loc2_ = RasterizedAnimation.countFrames();
-            this._fpsDisplay.htmlText = "<font color=\'#FFFFFF\'>" + param1 + " fps - " + this._buildType + "\n<font color=\'#B9B6ED\'>" + Memory.humanReadableUsage() + " - r" + BuildInfos.BUILD_REVISION + "\n<font color=\'#92D5D8\'> Anim/Img en cache - " + _loc2_.animations + "/" + _loc2_.frames;
+            framesInfo = RasterizedAnimation.countFrames();
+            this._fpsDisplay.htmlText = "<font color=\'#FFFFFF\'>" + fps + " fps - " + this._buildType + "\n<font color=\'#B9B6ED\'>" + Memory.humanReadableUsage() + " - r" + BuildInfos.BUILD_REVISION + "\n<font color=\'#92D5D8\'> Anim/Img en cache - " + framesInfo.animations + "/" + framesInfo.frames;
          }
       }
 
       private function saveClientSize() : void {
-         var _loc1_:CustomSharedObject = CustomSharedObject.getLocal("clientData");
-         _loc1_.data.height = this._stageHeight;
-         _loc1_.data.width = this._stageWidth;
-         _loc1_.data.displayState = this._displayState;
-         _loc1_.flush();
-         _loc1_.close();
+         var clientDimentionSo:CustomSharedObject = CustomSharedObject.getLocal("clientData");
+         clientDimentionSo.data.height = this._stageHeight;
+         clientDimentionSo.data.width = this._stageWidth;
+         clientDimentionSo.data.displayState = this._displayState;
+         clientDimentionSo.flush();
+         clientDimentionSo.close();
       }
 
       public var strProgress:Number = 0;

by/blooddy/crypto/Base64.as

@@ -33,10 +33,10 @@ package by.blooddy.crypto
             _loc5_.length = ApplicationDomain.MIN_DOMAIN_MEMORY_LENGTH;
          }
          ApplicationDomain.currentDomain.domainMemory = _loc5_;
-         var _loc8_:* = 1732584193;
-         var _loc9_:* = -271733879;
-         var _loc10_:* = -1732584194;
-         var _loc11_:* = 271733878;
+         var _loc8_:int = 1732584193;
+         var _loc9_:int = -271733879;
+         var _loc10_:int = -1732584194;
+         var _loc11_:int = 271733878;
          var _loc12_:int = _loc8_;
          var _loc13_:int = _loc9_;
          var _loc14_:int = _loc10_;

by/blooddy/crypto/MD5.as

@@ -31,14 +31,14 @@ package by.blooddy.crypto
          var _loc27_:* = 0;
          var _loc28_:* = 0;
          var _loc29_:* = 0;
-         var _loc2_:* = 1779033703;
-         var _loc3_:* = -1150833019;
-         var _loc4_:* = 1013904242;
-         var _loc5_:* = -1521486534;
-         var _loc6_:* = 1359893119;
-         var _loc7_:* = -1694144372;
-         var _loc8_:* = 528734635;
-         var _loc9_:* = 1541459225;
+         var _loc2_:int = 1779033703;
+         var _loc3_:int = -1150833019;
+         var _loc4_:int = 1013904242;
+         var _loc5_:int = -1521486534;
+         var _loc6_:int = 1359893119;
+         var _loc7_:int = -1694144372;
+         var _loc8_:int = 528734635;
+         var _loc9_:int = 1541459225;
          var _loc10_:ByteArray = ApplicationDomain.currentDomain.domainMemory;
          var _loc11_:uint = param1.length << 3;
          var _loc12_:uint = 512 + ((_loc11_ + 64 >>> 9 << 4) + 15 << 2);

by/blooddy/crypto/SHA256.as

@@ -89,12 +89,12 @@ package by.blooddy.crypto.image
          _loc6_.position = _loc7_ + 4;
          _loc6_.writeBytes(_loc6_,3010,416);
          _loc7_ = 202274;
-         var _loc10_:* = 202288;
-         var _loc11_:* = 7;
-         var _loc12_:* = 0;
-         var _loc13_:* = 0;
-         var _loc14_:* = 0;
-         var _loc15_:* = 0;
+         var _loc10_:int = 202288;
+         var _loc11_:int = 7;
+         var _loc12_:int = 0;
+         var _loc13_:int = 0;
+         var _loc14_:int = 0;
+         var _loc15_:int = 0;
          _loc8_ = 0;
          do
          {
@@ -1310,7 +1310,7 @@ package by.blooddy.crypto.image
                                                       {
                                                          break;
                                                       }
-                                                      if((1 << _loc11_ + 1-1 & 1 << _loc22_) != 0)
+                                                      if(((1 << _loc11_ + 1) - 1 & 1 << _loc22_) != 0)
                                                       {
                                                          _loc12_ = _loc12_ | 1 << _loc11_;
                                                       }