pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-04 18:46:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wp_master

Browse Source
This commit is contained in:
KimLS
2018-05-02 18:24:19 -07:00
parent dde3f603be 4fe6836cf0
commit 51a006654a
21 changed files with 317 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/questmgr.h
+10
View File
@@ -41,6 +41,12 @@ class QuestManager {
bool depop_npc;
std::string encounter;
};
struct PausedTimer {
Mob * owner;
std::string name;
uint32 time;
};
public:
QuestManager();
virtual ~QuestManager();
@@ -82,6 +88,9 @@ public:
void stopalltimers();
void stopalltimers(EQEmu::ItemInstance *inst);
void stopalltimers(Mob *mob);
void pausetimer(const char *timer_name);
void resumetimer(const char *timer_name);
bool ispausedtimer(const char *timer_name);
void emote(const char *str);
void shout(const char *str);
void shout2(const char *str);
@@ -302,6 +311,7 @@ private:
};
std::list<QuestTimer> QTimerList;
std::list<SignalTimer> STimerList;
std::list<PausedTimer> PTimerList;
size_t item_timers;
};