Changed: #1469 All variables' type representing either a position or an entity to a TPositionOrEntity so that i can easily change what it contains

--HG--
branch : gsoc2012-fabien
hg/feature/gsoc2012-fabien
Fabien_HENON 13 years ago
parent 2334512d63
commit 0451f31350

@ -16,6 +16,7 @@
// //
#include "camera_animation_manager/camera_animation_modifier_factory.h" #include "camera_animation_manager/camera_animation_modifier_factory.h"
#include "camera_animation_manager/position_or_entity_type.h"
#include "nel/misc/sheet_id.h" #include "nel/misc/sheet_id.h"
@ -63,7 +64,7 @@ CAMERA_ANIMATION_REGISTER_MODIFIER(CCameraAnimationModifierShake, "camera_modifi
class CCameraAnimationModifierSoundTrigger : public ICameraAnimationModifier class CCameraAnimationModifierSoundTrigger : public ICameraAnimationModifier
{ {
protected: protected:
std::string SoundPos; TPositionOrEntity SoundPos;
NLMISC::CSheetId SoundId; NLMISC::CSheetId SoundId;
public: public:

@ -16,8 +16,8 @@
// //
#include "camera_animation_manager/camera_animation_step_factory.h" #include "camera_animation_manager/camera_animation_step_factory.h"
#include "camera_animation_manager/position_or_entity_type.h"
typedef std::string TPositionOrEntity;
/// Basic camera animation step that has generic values /// Basic camera animation step that has generic values
/// - look_at_position /// - look_at_position

@ -0,0 +1,22 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RY_POSITIONORENTITYTYPE_H
#define RY_POSITIONORENTITYTYPE_H
typedef std::string TPositionOrEntity;
#endif /* RY_POSITIONORENTITYTYPE_H */

@ -57,6 +57,7 @@
#include "server_share/log_item_gen.h" #include "server_share/log_item_gen.h"
#include "server_share/log_character_gen.h" #include "server_share/log_character_gen.h"
#include "camera_animation_manager/camera_animation_manager.h" #include "camera_animation_manager/camera_animation_manager.h"
#include "camera_animation_manager/position_or_entity_type.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
@ -5485,7 +5486,7 @@ class CMissionActionSoundTrigger : public IMissionAction
PlayerManager.sendImpulseToClient(eid, "SOUND_TRIGGER:PLAY", _SoundId, _SoundPosition); PlayerManager.sendImpulseToClient(eid, "SOUND_TRIGGER:PLAY", _SoundId, _SoundPosition);
} }
}; };
std::string _SoundPosition; TPositionOrEntity _SoundPosition;
NLMISC::CSheetId _SoundId; NLMISC::CSheetId _SoundId;
MISSION_ACTION_GETNEWPTR(CMissionActionSoundTrigger) MISSION_ACTION_GETNEWPTR(CMissionActionSoundTrigger)

Loading…
Cancel
Save