From 0a30057a636e5ec3ec2143322470fe234b181222 Mon Sep 17 00:00:00 2001
From: relrelb <relrelbachar@gmail.com>
Date: Sat, 19 Jun 2021 13:54:43 +0300
Subject: [PATCH] avm1: Use enum constants instead of hard-coded numbers

---
 core/src/avm1/globals/key.rs | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/src/avm1/globals/key.rs b/core/src/avm1/globals/key.rs
index 4846c68fc..42fa8775c 100644
--- a/core/src/avm1/globals/key.rs
+++ b/core/src/avm1/globals/key.rs
@@ -7,25 +7,25 @@ use crate::events::KeyCode;
 use gc_arena::MutationContext;
 
 const OBJECT_DECLS: &[Declaration] = declare_properties! {
-    "ALT" => int(18; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "BACKSPACE" => int(8; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "CAPSLOCK" => int(20; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "CONTROL" => int(17; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "DELETEKEY" => int(46; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "DOWN" => int(40; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "END" => int(35; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "ENTER" => int(13; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "ESCAPE" => int(27; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "HOME" => int(36; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "INSERT" => int(45; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "LEFT" => int(37; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "PGDN" => int(34; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "PGUP" => int(33; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "RIGHT" => int(39; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "SHIFT" => int(16; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "SPACE" => int(32; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "TAB" => int(9; DONT_ENUM | DONT_DELETE | READ_ONLY);
-    "UP" => int(38; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "ALT" => int(KeyCode::Alt as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "BACKSPACE" => int(KeyCode::Backspace as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "CAPSLOCK" => int(KeyCode::CapsLock as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "CONTROL" => int(KeyCode::Control as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "DELETEKEY" => int(KeyCode::Delete as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "DOWN" => int(KeyCode::Down as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "END" => int(KeyCode::End as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "ENTER" => int(KeyCode::Return as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "ESCAPE" => int(KeyCode::Escape as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "HOME" => int(KeyCode::Home as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "INSERT" => int(KeyCode::Insert as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "LEFT" => int(KeyCode::Left as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "PGDN" => int(KeyCode::PgDown as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "PGUP" => int(KeyCode::PgUp as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "RIGHT" => int(KeyCode::Right as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "SHIFT" => int(KeyCode::Shift as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "SPACE" => int(KeyCode::Space as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "TAB" => int(KeyCode::Tab as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
+    "UP" => int(KeyCode::Up as i32; DONT_ENUM | DONT_DELETE | READ_ONLY);
     "isDown" => method(is_down; DONT_ENUM | DONT_DELETE | READ_ONLY);
     "getAscii" => method(get_ascii; DONT_ENUM | DONT_DELETE | READ_ONLY);
     "getCode" => method(get_code; DONT_ENUM | DONT_DELETE | READ_ONLY);