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

Merge from master

Browse Source
This commit is contained in:
KimLS
2013-05-23 12:50:34 -07:00
parent ce63503bab 815c3dc73f
commit a3e24b6854
214 changed files with 2422 additions and 2373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/questmgr.h
+4 -5
View File
@@ -24,7 +24,6 @@
#include <string>
#include <list>
#include <stack>
using namespace std;
class NPC;
class Client;
@@ -258,9 +257,9 @@ private:
class QuestTimer {
public:
inline QuestTimer(int duration, Mob *_mob, string _name) : mob(_mob), name(_name), Timer_(duration) { Timer_.Start(duration, false); }
inline QuestTimer(int duration, Mob *_mob, std::string _name) : mob(_mob), name(_name), Timer_(duration) { Timer_.Start(duration, false); }
Mob* mob;
string name;
std::string name;
Timer Timer_;
};
class SignalTimer {
@@ -270,8 +269,8 @@ private:
int signal_id;
Timer Timer_;
};
list<QuestTimer> QTimerList;
list<SignalTimer> STimerList;
std::list<QuestTimer> QTimerList;
std::list<SignalTimer> STimerList;
};