xrGame: remove dinput from includes

eagleivg · Xottab-DUTY · commit e591b9b45021 · 2018-07-25T04:00:43.000+05:00
diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <dinput.h>
 #include "Actor.h"
 #include "Torch.h"
 #include "trade.h"
@@ -469,7 +468,7 @@ void CActor::ActorUse()
         if (object)
             element = (u16)RQ.element;
 
-        if (object && Level().IR_GetKeyState(DIK_LSHIFT))
+        if (object && Level().IR_GetKeyState(SDL_SCANCODE_LSHIFT))
         {
             bool b_allow = !!pSettings->line_exist("ph_capture_visuals", object->cNameVisual());
             if (b_allow && !character_physics_support()->movement()->PHCapture())
@@ -660,9 +659,9 @@ void CActor::NoClipFly(int cmd)
     Fvector cur_pos; // = Position();
     cur_pos.set(0, 0, 0);
     float scale = 1.0f;
-    if (pInput->iGetAsyncKeyState(DIK_LSHIFT))
+    if (pInput->iGetAsyncKeyState(SDL_SCANCODE_LSHIFT))
         scale = 0.25f;
-    else if (pInput->iGetAsyncKeyState(DIK_LMENU))
+    else if (pInput->iGetAsyncKeyState(SDL_SCANCODE_LGUI))
         scale = 4.0f;
 
     switch (cmd)
diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <dinput.h>
 #include "xrEngine/XR_IOConsole.h"
 #include "entity_alive.h"
 #include "game_sv_single.h"
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -8,7 +8,6 @@
 #include "xr_Level_controller.h"
 #include "ui\UITextureMaster.h"
 #include "ui\UIXmlInit.h"
-#include <dinput.h>
 #include <SDL.h>
 #include "ui\UIBtnHint.h"
 #include "UICursor.h"
diff --git a/src/xrGame/StdAfx.h b/src/xrGame/StdAfx.h
@@ -13,7 +13,6 @@
 //#include <assert.h> // ~440 - but it has no include guard! Perhaps that's intentional?
 #include <math.h>
 #include <queue> // ~360
-#include <dinput.h> // Only ~60, heavy enough to warrant including in pch
 #include "luabind/luabind.hpp" // luabind/*, almost 5000
 #include "xrServerEntities/smart_cast.h" // a lot
 #include "xrScriptEngine/script_space_forward.hpp" // ~765 // XXX: See to it this goes to pch_script
diff --git a/src/xrGame/UIGameCTA.cpp b/src/xrGame/UIGameCTA.cpp
@@ -1,8 +1,6 @@
 #include "stdafx.h"
 #include "UIGameCTA.h"
 
-#include <dinput.h>
-
 #include "UITeamPanels.h"
 
 #include "game_cl_base.h"
diff --git a/src/xrGame/UIGameTDM.cpp b/src/xrGame/UIGameTDM.cpp
@@ -6,7 +6,6 @@
 #include "game_cl_TeamDeathmatch.h"
 
 #include "ui/TeamInfo.h"
-#include <dinput.h>
 
 #include "Common/object_broker.h"
 
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker.cpp b/src/xrGame/ai/monsters/bloodsucker/bloodsucker.cpp
@@ -21,9 +21,6 @@
 #include "ActorCondition.h"
 #include "PHDestroyable.h"
 #include "CharacterPhysicsSupport.h"
-#ifdef DEBUG
-#include <dinput.h>
-#endif // DEBUG
 
 namespace detail
 {
diff --git a/src/xrGame/ai/monsters/controller/controller.cpp b/src/xrGame/ai/monsters/controller/controller.cpp
@@ -34,10 +34,6 @@
 #include "ai/Monsters/Controller/controller_psy_hit.h"
 #include "ai/Monsters/monster_cover_manager.h"
 
-#ifdef _DEBUG
-#include <dinput.h>
-#endif
-
 const u32 _pmt_psy_attack_delay = 2000;
 const float _pmt_psy_attack_min_angle = deg(5);
 
diff --git a/src/xrGame/ai/monsters/dog/dog.cpp b/src/xrGame/ai/monsters/dog/dog.cpp
@@ -16,10 +16,6 @@
 #include "xrAICore/Navigation/ai_object_location.h"
 #include "Actor.h"
 
-#ifdef _DEBUG
-#include <dinput.h>
-#endif
-
 CAI_Dog::CAI_Dog()
 {
     StateMan = new CStateManagerDog(this);
diff --git a/src/xrGame/ai/monsters/pseudodog/pseudodog.cpp b/src/xrGame/ai/monsters/pseudodog/pseudodog.cpp
@@ -10,7 +10,6 @@
 #include "ai/monsters/control_movement_base.h"
 
 #ifdef _DEBUG
-#include <dinput.h>
 #include "xrAICore/Navigation/ai_object_location.h"
 #include "level_debug.h"
 #include "xrAICore/Navigation/level_graph.h"
diff --git a/src/xrGame/ai/monsters/snork/snork.cpp b/src/xrGame/ai/monsters/snork/snork.cpp
@@ -10,7 +10,6 @@
 #include "ai/monsters/control_movement_base.h"
 #include "PHMovementControl.h"
 #ifdef _DEBUG
-#include <dinput.h>
 #include "Actor.h"
 #include "xrAICore/Navigation/ai_object_location.h"
 #include "level_debug.h"
diff --git a/src/xrGame/ai/monsters/zombie/zombie.cpp b/src/xrGame/ai/monsters/zombie/zombie.cpp
@@ -9,10 +9,6 @@
 #include "ai/monsters/control_animation_base.h"
 #include "ai/monsters/control_movement_base.h"
 
-#ifdef _DEBUG
-#include <dinput.h>
-#endif
-
 CZombie::CZombie()
 {
     StateMan = new CStateManagerZombie(this);
diff --git a/src/xrGame/game_cl_deathmatch.cpp b/src/xrGame/game_cl_deathmatch.cpp
@@ -12,7 +12,6 @@
 #include "ui/UIMapDesc.h"
 #include "ui/UIMessageBoxEx.h"
 #include "ui/UIVote.h"
-#include "dinput.h"
 #include "gamepersistent.h"
 #include "string_table.h"
 #include "map_manager.h"
diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp
@@ -5,7 +5,6 @@
 #include "Actor.h"
 #include "ExplosiveItem.h"
 #include "Level.h"
-#include <dinput.h>
 #include "CustomZone.h"
 #include "game_base_kill_type.h"
 #include "game_base_menu_events.h"
diff --git a/src/xrGame/ui/ChangeWeatherDialog.cpp b/src/xrGame/ui/ChangeWeatherDialog.cpp
@@ -5,7 +5,6 @@
 #include "game_cl_teamdeathmatch.h"
 #include "UIKickPlayer.h"
 #include "UIChangeMap.h"
-#include <dinput.h>
 #include "xrEngine/XR_IOConsole.h"
 #include "UIMapList.h"
 #include "UIGameCustom.h"
diff --git a/src/xrGame/ui/UICDkey.cpp b/src/xrGame/ui/UICDkey.cpp
@@ -8,7 +8,6 @@
 #include "xrGameSpy/xrGameSpy_MainDefs.h"
 #include "player_name_modifyer.h"
 #include "xrGameSpy/GameSpy_GP.h"
-#include <dinput.h>
 #include "xrCore/os_clipboard.h"
 
 string64 gsCDKey = "";
diff --git a/src/xrGame/ui/UIChangeMap.cpp b/src/xrGame/ui/UIChangeMap.cpp
@@ -77,7 +77,6 @@ void CUIChangeMap::InitChangeMap(CUIXml& xml_doc)
     FillUpList();
 }
 
-#include <dinput.h>
 bool CUIChangeMap::OnKeyboardAction(SDL_Scancode dik, EUIMessages keyboard_action)
 {
     if (dik == SDL_SCANCODE_ESCAPE)
diff --git a/src/xrGame/ui/UIDebugFonts.cpp b/src/xrGame/ui/UIDebugFonts.cpp
@@ -1,7 +1,6 @@
 #include "StdAfx.h"
 #include "UIDebugFonts.h"
 #include "UIDialogHolder.h"
-#include "dinput.h"
 
 CUIDebugFonts::CUIDebugFonts()
 {
diff --git a/src/xrGame/ui/UIDemoPlayControl.cpp b/src/xrGame/ui/UIDemoPlayControl.cpp
@@ -5,7 +5,6 @@
 #include "UIPropertiesBox.h"
 #include "UIListBox.h"
 #include "UIListBoxItem.h"
-#include <dinput.h>
 #include "UIDemoPlayControl.h"
 #include "UICursor.h"
 #include "xrEngine/XR_IOConsole.h"
diff --git a/src/xrGame/ui/UIEditBox.cpp b/src/xrGame/ui/UIEditBox.cpp
@@ -3,7 +3,6 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
-#include <dinput.h>
 #include "uieditbox.h"
 #include "UIFrameLineWnd.h"
 
diff --git a/src/xrGame/ui/UIKickPlayer.cpp b/src/xrGame/ui/UIKickPlayer.cpp
@@ -83,7 +83,6 @@ void CUIKickPlayer::InitKick(CUIXml& xml_doc)
     m_ban_sec_label->Show(false);
 }
 
-#include <dinput.h>
 bool CUIKickPlayer::OnKeyboardAction(SDL_Scancode dik, EUIMessages keyboard_action)
 {
     if (dik == SDL_SCANCODE_ESCAPE)
diff --git a/src/xrGame/ui/UIMMShniaga.cpp b/src/xrGame/ui/UIMMShniaga.cpp
@@ -337,8 +337,6 @@ void CUIMMShniaga::OnBtnClick()
         GetMessageTarget()->SendMessage(m_selected, BUTTON_CLICKED);
 }
 
-#include <dinput.h>
-
 bool CUIMMShniaga::OnKeyboardAction(SDL_Scancode dik, EUIMessages keyboard_action)
 {
     if (WINDOW_KEY_PRESSED == keyboard_action)
diff --git a/src/xrGame/ui/UIMPAdminMenu.cpp b/src/xrGame/ui/UIMPAdminMenu.cpp
@@ -11,7 +11,6 @@
 #include "UIMessageBox.h"
 #include "UIMessageBoxEx.h"
 #include "xrEngine/xr_ioconsole.h"
-#include <dinput.h>
 
 CUIMpAdminMenu::CUIMpAdminMenu()
 {
diff --git a/src/xrGame/ui/UIMainIngameWnd.cpp b/src/xrGame/ui/UIMainIngameWnd.cpp
@@ -2,7 +2,6 @@
 #include "UIMainIngameWnd.h"
 #include "UIMessagesWindow.h"
 #include "UIZoneMap.h"
-#include <dinput.h>
 #include "Actor.h"
 #include "ActorCondition.h"
 #include "EntityCondition.h"
diff --git a/src/xrGame/ui/UIMapDesc.cpp b/src/xrGame/ui/UIMapDesc.cpp
@@ -10,7 +10,6 @@
 #include "game_cl_teamdeathmatch.h"
 #include "UIMapInfo.h"
 #include "xr_level_controller.h"
-#include <dinput.h>
 #include "UIStatsPlayerList.h"
 
 CUIMapDesc::CUIMapDesc()
diff --git a/src/xrGame/ui/UIMessageBoxEx.cpp b/src/xrGame/ui/UIMessageBoxEx.cpp
@@ -2,7 +2,6 @@
 #include "UIMessageBox.h"
 #include "UIMessageBoxEx.h"
 #include "UIDialogHolder.h"
-#include <dinput.h>
 
 CUIMessageBoxEx::CUIMessageBoxEx()
 {
diff --git a/src/xrGame/ui/UIMpTradeWnd_items.cpp b/src/xrGame/ui/UIMpTradeWnd_items.cpp
@@ -852,8 +852,6 @@ void CUIMpTradeWnd::DumpPreset(ETradePreset idx)
 #endif // #ifndef MASTER_GOLD
 }
 
-#include <dinput.h>
-
 void CUICellItemTradeMenuDraw::OnDraw(CUICellItem* cell)
 {
     Fvector2 pos;
diff --git a/src/xrGame/ui/UIMpTradeWnd_misc.cpp b/src/xrGame/ui/UIMpTradeWnd_misc.cpp
@@ -9,7 +9,6 @@
 #include "inventory_item.h"
 #include "PhysicsShellHolder.h"
 #include "Common/object_broker.h"
-#include <dinput.h>
 #include "UICellCustomItems.h"
 
 bool CUIMpTradeWnd::OnKeyboardAction(SDL_Scancode dik, EUIMessages keyboard_action)
diff --git a/src/xrGame/ui/UIMpTradeWnd_trade.cpp b/src/xrGame/ui/UIMpTradeWnd_trade.cpp
@@ -5,7 +5,6 @@
 #include "UICellItem.h"
 #include "UIDragDropListEx.h"
 #include "UICellCustomItems.h"
-#include <dinput.h>
 #include "game_cl_deathmatch.h"
 #include "game_cl_capture_the_artefact.h"
 
diff --git a/src/xrGame/ui/UIServerInfo.cpp b/src/xrGame/ui/UIServerInfo.cpp
@@ -8,7 +8,6 @@
 #include "UIGameCustom.h"
 #include "Level.h"
 #include "game_cl_mp.h"
-#include <dinput.h>
 #include "ximage.h"
 #include "xmemfile.h"
 
diff --git a/src/xrGame/ui/UISkinSelector.cpp b/src/xrGame/ui/UISkinSelector.cpp
@@ -1,5 +1,4 @@
 #include "StdAfx.h"
-#include <dinput.h>
 #include "UISkinSelector.h"
 #include "UIXmlInit.h"
 #include "UIAnimatedStatic.h"
diff --git a/src/xrGame/ui/UISpeechMenu.cpp b/src/xrGame/ui/UISpeechMenu.cpp
@@ -5,7 +5,6 @@
 #include "UIGameCustom.h"
 #include "UIXmlInit.h"
 #include "game_cl_mp.h"
-#include <dinput.h>
 #include "Level.h"
 #include "string_table.h"
 
diff --git a/src/xrGame/ui/UITalkDialogWnd.cpp b/src/xrGame/ui/UITalkDialogWnd.cpp
@@ -13,7 +13,6 @@
 #include "Level.h"
 #include "Actor.h"
 #include "alife_registry_wrappers.h"
-#include "dinput.h"
 
 #define TALK_XML "talk.xml"
 
diff --git a/src/xrGame/ui/UIVotingCategory.cpp b/src/xrGame/ui/UIVotingCategory.cpp
@@ -91,21 +91,19 @@ void CUIVotingCategory::SendMessage(CUIWindow* pWnd, s16 msg, void* pData)
     }
 }
 
-#include <dinput.h>
-
 bool CUIVotingCategory::OnKeyboardAction(SDL_Scancode dik, EUIMessages keyboard_action)
 {
     CUIDialogWnd::OnKeyboardAction(dik, keyboard_action);
 
     if (WINDOW_KEY_PRESSED == keyboard_action)
     {
-        if (DIK_ESCAPE == dik)
+        if (SDL_SCANCODE_ESCAPE == dik)
         {
             OnBtnCancel();
             return true;
         }
-        if (dik >= DIK_1 && dik <= DIK_7)
-            OnBtn(dik - DIK_1);
+        if (dik >= SDL_SCANCODE_1 && dik <= SDL_SCANCODE_7)
+            OnBtn(dik - SDL_SCANCODE_1);
         return true;
     }
     return false;
diff --git a/src/xrGame/xr_level_controller.cpp b/src/xrGame/xr_level_controller.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <dinput.h>
 #include <SDL.h>
 #include "xrEngine/xr_ioconsole.h"
 #include "xrEngine/xr_input.h"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "stdafx.h"`
`2`		`-#include <dinput.h>`
`3`	`2`	`#include "xrEngine/XR_IOConsole.h"`
`4`	`3`	`#include "entity_alive.h"`
`5`	`4`	`#include "game_sv_single.h"`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@`
`21`	`21`	`#include "ActorCondition.h"`
`22`	`22`	`#include "PHDestroyable.h"`
`23`	`23`	`#include "CharacterPhysicsSupport.h"`
`24`		`-#ifdef DEBUG`
`25`		`-#include <dinput.h>`
`26`		`-#endif // DEBUG`
`27`	`24`
`28`	`25`	`namespace detail`
`29`	`26`	`{`