voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 20:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: commands repository not reset before world open

Browse source
This commit is contained in:
MihailRis 2024-11-24 12:54:05 +03:00
parent 9ed80ec835
commit 1a00a91b60
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/engine.cpp
View file

@ -362,6 +362,7 @@ void Engine::loadContent() {
load_configs(pack.folder); load_configs(pack.folder);
} }
content = contentBuilder.build(); content = contentBuilder.build();
interpreter->reset();
scripting::on_content_load(content.get()); scripting::on_content_load(content.get());
ContentLoader::loadScripts(*content); ContentLoader::loadScripts(*content);

9
src/logic/CommandsInterpreter.hpp
View file

@ -125,6 +125,10 @@ namespace cmd {
const std::unordered_map<std::string, Command>& getCommands() const { const std::unordered_map<std::string, Command>& getCommands() const {
return commands; return commands;
} }
void clear() {
commands.clear();
}
}; };
class CommandsInterpreter { class CommandsInterpreter {
@ -158,5 +162,10 @@ namespace cmd {
CommandsRepository* getRepository() const { CommandsRepository* getRepository() const {
return repository.get(); return repository.get();
} }
void reset() {
repository->clear();
variables.clear();
}
}; };
} }

2
src/logic/scripting/scripting.cpp
View file

@ -68,7 +68,6 @@ void scripting::initialize(Engine* engine) {
lua::initialize(*engine->getPaths()); lua::initialize(*engine->getPaths());
load_script(fs::path("stdlib.lua"), true); load_script(fs::path("stdlib.lua"), true);
load_script(fs::path("stdcmd.lua"), true);
load_script(fs::path("classes.lua"), true); load_script(fs::path("classes.lua"), true);
} }
@ -172,6 +171,7 @@ void scripting::on_content_load(Content* content) {
lua::setfield(L, "materials"); lua::setfield(L, "materials");
lua::pop(L); lua::pop(L);
} }
load_script(fs::path("stdcmd.lua"), true);
} }
void scripting::on_world_load(LevelController* controller) { void scripting::on_world_load(LevelController* controller) {