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 branch 'master' of https://github.com/EQEmu/Server into EQEmu-master

Browse Source 
Conflicts:
	zone/client.h
	zone/mod_functions.cpp
	zone/mod_functions_base.cpp
This commit is contained in:
root
2013-06-01 19:17:23 -05:00
parent ac5926bdfe 39426789f4
commit 7fca5a7a89
231 changed files with 2955 additions and 3061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.h
+4 -5
View File
@@ -25,7 +25,6 @@ class NPC;
#include <list>
#include <deque>
using namespace std;
#include "spawn2.h"
#include "../common/loottable.h"
@@ -256,7 +255,7 @@ public:
void ResumeWandering();
void PauseWandering(int pausetime);
void MoveTo(float mtx, float mty, float mtz, float mth, bool saveguardspot);
void GetClosestWaypoint(list<wplist> &wp_list, int count, float m_x, float m_y, float m_z);
void GetClosestWaypoint(std::list<wplist> &wp_list, int count, float m_x, float m_y, float m_z);
uint32 GetEquipment(uint8 material_slot) const; // returns item id
int32 GetEquipmentMaterial(uint8 material_slot) const;
@@ -467,7 +466,7 @@ protected:
NPCType* NPCTypedata_ours; //special case for npcs with uniquely created data.
friend class EntityList;
list<struct NPCFaction*> faction_list;
std::list<struct NPCFaction*> faction_list;
uint32 copper;
uint32 silver;
uint32 gold;
@@ -516,10 +515,10 @@ protected:
bool npc_aggro;
deque<int> signal_q;
std::deque<int> signal_q;
//waypoint crap:
vector<wplist> Waypoints;
std::vector<wplist> Waypoints;
void _ClearWaypints();
int max_wp;
int save_wp;