diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2023-05-15 14:45:05 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2023-05-15 14:45:05 +0200 |
| commit | f395960adeea1f51f01ec8045d1e175926a6ea4a (patch) | |
| tree | bf9d107fb5891c3e6bd0abeb4d49573c73230707 /src/scripting | |
| parent | f3071beef3ddd93bbe3ab6e30c14fc95a5112b9c (diff) | |
| download | manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.tar.gz manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.tar.bz2 manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.tar.xz manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.zip | |
General code cleanups
* Overall includes cleanup
* Use std::make_pair
* Make some functions const
Diffstat (limited to 'src/scripting')
| -rw-r--r-- | src/scripting/lua.cpp | 3 | ||||
| -rw-r--r-- | src/scripting/luautil.cpp | 7 | ||||
| -rw-r--r-- | src/scripting/scriptmanager.cpp | 1 | ||||
| -rw-r--r-- | src/scripting/scriptmanager.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index 8b92ecd4..ce2ee95f 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -24,7 +24,9 @@ #include "common/defines.h" #include "common/resourcemanager.h" +#include "game-server/abilitycomponent.h" #include "game-server/accountconnection.h" +#include "game-server/being.h" #include "game-server/buysell.h" #include "game-server/charactercomponent.h" #include "game-server/collisiondetection.h" @@ -50,7 +52,6 @@ #include "scripting/luascript.h" #include "scripting/scriptmanager.h" #include "utils/logger.h" -#include "utils/speedconv.h" #include <cstring> #include <cmath> diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp index c737aad9..99b92960 100644 --- a/src/scripting/luautil.cpp +++ b/src/scripting/luautil.cpp @@ -23,11 +23,12 @@ #include <cstring> -#include "game-server/charactercomponent.h" +#include "game-server/actorcomponent.h" +#include "game-server/being.h" +#include "game-server/entity.h" #include "game-server/itemmanager.h" #include "game-server/monster.h" #include "game-server/monstermanager.h" -#include "game-server/npc.h" #include "utils/logger.h" @@ -299,7 +300,7 @@ AbilityManager::AbilityInfo *checkAbility(lua_State *s, int p) AttributeInfo *checkAttribute(lua_State *s, int p) { - AttributeInfo *attributeInfo; + AttributeInfo *attributeInfo = nullptr; switch (lua_type(s, p)) { diff --git a/src/scripting/scriptmanager.cpp b/src/scripting/scriptmanager.cpp index 06b9b761..9abf3ebb 100644 --- a/src/scripting/scriptmanager.cpp +++ b/src/scripting/scriptmanager.cpp @@ -22,6 +22,7 @@ #include "common/configuration.h" #include "scripting/script.h" +#include "utils/logger.h" static Script *_currentState; diff --git a/src/scripting/scriptmanager.h b/src/scripting/scriptmanager.h index 293b1dab..0347774e 100644 --- a/src/scripting/scriptmanager.h +++ b/src/scripting/scriptmanager.h @@ -21,7 +21,8 @@ #ifndef SCRIPTMANAGER_H #define SCRIPTMANAGER_H -#include "game-server/charactercomponent.h" +#include "common/inventorydata.h" +#include "game-server/entity.h" #include <string> |