Changed: #1469 Message for sound triggers

--HG--
branch : gsoc2012-fabien

code/ryzom/client/src/camera_animation_manager/camera_animation_step_player_factory.cpp

@@ -21,6 +21,9 @@ std::vector<std::pair<std::string, ICameraAnimationStepPlayerFactory*> >* ICamer
 
 ICameraAnimationStepPlayer* ICameraAnimationStepPlayerFactory::initStep(const std::string& name, NLMISC::CBitMemStream& impulse)
 {
+	if (!Entries)
+		return NULL;
+
 	// We search the correct step type in our entries
 	for (uint i = 0; i < Entries->size(); i++)
 	{

code/ryzom/client/src/net_manager.cpp

@@ -3768,7 +3768,7 @@ void initializeNetwork()
 	GenericMsgHeaderMngr.setCallback( "NPC_ICON:SVR_EVENT_MIS_AVL",	impulseServerEventForMissionAvailability );
 	GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_TIMER",			impulseSetNpcIconTimer );
 
-	GenericMsgHeaderMngr.setCallback( "SOUND_TRIGGER:PLAY",			impulsePlaySoundTrigger );
+	GenericMsgHeaderMngr.setCallback( "SOUND_TRIGGER",			impulsePlaySoundTrigger );
 
 	GenericMsgHeaderMngr.setCallback( "CAMERA_ANIMATION:PLAY",		impulseCameraAnimationPlay );
 	GenericMsgHeaderMngr.setCallback( "CAMERA_ANIMATION:STEP",		impulseCameraAnimationStep );

code/ryzom/common/data_common/msg.xml

@@ -1170,8 +1170,6 @@
 	<leaf name="STEP"
 		  description="Sends a camera animation instruction to the client. The first parameter is the name of the animation. Next parameters depends on the animation type" />
   </branch>
-  <branch name="SOUND_TRIGGER">
-	<leaf name="PLAY"
+	<leaf name="SOUND_TRIGGER"
 		  description="Ask the client to play a sound at a given position or entity position. The parameters are the sound id and the position or the entity" />
-  </branch>
 </client_messages_description>

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

@@ -5495,7 +5495,7 @@ class CMissionActionSoundTrigger : public IMissionAction
 		{
 			// We send the message
 			CEntityId eid = TheDataset.getEntityId(entities[i]);
-			PlayerManager.sendImpulseToClient(eid, "SOUND_TRIGGER:PLAY", _SoundId, pos);
+			PlayerManager.sendImpulseToClient(eid, "SOUND_TRIGGER", _SoundId, pos);
 		}
 	};
 	std::string _SoundPosition;