pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 11:26:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from EQEmu/master

Browse Source 
sync
This commit is contained in:
josheb
2013-05-06 14:16:46 -07:00
parent 05d7c12d38 90c7fab452
commit 8e49ab9179
216 changed files with 4167 additions and 4149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/questmgr.h
+4 -4
View File
@@ -34,7 +34,7 @@ public:
QuestManager();
virtual ~QuestManager();
void StartQuest(Mob *_owner, Client *_initiator = NULL, ItemInst* _questitem = NULL);
void StartQuest(Mob *_owner, Client *_initiator = nullptr, ItemInst* _questitem = nullptr);
void EndQuest();
void Process();
@@ -237,7 +237,7 @@ public:
//thing ChooseRandom(array_of_things)
inline Client *GetInitiator() const { return(initiator); }
inline NPC *GetNPC() const { return(owner->IsNPC()?owner->CastToNPC():NULL); }
inline NPC *GetNPC() const { return(owner->IsNPC()?owner->CastToNPC():nullptr); }
inline Mob *GetOwner() const { return(owner); }
inline ItemInst *GetQuestItem() const {return questitem; }
inline bool ProximitySayInUse() { return HaveProximitySays; }
@@ -260,9 +260,9 @@ public:
inline uint16 GetMana(uint32 spell_id) { return( spells[spell_id].mana); }
protected:
Mob *owner; //NPC is never NULL when functions are called.
Mob *owner; //NPC is never nullptr when functions are called.
Client *initiator; //this can be null.
ItemInst* questitem; // this is usually NULL.
ItemInst* questitem; // this is usually nullptr.
bool depop_npc; //true if EndQuest should depop the NPC