Merge pull request #3 from EQEmu/master

sync
This commit is contained in:
josheb
2013-05-06 14:16:46 -07:00
216 changed files with 4167 additions and 4149 deletions
+2 -2
View File
@@ -248,8 +248,8 @@ public:
bool IsSpellBlocked(uint32 spell_id, float nx, float ny, float nz);
const char *GetSpellBlockedMessage(uint32 spell_id, float nx, float ny, float nz);
int GetTotalBlockedSpells() { return totalBS; }
inline bool HasMap() { return zonemap != NULL; }
inline bool HasWaterMap() { return watermap != NULL; }
inline bool HasMap() { return zonemap != nullptr; }
inline bool HasWaterMap() { return watermap != nullptr; }
QGlobalCache *GetQGlobals() { return qGlobals; }
QGlobalCache *CreateQGlobals() { qGlobals = new QGlobalCache(); return qGlobals; }