We don't need to include dinput.h anymore

Xottab-DUTY · Xottab-DUTY · commit cf7eea67e67a · 2018-08-03T21:48:29.000+05:00
diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp
@@ -229,7 +229,6 @@ BOOL CRenderTarget::Perform()
                               (frame_distort == (Device.dwFrame - 1)));
 }
 
-#include <dinput.h>
 #define SHOW(a) Log(#a, a);
 #define SHOWX(a) Msg("%s %x", #a, a);
 void CRenderTarget::Begin()
diff --git a/src/editors/ActorEditor/stdafx.cpp b/src/editors/ActorEditor/stdafx.cpp
@@ -12,7 +12,6 @@
 #pragma comment(lib, "xrCoreB.lib")
 #pragma comment(lib, "xrSoundB.lib")
 
-#pragma comment(lib, "dinputB.lib")
 #pragma comment(lib, "freeimageB.lib")
 //#pragma comment(lib,"d3d9.lib")
 #pragma comment(lib, "dxtB.lib")
diff --git a/src/editors/ActorEditor/stdafx.h b/src/editors/ActorEditor/stdafx.h
@@ -12,7 +12,6 @@
 #define O_SEQUENTIAL 0
 #endif
 
-#define DIRECTINPUT_VERSION 0x0800
 
 #define R_R1 1
 #define R_R2 2
@@ -91,7 +90,6 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
 #include <d3d9.h>
 #include <d3dx9.h>
 #include "Layers/xrRender/xrD3dDefs.h"
-#include <dinput.h>
 #include <dsound.h>
 
 // some user components
diff --git a/src/editors/ECore/guid.cpp b/src/editors/ECore/guid.cpp
@@ -1,4 +1,3 @@
 #pragma hdrstop
 
 #define INITGUID
-#include <dinput.h>
diff --git a/src/editors/ECore/stdafx.cpp b/src/editors/ECore/stdafx.cpp
@@ -4,7 +4,6 @@
 // external dependencies
 
 #define INITGUID
-#include <dinput.h>
 
 #ifndef _ECOREB
 #pragma comment(lib, "xrECoreB.lib")
@@ -15,7 +14,6 @@
 #pragma comment(lib, "xrCoreB.lib")
 #pragma comment(lib, "xrSoundB.lib")
 
-#pragma comment(lib, "dinput8B.lib")
 #pragma comment(lib, "freeimageB.lib")
 //#pragma comment(lib,"d3d9.lib")
 #pragma comment(lib, "dxtB.lib")
diff --git a/src/editors/ECore/stdafx.h b/src/editors/ECore/stdafx.h
@@ -12,7 +12,6 @@
 #define O_SEQUENTIAL 0
 #endif
 
-#define DIRECTINPUT_VERSION 0x0800
 
 #define R_R1 1
 #define R_R2 2
@@ -132,7 +131,6 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
 #include <d3dx9.h>
 #include "Layers/xrRender/xrD3dDefs.h"
 
-#include <dinput.h>
 //#include <dsound.h>
 
 // some user components
diff --git a/src/editors/LevelEditor/stdafx.cpp b/src/editors/LevelEditor/stdafx.cpp
@@ -12,7 +12,6 @@
 #pragma comment(lib, "xrCoreB.lib")
 #pragma comment(lib, "xrSoundB.lib")
 
-#pragma comment(lib, "dinputB.lib")
 #pragma comment(lib, "freeimageB.lib")
 //#pragma comment(lib,"d3d9.lib")
 #pragma comment(lib, "dxtB.lib")
diff --git a/src/editors/LevelEditor/stdafx.h b/src/editors/LevelEditor/stdafx.h
@@ -12,7 +12,6 @@
 #define O_SEQUENTIAL 0
 #endif
 
-#define DIRECTINPUT_VERSION 0x0800
 
 #define R_R1 1
 #define R_R2 2
@@ -93,7 +92,6 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
 #include <d3d9.h>
 #include <d3dx9.h>
 #include "Layers/xrRender/xrD3dDefs.h"
-#include <dinput.h>
 #include <dsound.h>
 
 // some user components
diff --git a/src/editors/ParticleEditor/stdafx.cpp b/src/editors/ParticleEditor/stdafx.cpp
@@ -12,7 +12,6 @@
 #pragma comment(lib, "xrCoreB.lib")
 #pragma comment(lib, "xrSoundB.lib")
 
-#pragma comment(lib, "dinputB.lib")
 #pragma comment(lib, "freeimageB.lib")
 //#pragma comment(lib,"d3d9.lib")
 #pragma comment(lib, "dxtB.lib")
diff --git a/src/editors/ParticleEditor/stdafx.h b/src/editors/ParticleEditor/stdafx.h
@@ -18,7 +18,6 @@
 #define O_SEQUENTIAL 0
 #endif
 
-#define DIRECTINPUT_VERSION 0x0800
 
 #define R_R1 1
 #define R_R2 2
@@ -99,7 +98,6 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
 #include <d3d9.h>
 #include <d3dx9.h>
 #include "Layers/xrRender/xrD3DDefs.h"
-#include <dinput.h>
 #include <dsound.h>
 
 // some user components
diff --git a/src/editors/ShaderEditor/stdafx.cpp b/src/editors/ShaderEditor/stdafx.cpp
@@ -12,7 +12,6 @@
 #pragma comment(lib, "xrCoreB.lib")
 #pragma comment(lib, "xrSoundB.lib")
 
-#pragma comment(lib, "dinputB.lib")
 #pragma comment(lib, "freeimageB.lib")
 //#pragma comment(lib,"d3d9.lib")
 #pragma comment(lib, "dxtB.lib")
diff --git a/src/editors/ShaderEditor/stdafx.h b/src/editors/ShaderEditor/stdafx.h
@@ -12,7 +12,6 @@
 #define O_SEQUENTIAL 0
 #endif
 
-#define DIRECTINPUT_VERSION 0x0800
 
 #define R_R1 1
 #define R_R2 2
@@ -90,7 +89,6 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
 #include <d3d9.h>
 #include <d3dx9.h>
 #include "Layers/xrRender/xrD3DDefs.h"
-#include <dinput.h>
 #include <dsound.h>
 
 // some user components
diff --git a/src/xrGame/key_binding_registrator_script.cpp b/src/xrGame/key_binding_registrator_script.cpp
@@ -1,5 +1,4 @@
 #include "pch_script.h"
-#include <dinput.h>
 #include "xr_level_controller.h"
 #include "xrScriptEngine/ScriptExporter.hpp"
 
diff --git a/src/xrGame/ui/UIButton.h b/src/xrGame/ui/UIButton.h
@@ -39,8 +39,8 @@ class CUIButton : public CUIStatic
     // Поведение кнопки как переключателя реализовано пока только в режиме NORMAL_PRESS
     void SetButtonAsSwitch(bool bAsSwitch) { m_bIsSwitch = bAsSwitch; }
     // Работа с акселератором
-    // Код акселератора берется из файла dinput.h, из DirectX SDK.
-    // Например: кнопка A - код 0x1E(DIK_A)
+    // Код акселератора берётся из файла SDL_scancode.h, из SDL2.
+    // Например: кнопка A - код 4 (SDL_SCANCODE_A)
     void SetAccelerator(int iAccel, int idx);
     const int GetAccelerator(int idx) const;
     bool IsAccelerator(int iAccel) const;

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,6 @@ BOOL CRenderTarget::Perform()`
`229`	`229`	`(frame_distort == (Device.dwFrame - 1)));`
`230`	`230`	`}`
`231`	`231`
`232`		`-#include <dinput.h>`
`233`	`232`	`#define SHOW(a) Log(#a, a);`
`234`	`233`	`#define SHOWX(a) Msg("%s %x", #a, a);`
`235`	`234`	`void CRenderTarget::Begin()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`#pragma hdrstop`
`2`	`2`
`3`	`3`	`#define INITGUID`
`4`		`-#include <dinput.h>`