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
@@ -320,6 +320,7 @@ class LuaScriptInterface
}
static std::string getString(lua_State* L, int32_t arg);
static CombatDamage getCombatDamage(lua_State* L);
static Position getPosition(lua_State* L, int32_t arg, int32_t& stackpos);
static Position getPosition(lua_State* L, int32_t arg);
static Outfit_t getOutfit(lua_State* L, int32_t arg);
@@ -368,6 +369,7 @@ class LuaScriptInterface
// Push
static void pushBoolean(lua_State* L, bool value);
static void pushCombatDamage(lua_State* L, const CombatDamage& damage);
static void pushPosition(lua_State* L, const Position& position, int32_t stackpos = 0);
static void pushOutfit(lua_State* L, const Outfit_t& outfit);
@@ -549,6 +551,8 @@ class LuaScriptInterface
static int luaGameStartRaid(lua_State* L);
static int luaGameReload(lua_State* L);
// Variant
static int luaVariantCreate(lua_State* L);
@@ -749,10 +753,6 @@ class LuaScriptInterface
static int luaCreatureGetMaxHealth(lua_State* L);
static int luaCreatureSetMaxHealth(lua_State* L);
static int luaCreatureGetMana(lua_State* L);
static int luaCreatureAddMana(lua_State* L);
static int luaCreatureGetMaxMana(lua_State* L);
static int luaCreatureGetSkull(lua_State* L);
static int luaCreatureSetSkull(lua_State* L);
@@ -809,6 +809,9 @@ class LuaScriptInterface
static int luaPlayerGetMagicLevel(lua_State* L);
static int luaPlayerGetBaseMagicLevel(lua_State* L);
static int luaPlayerGetMana(lua_State* L);
static int luaPlayerAddMana(lua_State* L);
static int luaPlayerGetMaxMana(lua_State* L);
static int luaPlayerSetMaxMana(lua_State* L);
static int luaPlayerGetManaSpent(lua_State* L);
static int luaPlayerAddManaSpent(lua_State* L);
@@ -1011,6 +1014,7 @@ class LuaScriptInterface
static int luaHouseGetOwnerGuid(lua_State* L);
static int luaHouseSetOwnerGuid(lua_State* L);
static int luaHouseStartTrade(lua_State* L);
static int luaHouseGetBeds(lua_State* L);
static int luaHouseGetBedCount(lua_State* L);
@@ -1082,6 +1086,7 @@ class LuaScriptInterface
static int luaCombatSetArea(lua_State* L);
static int luaCombatSetCondition(lua_State* L);
static int luaCombatSetCallback(lua_State* L);
static int luaCombatSetOrigin(lua_State* L);
static int luaCombatExecute(lua_State* L);