introduce changes from streamside fork

This commit is contained in:
ErikasKontenis
2019-09-16 20:38:16 +03:00
parent f2cbc2dc1c
commit ad03b0eb3e
162 changed files with 2485 additions and 698 deletions

View File

@@ -1,6 +1,6 @@
/**
* Tibia GIMUD Server - a free and open-source MMORPG server emulator
* Copyright (C) 2017 Alejandro Mujica <alejandrodemujica@gmail.com>
* Copyright (C) 2019 Sabrehaven and Mark Samman <mark.samman@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -27,10 +27,12 @@
#include "spells.h"
#include "movement.h"
#include "globalevent.h"
#include "events.h"
Actions* g_actions = nullptr;
CreatureEvents* g_creatureEvents = nullptr;
Chat* g_chat = nullptr;
Events* g_events = nullptr;
GlobalEvents* g_globalEvents = nullptr;
Spells* g_spells = nullptr;
TalkActions* g_talkActions = nullptr;
@@ -40,6 +42,7 @@ extern LuaEnvironment g_luaEnvironment;
ScriptingManager::~ScriptingManager()
{
delete g_events;
delete g_spells;
delete g_actions;
delete g_talkActions;
@@ -93,5 +96,12 @@ bool ScriptingManager::loadScriptSystems()
return false;
}
g_events = new Events();
if (!g_events->load()) {
std::cout << "> ERROR: Unable to load events!" << std::endl;
return false;
}
return true;
}