the final rename
This commit is contained in:
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "lua_commons.hpp"
|
||||
|
||||
#include "../../../data/dynamic.h"
|
||||
#include "../../../delegates.h"
|
||||
#include "../../../data/dynamic.hpp"
|
||||
#include "../../../delegates.hpp"
|
||||
|
||||
#ifndef LUAJIT_VERSION
|
||||
#error LuaJIT required
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
#include "lua_util.hpp"
|
||||
|
||||
#include "../../../audio/audio.hpp"
|
||||
#include "../../../engine.h"
|
||||
#include "../scripting.h"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../scripting.hpp"
|
||||
|
||||
inline const char* DEFAULT_CHANNEL = "regular";
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "api_lua.hpp"
|
||||
#include "lua_util.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../voxels/Chunks.h"
|
||||
#include "../../../voxels/Chunk.h"
|
||||
#include "../../../voxels/Block.h"
|
||||
#include "../../../voxels/voxel.h"
|
||||
#include "../../../lighting/Lighting.h"
|
||||
#include "../../../content/Content.h"
|
||||
#include "../../../logic/BlocksController.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../../../voxels/Chunks.hpp"
|
||||
#include "../../../voxels/Chunk.hpp"
|
||||
#include "../../../voxels/Block.hpp"
|
||||
#include "../../../voxels/voxel.hpp"
|
||||
#include "../../../lighting/Lighting.hpp"
|
||||
#include "../../../content/Content.hpp"
|
||||
#include "../../../logic/BlocksController.hpp"
|
||||
|
||||
int l_block_name(lua_State* L) {
|
||||
auto indices = scripting::content->getIndices();
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
#include "api_lua.hpp"
|
||||
#include "LuaState.hpp"
|
||||
|
||||
#include "../../../engine.h"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../../../files/settings_io.hpp"
|
||||
#include "../../../files/engine_paths.h"
|
||||
#include "../../../files/engine_paths.hpp"
|
||||
#include "../../../frontend/menu.hpp"
|
||||
#include "../../../frontend/screens/MenuScreen.hpp"
|
||||
#include "../../../logic/LevelController.h"
|
||||
#include "../../../logic/LevelController.hpp"
|
||||
#include "../../../logic/EngineController.hpp"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../../../window/Events.hpp"
|
||||
#include "../../../window/Window.hpp"
|
||||
#include "../../../world/WorldGenerators.h"
|
||||
#include "../scripting.h"
|
||||
#include "../../../world/WorldGenerators.hpp"
|
||||
#include "../scripting.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "api_lua.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../../../engine.h"
|
||||
#include "../../../files/files.h"
|
||||
#include "../../../files/engine_paths.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../../../files/files.hpp"
|
||||
#include "../../../files/engine_paths.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
#include "lua_util.hpp"
|
||||
#include "LuaState.hpp"
|
||||
|
||||
#include "../scripting.h"
|
||||
#include "../../../engine.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../../../assets/Assets.hpp"
|
||||
#include "../../../items/Inventories.h"
|
||||
#include "../../../items/Inventories.hpp"
|
||||
#include "../../../graphics/ui/gui_util.hpp"
|
||||
#include "../../../graphics/ui/elements/UINode.hpp"
|
||||
#include "../../../graphics/ui/elements/Button.hpp"
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "../../../frontend/UiDocument.hpp"
|
||||
#include "../../../frontend/locale.hpp"
|
||||
#include "../../../util/stringutil.hpp"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../world/Level.hpp"
|
||||
|
||||
using namespace gui;
|
||||
|
||||
|
||||
@@ -3,18 +3,18 @@
|
||||
#include "LuaState.hpp"
|
||||
|
||||
#include "../../../assets/Assets.hpp"
|
||||
#include "../../../content/Content.h"
|
||||
#include "../../../engine.h"
|
||||
#include "../../../content/Content.hpp"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../../../frontend/hud.hpp"
|
||||
#include "../../../frontend/UiDocument.hpp"
|
||||
#include "../../../graphics/ui/elements/InventoryView.hpp"
|
||||
#include "../../../items/Inventories.h"
|
||||
#include "../../../logic/BlocksController.h"
|
||||
#include "../../../voxels/Block.h"
|
||||
#include "../../../voxels/Chunks.h"
|
||||
#include "../../../voxels/voxel.h"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../scripting.h"
|
||||
#include "../../../items/Inventories.hpp"
|
||||
#include "../../../logic/BlocksController.hpp"
|
||||
#include "../../../voxels/Block.hpp"
|
||||
#include "../../../voxels/Chunks.hpp"
|
||||
#include "../../../voxels/voxel.hpp"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../scripting.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "api_lua.hpp"
|
||||
#include "lua_commons.hpp"
|
||||
#include "LuaState.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../scripting.hpp"
|
||||
|
||||
#include "../../../window/input.hpp"
|
||||
#include "../../../window/Events.hpp"
|
||||
#include "../../../frontend/screens/Screen.hpp"
|
||||
#include "../../../frontend/hud.hpp"
|
||||
#include "../../../engine.h"
|
||||
#include "../../../engine.hpp"
|
||||
|
||||
namespace scripting {
|
||||
extern lua::LuaState* state;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "api_lua.hpp"
|
||||
#include "lua_util.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../../../content/Content.h"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../items/ItemStack.h"
|
||||
#include "../../../items/Inventories.h"
|
||||
#include "../../../logic/BlocksController.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../content/Content.hpp"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../../../items/ItemStack.hpp"
|
||||
#include "../../../items/Inventories.hpp"
|
||||
#include "../../../logic/BlocksController.hpp"
|
||||
|
||||
static void validate_itemid(lua_State* L, itemid_t id) {
|
||||
if (id >= scripting::indices->countItemDefs()) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "api_lua.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../../../content/Content.h"
|
||||
#include "../../../items/ItemDef.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../content/Content.hpp"
|
||||
#include "../../../items/ItemDef.hpp"
|
||||
|
||||
static int l_item_name(lua_State* L) {
|
||||
auto indices = scripting::content->getIndices();
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "LuaState.hpp"
|
||||
|
||||
#include "../../../coders/json.h"
|
||||
#include "../../../data/dynamic.h"
|
||||
#include "../../../coders/json.hpp"
|
||||
#include "../../../data/dynamic.hpp"
|
||||
|
||||
namespace scripting {
|
||||
extern lua::LuaState* state;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "api_lua.hpp"
|
||||
#include "lua_commons.hpp"
|
||||
|
||||
#include "../scripting.h"
|
||||
#include "../../../engine.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../../../assets/AssetsLoader.hpp"
|
||||
#include "../../../files/engine_paths.h"
|
||||
#include "../../../files/WorldFiles.h"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../world/World.h"
|
||||
#include "../../../files/engine_paths.hpp"
|
||||
#include "../../../files/WorldFiles.hpp"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../../../world/World.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "api_lua.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../objects/Player.h"
|
||||
#include "../../../physics/Hitbox.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../../../objects/Player.hpp"
|
||||
#include "../../../physics/Hitbox.hpp"
|
||||
#include "../../../window/Camera.hpp"
|
||||
#include "../../../items/Inventory.h"
|
||||
#include "../../../items/Inventory.hpp"
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "api_lua.hpp"
|
||||
#include "lua_commons.hpp"
|
||||
#include "../scripting.h"
|
||||
#include "../../../engine.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../engine.hpp"
|
||||
#include "../../../window/Window.hpp"
|
||||
|
||||
static int l_time_uptime(lua_State* L) {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "lua_commons.hpp"
|
||||
#include "api_lua.hpp"
|
||||
|
||||
#include "../scripting.h"
|
||||
#include "../scripting.hpp"
|
||||
#include "../../../assets/Assets.hpp"
|
||||
#include "../../../assets/AssetsLoader.hpp"
|
||||
#include "../../../files/engine_paths.h"
|
||||
#include "../../../world/Level.h"
|
||||
#include "../../../world/World.h"
|
||||
#include "../../../engine.h"
|
||||
#include "../../../files/engine_paths.hpp"
|
||||
#include "../../../world/Level.hpp"
|
||||
#include "../../../world/World.hpp"
|
||||
#include "../../../engine.hpp"
|
||||
|
||||
#include <cmath>
|
||||
#include <filesystem>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef LOGIC_SCRIPTING_LUA_UTIL_H_
|
||||
#define LOGIC_SCRIPTING_LUA_UTIL_H_
|
||||
#ifndef LOGIC_SCRIPTING_LUA_UTIL_HPP_
|
||||
#define LOGIC_SCRIPTING_LUA_UTIL_HPP_
|
||||
|
||||
#include "LuaState.hpp"
|
||||
|
||||
@@ -120,4 +120,4 @@ namespace lua {
|
||||
}
|
||||
}
|
||||
|
||||
#endif // LOGIC_SCRIPTING_LUA_UTIL_H_
|
||||
#endif // LOGIC_SCRIPTING_LUA_UTIL_HPP_
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
#include "scripting.h"
|
||||
#include "scripting.hpp"
|
||||
|
||||
#include "../../content/ContentPack.h"
|
||||
#include "../../content/ContentPack.hpp"
|
||||
#include "../../debug/Logger.hpp"
|
||||
#include "../../engine.h"
|
||||
#include "../../files/engine_paths.h"
|
||||
#include "../../files/files.h"
|
||||
#include "../../engine.hpp"
|
||||
#include "../../files/engine_paths.hpp"
|
||||
#include "../../files/files.hpp"
|
||||
#include "../../frontend/UiDocument.hpp"
|
||||
#include "../../items/Inventory.h"
|
||||
#include "../../items/ItemDef.h"
|
||||
#include "../../logic/BlocksController.h"
|
||||
#include "../../logic/LevelController.h"
|
||||
#include "../../objects/Player.h"
|
||||
#include "../../items/Inventory.hpp"
|
||||
#include "../../items/ItemDef.hpp"
|
||||
#include "../../logic/BlocksController.hpp"
|
||||
#include "../../logic/LevelController.hpp"
|
||||
#include "../../objects/Player.hpp"
|
||||
#include "../../util/stringutil.hpp"
|
||||
#include "../../util/timeutil.h"
|
||||
#include "../../util/timeutil.h"
|
||||
#include "../../voxels/Block.h"
|
||||
#include "../../world/Level.h"
|
||||
#include "../../util/timeutil.hpp"
|
||||
#include "../../util/timeutil.hpp"
|
||||
#include "../../voxels/Block.hpp"
|
||||
#include "../../world/Level.hpp"
|
||||
#include "lua/LuaState.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
#include "../../data/dynamic.h"
|
||||
#include "../../typedefs.h"
|
||||
#include "../../delegates.h"
|
||||
#ifndef LOGIC_SCRIPTING_SCRIPTING_HPP_
|
||||
#define LOGIC_SCRIPTING_SCRIPTING_HPP_
|
||||
|
||||
#include "scripting_functional.h"
|
||||
#include "../../data/dynamic.hpp"
|
||||
#include "../../typedefs.hpp"
|
||||
#include "../../delegates.hpp"
|
||||
|
||||
#include "scripting_functional.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
@@ -110,3 +113,5 @@ namespace scripting {
|
||||
/// @brief Finalize lua state. Using scripting after will lead to Lua panic
|
||||
void close();
|
||||
}
|
||||
|
||||
#endif // LOGIC_SCRIPTING_SCRIPTING_HPP_
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "scripting_functional.h"
|
||||
#include "scripting_functional.hpp"
|
||||
|
||||
#include "lua/LuaState.hpp"
|
||||
#include "../../debug/Logger.hpp"
|
||||
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
#ifndef LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_H_
|
||||
#define LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_H_
|
||||
#ifndef LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
|
||||
#define LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <string>
|
||||
#include "../../typedefs.h"
|
||||
#include "../../delegates.h"
|
||||
#include "../../typedefs.hpp"
|
||||
#include "../../delegates.hpp"
|
||||
|
||||
namespace scripting {
|
||||
runnable create_runnable(
|
||||
@@ -68,4 +68,4 @@ namespace scripting {
|
||||
);
|
||||
}
|
||||
|
||||
#endif // LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_H_
|
||||
#endif // LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
|
||||
@@ -1,14 +1,14 @@
|
||||
#include "scripting_hud.hpp"
|
||||
#include "scripting.h"
|
||||
#include "scripting.hpp"
|
||||
|
||||
#include "lua/api_lua.hpp"
|
||||
#include "lua/LuaState.hpp"
|
||||
|
||||
#include "../../debug/Logger.hpp"
|
||||
#include "../../frontend/hud.hpp"
|
||||
#include "../../objects/Player.h"
|
||||
#include "../../files/files.h"
|
||||
#include "../../engine.h"
|
||||
#include "../../objects/Player.hpp"
|
||||
#include "../../files/files.hpp"
|
||||
#include "../../engine.hpp"
|
||||
|
||||
namespace scripting {
|
||||
extern lua::LuaState* state;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
|
||||
#define LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
|
||||
|
||||
#include "../../typedefs.h"
|
||||
#include "../../typedefs.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
|
||||
Reference in New Issue
Block a user