доступна настройка худа в релизе

abramcumner · Apr 3, 2017 · ffb9fd7 · ffb9fd7
1 parent 3acbe5f
commit ffb9fd7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/xray/xrGame/HUDManager.cpp b/xray/xrGame/HUDManager.cpp
@@ -226,7 +226,8 @@ void CHUDManager::Render_Actor_Shadow()
 	if (A->activeCam() != eacFirstEye) return;		
 	::Render->set_Object(O->H_Root());
 	//O->renderable_Render();
-	//õàê, ÷òîáû áûëè òåíè îò ïðèàòòà÷åííûõ ïðåäìåòîâ
+	// HACK
+	// Ñêîïèðîâàíî ñîäåðæèìîå CActor::renderable_Render(), ÷òîáû áûëè òåíè îò ïðèàòòà÷åííûõ ïðåäìåòîâ
 	A->CEntityAlive::renderable_Render();
 	A->CInventoryOwner::renderable_Render();
 }

diff --git a/xray/xrGame/attachable_item.cpp b/xray/xrGame/attachable_item.cpp
@@ -14,7 +14,7 @@
 #include "../xrEngine/xr_input.h"
 #include "HudManager.h"
 
-#ifdef DEBUG
+#ifndef MASTER_GOLD
 	CAttachableItem*	CAttachableItem::m_dbgItem = NULL;
 #endif
 
@@ -132,7 +132,7 @@ void CAttachableItem::afterDetach		()
 	object().processing_deactivate	();
 }
 
-#ifdef DEBUG
+#ifndef MASTER_GOLD
 float ATT_ITEM_MOVE_CURR = 0.01f;
 float ATT_ITEM_ROT_CURR = 0.1f;
 
@@ -219,4 +219,4 @@ void attach_draw_adjust_mode()
 	sprintf_s(_text, "attach_angle_offset IS [%3.3f][%3.3f][%3.3f]", _ang.x, _ang.y, _ang.z);
 	F->OutNext			(_text);
 }
-#endif // #ifdef DEBUG
+#endif // #ifndef MASTER_GOLD
diff --git a/xray/xrGame/attachable_item.h b/xray/xrGame/attachable_item.h
@@ -46,7 +46,7 @@ class CAttachableItem {
 	virtual	void				enable					(bool value);
 
 public:
-#ifdef DEBUG
+#ifndef MASTER_GOLD
 	static CAttachableItem		*m_dbgItem;
 	static Fvector				get_angle_offset		()	{VERIFY(m_dbgItem);Fvector v; m_dbgItem->m_offset.getHPB(v); return v;};
 	static Fvector				get_pos_offset			()	{VERIFY(m_dbgItem);return m_dbgItem->m_offset.c;};

diff --git a/xray/xrGame/console_commands.cpp b/xray/xrGame/console_commands.cpp
@@ -1298,7 +1298,8 @@ struct CCC_DbgBullets : public CCC_Integer {
 		CCC_Integer::Execute	(args);
 	}
 };
-
+#endif
+#ifndef MASTER_GOLD
 #include "attachable_item.h"
 #include "attachment_owner.h"
 class CCC_TuneAttachableItem : public IConsole_Command
@@ -1329,7 +1330,8 @@ public		:
 		sprintf_s(I,"allows to change bind rotation and position offsets for attached item, <section_name> given as arguments");
 	}
 };
-
+#endif
+#ifdef DEBUG
 class CCC_Crash : public IConsole_Command {
 public:
 	CCC_Crash(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = true; };
@@ -1712,8 +1714,11 @@ CMD4(CCC_Integer,			"hit_anims_tune",						&tune_hit_anims,		0, 1);
 
 	CMD1(CCC_ShowMonsterInfo,	"ai_monster_info");
 	CMD1(CCC_DebugFonts,		"debug_fonts");
+#endif
+#ifndef MASTER_GOLD
 	CMD1(CCC_TuneAttachableItem,"dbg_adjust_attachable_item");
-
+#endif
+#ifdef DEBUG
 
 	CMD1(CCC_ShowAnimationStats,"ai_show_animation_stats");
 #endif // DEBUG

diff --git a/xray/xrGame/ui/UIMainIngameWnd.cpp b/xray/xrGame/ui/UIMainIngameWnd.cpp
@@ -234,7 +234,7 @@ float UIStaticDiskIO_start_time = 0.0f;
 void CUIMainIngameWnd::Draw()
 {
 	CActor* m_pActor		= smart_cast<CActor*>(Level().CurrentViewEntity());
-#ifdef DEBUG
+#ifndef MASTER_GOLD
 	test_draw				();
 #endif
 	// show IO icon
@@ -444,9 +444,9 @@ void CUIMainIngameWnd::Update()
 
 bool CUIMainIngameWnd::OnKeyboardPress(int dik)
 {
-#ifdef DEBUG
+#ifndef MASTER_GOLD
 	test_key(dik);
-#endif // #ifdef DEBUG
+#endif // #ifndef MASTER_GOLD
 /*
 	if(Level().IR_GetKeyState(DIK_LSHIFT) || Level().IR_GetKeyState(DIK_RSHIFT))
 	{
@@ -741,7 +741,7 @@ void CUIMainIngameWnd::reset_ui()
 void hud_adjust_mode_keyb(int dik);
 void hud_draw_adjust_mode();
 
-#ifdef DEBUG
+#ifndef MASTER_GOLD
 	void attach_adjust_mode_keyb(int dik);
 	void attach_draw_adjust_mode();
 #endif
@@ -753,9 +753,7 @@ TS* pTS = NULL;
 void test_key(int dik)
 {
 	hud_adjust_mode_keyb	(dik);
-#ifdef DEBUG
 	attach_adjust_mode_keyb	(dik);
-#endif
 /*
 	if(dik==DIK_V)
 	{
@@ -789,8 +787,6 @@ void test_key(int dik)
 void test_draw()
 {
 	hud_draw_adjust_mode();
-#ifdef DEBUG
 	attach_draw_adjust_mode();
-#endif
 }