Added CFlashlight class with device_flashlight

revolucas · Jun 23, 2018 · 4a6702f · 4a6702f · Roman-n · Jun 23, 2018
1 parent 34e1f9b
commit 4a6702f
Show file tree

Hide file tree

Showing 20 changed files with 1,227 additions and 17 deletions.
diff --git a/res/gamedata/configs/misc/devices.ltx b/res/gamedata/configs/misc/devices.ltx
diff --git a/res/gamedata/meshes/dynamics/devices/dev_detector_1/dev_detector_1_hud_animation.omf b/res/gamedata/meshes/dynamics/devices/dev_detector_1/dev_detector_1_hud_animation.omf
diff --git a/res/gamedata/meshes/dynamics/devices/dev_detector_1/dev_hand_detector_1_hud_animation.omf b/res/gamedata/meshes/dynamics/devices/dev_detector_1/dev_hand_detector_1_hud_animation.omf
diff --git a/res/gamedata/meshes/dynamics/devices/dev_flashlight/dev_flashlight.ogf b/res/gamedata/meshes/dynamics/devices/dev_flashlight/dev_flashlight.ogf
diff --git a/res/gamedata/meshes/dynamics/devices/dev_flashlight/dev_flashlight_hud.ogf b/res/gamedata/meshes/dynamics/devices/dev_flashlight/dev_flashlight_hud.ogf
diff --git a/res/gamedata/textures/item/item_flash.dds b/res/gamedata/textures/item/item_flash.dds
diff --git a/res/gamedata/textures/item/item_flash.thm b/res/gamedata/textures/item/item_flash.thm
diff --git a/res/gamedata/textures/item/item_flash_bump#.dds b/res/gamedata/textures/item/item_flash_bump#.dds
diff --git a/res/gamedata/textures/item/item_flash_bump.dds b/res/gamedata/textures/item/item_flash_bump.dds
diff --git a/res/gamedata/textures/item/item_flash_bump.thm b/res/gamedata/textures/item/item_flash_bump.thm
diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -2,6 +2,7 @@
 #include <dinput.h>
 #include "Actor.h"
 #include "Torch.h"
+#include "Flashlight.h"
 #include "trade.h"
 #include "../xrEngine/CameraBase.h"
 
@@ -108,6 +109,11 @@ void CActor::IR_OnKeyboardPress(int cmd)
 	case kTORCH:
 		{
 			SwitchTorch();
+			/*
+			CFlashlight* flashlight = smart_cast<CFlashlight*>(inventory().ItemFromSlot(DETECTOR_SLOT));
+			if (flashlight)
+				flashlight->Switch();
+			*/
 			break;
 		}
 
@@ -119,6 +125,12 @@ void CActor::IR_OnKeyboardPress(int cmd)
 				CCustomDetector* det			= smart_cast<CCustomDetector*>(det_active);
 				if (det)
 					det->ToggleDetector				(g_player_hud->attached_item(0)!=NULL);
+				else
+				{
+					CFlashlight* flashlight = smart_cast<CFlashlight*>(det_active);
+					if (flashlight)
+						flashlight->ToggleDevice(g_player_hud->attached_item(0) != NULL);
+				}
 				return;
 			}
 		}break;

diff --git a/src/xrGame/CustomDetector.cpp b/src/xrGame/CustomDetector.cpp
@@ -191,6 +191,7 @@ CCustomDetector::CCustomDetector()
 	m_ui				= NULL;
 	m_bFastAnimMode		= false;
 	m_bNeedActivation	= false;
+	m_bWorking			= false;
 }
 
 CCustomDetector::~CCustomDetector()