Merge pull request #9872 from bruvzg/3.0-num-enter-fix

Remove duplicate keycode constant for Numpad Enter key (3.0)
2017-07-27 08:52:52 +02:00
parent 7c4a5f1392 7de7ca8ae4
commit 6645c7cc18
6 changed files with 1 additions and 9 deletions
@@ -81,7 +81,6 @@ static const _KeyCodeText _keycodes[] = {
 		{KEY_F14                           ,"F14"},
 		{KEY_F15                           ,"F15"},
 		{KEY_F16                           ,"F16"},
-		{KEY_KP_ENTER                      ,"Kp Enter"},
 		{KEY_KP_MULTIPLY                   ,"Kp Multiply"},
 		{KEY_KP_DIVIDE                     ,"Kp Divide"},
 		{KEY_KP_SUBTRACT                   ,"Kp Subtract"},
@@ -334,7 +333,6 @@ bool keycode_has_unicode(uint32_t p_keycode) {
 		case KEY_F14:
 		case KEY_F15:
 		case KEY_F16:
-		case KEY_KP_ENTER:
 		case KEY_SUPER_L:
 		case KEY_SUPER_R:
 		case KEY_MENU:
@@ -96,7 +96,6 @@ enum KeyList {
 	KEY_F14 = SPKEY | 0x29,
 	KEY_F15 = SPKEY | 0x2A,
 	KEY_F16 = SPKEY | 0x2B,
-	KEY_KP_ENTER = SPKEY | 0x80,
 	KEY_KP_MULTIPLY = SPKEY | 0x81,
 	KEY_KP_DIVIDE = SPKEY | 0x82,
 	KEY_KP_SUBTRACT = SPKEY | 0x83,