OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2015-07-16 20:37:17 +02:00
commit d8ea128f38
27 changed files with 220 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/win32/i_xinput.cpp
View file

@ -793,6 +793,8 @@ void I_StartupXInput()
#else // NO_XINPUT
#include "i_input.h"
void I_StartupXInput()
{
JoyDevices[INPUT_XInput] = NULL;