diff options
| author | sapier <Sapier at GMX dot net> | 2013-05-25 00:51:02 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2013-05-25 00:51:02 +0200 |
| commit | ab433775777c4f5055bcf4d2a1cffc506c4f9961 (patch) | |
| tree | 9f80c74c95cbb1efa15c0c36df8d5e35235e5554 /src/emerge.cpp | |
| parent | 865f380c91ced850d1a499c91aa2ab5489624802 (diff) | |
| download | minetest-ab433775777c4f5055bcf4d2a1cffc506c4f9961.tar.gz minetest-ab433775777c4f5055bcf4d2a1cffc506c4f9961.tar.bz2 minetest-ab433775777c4f5055bcf4d2a1cffc506c4f9961.zip | |
Move scriptapi to separate folder (by sapier)
On the lua side, notably minetest.env:<function>(<args>) should now
be replaced by minetest.<function>(<args>).
The old way is and will stay supported for a long time.
Also:
Update and clean up lua_api.txt (by celeron55)
Move EnvRef to lua and remove add_rat and add_firefly (by kahrl)
Add separate src/util/CMakeLists.txt, other minor fixes (by kahrl)
Diffstat (limited to 'src/emerge.cpp')
| -rw-r--r-- | src/emerge.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index b31a942e3..fd6c0e91f 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -32,8 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock.h" #include "serverobject.h" #include "settings.h" -#include "script.h" -#include "scriptapi.h" +#include "cpp_api/scriptapi.h" #include "profiler.h" #include "log.h" #include "nodedef.h" @@ -418,7 +417,7 @@ void *EmergeThread::Thread() { ign(&m_server->m_ignore_map_edit_events_area, VoxelArea(minp, maxp)); { // takes about 90ms with -O1 on an e3-1230v2 - scriptapi_environment_on_generated(m_server->m_lua, + SERVER_TO_SA(m_server)->environment_OnGenerated( minp, maxp, emerge->getBlockSeed(minp)); } |