From fcfc86c83edd29fa651f423a18bbd5e3b7ba73ee Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 18 Nov 2019 07:36:34 +0800
Subject: [PATCH] Disable teleport fx, since we will not have allegiance. May
 be better to have it depend on the teleport ticket type

---
 .../player_manager/character_inventory_manipulation.cpp       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
index 9c89d85a3..9299f6504 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
@@ -2936,6 +2936,7 @@ void CCharacter::useItem(uint32 slot)
 				_TpTicketSlot = slot;
 				lockItem( INVENTORIES::bag, slot, 1 );
 
+#ifdef RYZOM_FORGE
 				// add fx
 				CMirrorPropValue<TYPE_VISUAL_FX> visualFx( TheDataset, _EntityRowId, DSPropertyVISUAL_FX );
 				CVisualFX fx;
@@ -2964,6 +2965,7 @@ void CCharacter::useItem(uint32 slot)
 				sint64 prop;
 				fx.pack(prop);
 				visualFx = (sint16)prop;
+#endif
 
 				// add tp phrase in manager
 				static CSheetId tpBrick("bapa01.sbrick");
@@ -3041,6 +3043,7 @@ void CCharacter::useTeleport(const CStaticItem & form)
 	}
 	else
 	{	
+#ifdef RYZOM_FORGE
 		CMirrorPropValue<TYPE_VISUAL_FX> visualFx( TheDataset, _EntityRowId, DSPropertyVISUAL_FX );
 		CVisualFX fx;
 		fx.unpack(visualFx.getValue());
@@ -3048,6 +3051,7 @@ void CCharacter::useTeleport(const CStaticItem & form)
 		sint64 prop;
 		fx.pack(prop);
 		visualFx = (sint16)prop;
+#endif
 		sint32 x,y,z;
 		float theta;
 		zone->getRandomPoint( x,y,z,theta );