pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 15:38:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for potential nullptr when using base lua class constructors in debug mode, also added eq.get_qglobals and removed automatic export of them (will do this for a lot of other automatic exports)

Browse Source
This commit is contained in:
KimLS
2013-06-04 16:48:32 -07:00
parent 85c7e1b059
commit 1b290b577d
16 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_parser.cpp
-27
View File
@@ -27,7 +27,6 @@
#include "lua_object.h"
#include "lua_door.h"
#include "lua_general.h"
#include "QGlobals.h"
#include "questmgr.h"
#include "zone.h"
#include "lua_parser.h"
@@ -229,7 +228,6 @@ int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, M
arg_function(this, L, npc, init, data, extra_data);
ExportZoneVariables();
Client *c = (init && init->IsClient()) ? init->CastToClient() : nullptr;
ExportQGlobals(npc, c);
quest_manager.StartQuest(npc, c, nullptr);
if(lua_pcall(L, 1, 1, 0)) {
@@ -320,7 +318,6 @@ int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *
auto arg_function = PlayerArgumentDispatch[evt];
arg_function(this, L, client, data, extra_data);
ExportZoneVariables();
ExportQGlobals(nullptr, client);
quest_manager.StartQuest(nullptr, client, nullptr);
if(lua_pcall(L, 1, 1, 0)) {
@@ -416,7 +413,6 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
auto arg_function = ItemArgumentDispatch[evt];
arg_function(this, L, client, item, objid, extra_data);
ExportZoneVariables();
ExportQGlobals(nullptr, nullptr);
quest_manager.StartQuest(nullptr, client, item);
if(lua_pcall(L, 1, 1, 0)) {
@@ -498,7 +494,6 @@ int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, NPC* npc,
auto arg_function = SpellArgumentDispatch[evt];
arg_function(this, L, npc, client, spell_id, extra_data);
ExportZoneVariables();
ExportQGlobals(npc, client);
quest_manager.StartQuest(npc, client, nullptr);
if(lua_pcall(L, 1, 1, 0)) {
@@ -560,7 +555,6 @@ int LuaParser::_EventEncounter(std::string package_name, QuestEventID evt, std::
lua_setfield(L, -2, "name");
ExportZoneVariables();
ExportQGlobals(nullptr, nullptr);
quest_manager.StartQuest(nullptr, nullptr, nullptr);
if(lua_pcall(L, 1, 1, 0)) {
@@ -961,27 +955,6 @@ void LuaParser::DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, u
}
}
void LuaParser::ExportQGlobals(NPC *n, Client *c) {
lua_createtable(L, 0, 0);
if(n && !n->GetQglobal()) {
lua_setfield(L, -2, "qglobals");
return;
}
std::list<QGlobal> global_map;
QGlobalCache::GetQGlobals(global_map, n, c, zone);
auto iter = global_map.begin();
while(iter != global_map.end()) {
lua_pushstring(L, (*iter).value.c_str());
lua_setfield(L, -2, (*iter).name.c_str());
++iter;
}
lua_setfield(L, -2, "qglobals");
}
void LuaParser::ExportZoneVariables() {
if(zone == nullptr) {
return;