Changed: #1469 location of position_or_entity_type.h because it's also used by the client +

Added: #1469 Declaration of impulses in the client

--HG--
branch : gsoc2012-fabien

code/ryzom/client/src/net_manager.cpp

@@ -3556,6 +3556,26 @@ void impulseSetNpcIconTimer(NLMISC::CBitMemStream &impulse)
 	CNPCIconCache::getInstance().setMissionGiverTimer(delay);
 }
 
+void impulsePlaySoundTrigger(NLMISC::CBitMemStream& impulse)
+{
+
+}
+
+void impulseCameraAnimationPlay(NLMISC::CBitMemStream& impulse)
+{
+
+}
+
+void impulseCameraAnimationStep(NLMISC::CBitMemStream& impulse)
+{
+
+}
+
+void impulseCameraAnimationFinished(NLMISC::CBitMemStream& impulse)
+{
+
+}
+
 //-----------------------------------------------
 // initializeNetwork :
 //-----------------------------------------------
@@ -3705,6 +3725,12 @@ void initializeNetwork()
 	GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_DESC",			impulseSetNpcIconDesc );
 	GenericMsgHeaderMngr.setCallback( "NPC_ICON:SVR_EVENT_MIS_AVL",	impulseServerEventForMissionAvailability );
 	GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_TIMER",			impulseSetNpcIconTimer );
+
+	GenericMsgHeaderMngr.setCallback( "SOUND_TRIGGER:PLAY",			impulsePlaySoundTrigger );
+
+	GenericMsgHeaderMngr.setCallback( "CAMERA_ANIMATION:PLAY",		impulseCameraAnimationPlay );
+	GenericMsgHeaderMngr.setCallback( "CAMERA_ANIMATION:STEP",		impulseCameraAnimationStep );
+	GenericMsgHeaderMngr.setCallback( "CAMERA_ANIMATION:FINISHED",	impulseCameraAnimationFinished );
 }
 
 

code/ryzom/server/src/entities_game_service/camera_animation_manager/camera_animation_modifiers.cpp

@@ -16,7 +16,7 @@
 // 
 
 #include "camera_animation_manager/camera_animation_modifier_factory.h"
-#include "camera_animation_manager/position_or_entity_type.h"
+#include "game_share/position_or_entity_type.h"
 
 #include "nel/misc/sheet_id.h"
 

code/ryzom/server/src/entities_game_service/camera_animation_manager/camera_animation_steps.cpp

@@ -16,7 +16,7 @@
 // 
 
 #include "camera_animation_manager/camera_animation_step_factory.h"
-#include "camera_animation_manager/position_or_entity_type.h"
+#include "game_share/position_or_entity_type.h"
 
 
 /// Basic camera animation step that has generic values

code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp

@@ -57,7 +57,8 @@
 #include "server_share/log_item_gen.h"
 #include "server_share/log_character_gen.h"
 #include "camera_animation_manager/camera_animation_manager.h"
-#include "camera_animation_manager/position_or_entity_type.h"
+#include "game_share/position_or_entity_type.h"
+
 
 using namespace std;
 using namespace NLMISC;