Merge branch releases/1.8 revisions r5363:r5367 into trunk:

- Increase KEY_KEY_CODES_COUNT to fix problem with laptop keyboards which return the keycode 0xff for the function key.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5368 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-03-16 22:42:01 +00:00
parent 7bacbb0873
commit 021485e272
2 changed files with 4 additions and 2 deletions

View File

@ -159,6 +159,7 @@ should now be fps independentn
--------------------------
Changes in 1.8.5
- Increase KEY_KEY_CODES_COUNT to fix problem with laptop keyboards which return the keycode 0xff for the function key. Thx @Klokancz for bugreport and patch.
- Fix bug when calling activateJoysticks on windows several times. It had appened joystick information instead of replacing it, thereby increasing joystick number on each call.
Only happened compiling with _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ (which is the default). Linux and SDL implementation not affected.
Thx @Andrea Demetrio for the bugreport.

View File

@ -162,9 +162,10 @@ namespace irr
KEY_PLAY = 0xFA, // Play key
KEY_ZOOM = 0xFB, // Zoom key
KEY_PA1 = 0xFD, // PA1 key
KEY_OEM_CLEAR = 0xFE, // Clear key
KEY_OEM_CLEAR = 0xFE, // Clear key
KEY_NONE = 0xFF, // usually no key mapping, but some laptops use it for fn key
KEY_KEY_CODES_COUNT = 0xFF // this is not a key, but the amount of keycodes there are.
KEY_KEY_CODES_COUNT = 0x100 // this is not a key, but the amount of keycodes there are.
};
} // end namespace irr