Fix minor errors when compiling with the Flex SDK

flashflashrevolution · Jul 16, 2024 · 5aadad2 · 5aadad2
1 parent b3d182d
commit 5aadad2
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/src/AirContext.as b/src/AirContext.as
@@ -53,7 +53,7 @@ package
         public static function createFileName(file_name:String, replace:String = ""):String
         {
             // Remove chars not allowed in Windows filename \ / : * ? " < > |
-            file_name = file_name.replace(/[~\\\/:\*\?"<>\|]/g, replace);
+            file_name = file_name.replace(/[~\\\/:\*\?\"<>\|]/g, replace);
 
             // Trim leading and trailing whitespace.
             file_name = file_name.replace(/^\s+|\s+$/gs, replace);

diff --git a/src/classes/Noteskins.as b/src/classes/Noteskins.as
@@ -673,7 +673,7 @@ package classes
                 file = files[i];
                 try
                 {
-                    if (file.type != ".txt")
+                    if (file.extension != "txt")
                         continue;
 
                     fileDataJSON = AirContext.readTextFile(file);

diff --git a/src/classes/User.as b/src/classes/User.as
@@ -223,15 +223,15 @@ package classes
         ///- Determine what songs make up the user's Skill Rating
         public function getUserSkillRatingData():void
         {
-            for (var key:int in this.level_ranks)
+            for (var key:Object in this.level_ranks)
             {
                 var levelRank:Object = this.level_ranks[key];
 
                 //Calculate the AAA Equiv for the scores on the song if greater than 0
                 if (levelRank.score > 0)
                 {
                     //Get the song's difficulty
-                    var songInfo:SongInfo = _playlist.getSongInfo(key);
+                    var songInfo:SongInfo = _playlist.getSongInfo(key as int);
 
                     if (songInfo == null || songInfo.is_unranked)
                         continue;

diff --git a/src/classes/chart/parse/ExternalChartBase.as b/src/classes/chart/parse/ExternalChartBase.as
@@ -48,7 +48,7 @@ package classes.chart.parse
             return info;
         }
 
-        public function getAudioData():*
+        public function getAudioData():ByteArray
         {
             return AUDIO_BYTES;
         }

diff --git a/src/classes/mp/MPSocketDataRaw.as b/src/classes/mp/MPSocketDataRaw.as
@@ -39,7 +39,7 @@ package classes.mp
                     return new MPSocketDataRaw(type, action, data);
                 }
             }
-            catch (err)
+            catch (err:Error)
             {
                 trace("parseMessage err:", err);
             }

diff --git a/src/classes/mp/MPSocketDataText.as b/src/classes/mp/MPSocketDataText.as
@@ -38,7 +38,7 @@ package classes.mp
                     }
                 }
             }
-            catch (err)
+            catch (err:Error)
             {
                 trace("parseMessage err:", err);
             }

diff --git a/src/classes/mp/views/MPRoomViewFFR.as b/src/classes/mp/views/MPRoomViewFFR.as
@@ -704,7 +704,7 @@ internal class UserPanel extends Sprite
     private var view:MPRoomViewFFR;
     private var room:MPRoomFFR;
 
-    private var name:Text;
+    private var panelName:Text;
     private var iconLeaveBtn:UIIcon;
 
     private var songName:Text;
@@ -720,8 +720,8 @@ internal class UserPanel extends Sprite
         this.view = view;
         this.room = room;
 
-        name = new Text(this, 20, 0, room.name, 16);
-        name.setAreaParams(view.width - 85, 30);
+        panelName = new Text(this, 20, 0, room.name, 16);
+        panelName.setAreaParams(view.width - 85, 30);
 
         iconLeaveBtn = new UIIcon(this, new iconLeave(), view.width - 15, 16);
         iconLeaveBtn.setSize(15, 15);
@@ -752,7 +752,7 @@ internal class UserPanel extends Sprite
 
     public function update():void
     {
-        name.text = room.name ? room.name : "";
+        panelName.text = room.name ? room.name : "";
 
         if (room.songData.selected)
         {
@@ -802,7 +802,7 @@ internal class OwnerPanel extends Sprite
     private var view:MPRoomViewFFR;
     private var room:MPRoomFFR;
 
-    private var name:Text;
+    private var panelName:Text;
     private var iconEditBtn:UIIcon;
     private var iconLeaveBtn:UIIcon;
 
@@ -821,8 +821,8 @@ internal class OwnerPanel extends Sprite
         this.view = view;
         this.room = room;
 
-        name = new Text(this, 20, 0, "", 16);
-        name.setAreaParams(view.width - 85, 30);
+        panelName = new Text(this, 20, 0, "", 16);
+        panelName.setAreaParams(view.width - 85, 30);
 
         iconEditBtn = new UIIcon(this, new iconGear(), view.width - 45, 16);
         iconEditBtn.setSize(15, 15);
@@ -866,7 +866,7 @@ internal class OwnerPanel extends Sprite
 
     public function update():void
     {
-        name.text = room.name ? room.name : "";
+        panelName.text = room.name ? room.name : "";
 
         if (room.songData.selected)
         {
@@ -930,7 +930,7 @@ internal class OwnerEditPanel extends Sprite
     private var view:MPRoomViewFFR;
     private var room:MPRoomFFR;
 
-    private var name:BoxText;
+    private var panelName:BoxText;
     private var iconCancelBtn:UIIcon;
     private var iconSaveBtn:UIIcon;
 
@@ -953,10 +953,10 @@ internal class OwnerEditPanel extends Sprite
         this.view = view;
         this.room = room;
 
-        name = new BoxText(this, 20, 1, 280, 28);
-        name.field.y += 1;
-        name.borderAlpha = 0;
-        name.borderActiveAlpha = 0;
+        panelName = new BoxText(this, 20, 1, 280, 28);
+        panelName.field.y += 1;
+        panelName.borderAlpha = 0;
+        panelName.borderActiveAlpha = 0;
 
         iconCancelBtn = new UIIcon(this, new iconCancel(), view.width - 45, 16);
         iconCancelBtn.setSize(15, 15);
@@ -1031,17 +1031,17 @@ internal class OwnerEditPanel extends Sprite
 
         // Draw
         this.graphics.lineStyle(1, 0xFFFFFF, 0.35);
-        this.graphics.moveTo(name.x, 1);
-        this.graphics.lineTo(name.x, name.height + 1);
-        this.graphics.moveTo(name.x + name.width, 1);
-        this.graphics.lineTo(name.x + name.width, name.height + 1);
+        this.graphics.moveTo(panelName.x, 1);
+        this.graphics.lineTo(panelName.x, panelName.height + 1);
+        this.graphics.moveTo(panelName.x + panelName.width, 1);
+        this.graphics.lineTo(panelName.x + panelName.width, panelName.height + 1);
 
         update();
     }
 
     public function update():void
     {
-        name.text = room.name ? room.name : "";
+        panelName.text = room.name ? room.name : "";
         roomPassword.text = room.password ? room.password : "";
         joinCode.text = room.joinCode ? room.joinCode : "";
 
@@ -1082,7 +1082,7 @@ internal class OwnerEditPanel extends Sprite
         _mp.addEventListener(MPEvent.ROOM_EDIT_FAIL, e_onEditFail);
 
         const cmd:MPCRoomEdit = new MPCRoomEdit(room);
-        cmd.name = name.text;
+        cmd.name = panelName.text;
         cmd.password = roomPassword.text;
 
         // FFA

diff --git a/src/game/GameplayDisplay.as b/src/game/GameplayDisplay.as
@@ -2437,7 +2437,7 @@ internal class EditorMenu extends Sprite
         gameplay.interfaceSetup();
     }
 
-    function e_setLayoutSingle(e:MouseEvent):void
+    private function e_setLayoutSingle(e:MouseEvent):void
     {
         var layout:Object = gameplay.options.layout;
 
@@ -2447,7 +2447,7 @@ internal class EditorMenu extends Sprite
         gameplay.interfaceSetup();
     }
 
-    function e_setLayoutMulti(e:MouseEvent):void
+    private function e_setLayoutMulti(e:MouseEvent):void
     {
         var layout:Object = gameplay.options.layout;
 

diff --git a/src/game/results/GameResultFFRScoreList.as b/src/game/results/GameResultFFRScoreList.as
@@ -144,7 +144,7 @@ package game.results
 
         private function e_onPaneClick(e:MouseEvent):void
         {
-            if (!handler)
+            if (handler == null)
                 return;
 
             if (e.target is UserLabel)
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ package classes.mp @@
                         }
                     }
                 }
-                catch (err)
+                catch (err:Error)
                 {
                     trace("parseMessage err:", err);
                 }
@@ Expand Down @@