Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

This commit is contained in:
KimLS
2013-06-22 01:32:41 -07:00
parent 7af04798fb
commit 2529a7700e
42 changed files with 426 additions and 859 deletions
+1 -8
View File
@@ -44,7 +44,6 @@ class Client;
#include "merc.h"
#include "zone.h"
#include "AA.h"
#include "updatemgr.h"
#include "questmgr.h"
#include "QGlobals.h"
@@ -838,9 +837,6 @@ public:
void EnableTitle(int titleset);
void RemoveTitle(int titleset);
#ifdef PACKET_UPDATE_MANAGER
inline UpdateManager *GetUpdateManager() { return(&update_manager); }
#endif
void EnteringMessages(Client* client);
void SendRules(Client* client);
std::list<std::string> consent_list;
@@ -1124,6 +1120,7 @@ public:
void TryItemTick(int slot);
void ItemTimerCheck();
void TryItemTimer(int slot);
void SendItemScale(ItemInst *inst);
int16 GetActSTR() { return( std::min(GetMaxSTR(), GetSTR()) ); }
int16 GetActSTA() { return( std::min(GetMaxSTA(), GetSTA()) ); }
@@ -1356,10 +1353,6 @@ private:
#endif
Timer tribute_timer;
#ifdef PACKET_UPDATE_MANAGER
UpdateManager update_manager;
#endif
Timer proximity_timer;
Timer TaskPeriodic_Timer;
Timer charm_update_timer;