Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

More fixes to Joypad renaming.

Browse source 
Windows did not compile anymore because DI8DEVTYPE_JOYPAD obviously isn't defined in the directx headers ^^
I also did the same renaming as in #7473 for the windows platform and reverted the changes in the gamepad
mappings.
This commit is contained in:
Andreas Haas 2017-01-08 23:52:38 +01:00
parent 719b2e6eaa
commit d963fa9a01
No known key found for this signature in database
GPG key ID: B5FFAE1B65FBD2E1
5 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/windows/os_windows.cpp
View file

@ -1120,7 +1120,7 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_
visual_server->init();
input = memnew( InputDefault );
joypad = memnew (joypad_windows(input, &hWnd));
joypad = memnew (JoypadWindows(input, &hWnd));
AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton();