diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2020-04-11 11:22:15 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-04-11 16:07:17 +0200 |
| commit | 5146086a64d5eeb480948d612a008a2ec81455d4 (patch) | |
| tree | 924bc1191cd251cd48d7f41e7d9b02577985eadf /build | |
| parent | 894a34aef48024a752a1ef151d046955d83858d0 (diff) | |
| download | minetest-5146086a64d5eeb480948d612a008a2ec81455d4.tar.gz minetest-5146086a64d5eeb480948d612a008a2ec81455d4.tar.bz2 minetest-5146086a64d5eeb480948d612a008a2ec81455d4.zip | |
Drop content_sao.{cpp,h}
Move LuaEntitySAO to a new dedicated file
Drop TestSAO (useless object)
Drop the old static startup initialized SAO factory, which was pretty useless.
This factory was using a std::map for 2 elements, now just use a simple condition owned by ServerEnvironment, which will be lightweight, that will also drop a one time useful test on each LuaEntitySAO creation. This should reduce server load on massive SAO creation
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 32a16c174..fdbfba9bc 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -161,7 +161,6 @@ LOCAL_SRC_FILES := \ jni/src/content/mods.cpp \ jni/src/content_nodemeta.cpp \ jni/src/content/packages.cpp \ - jni/src/content_sao.cpp \ jni/src/content/subgames.cpp \ jni/src/convert_json.cpp \ jni/src/craftdef.cpp \ @@ -258,8 +257,11 @@ LOCAL_SRC_FILES := \ jni/src/server.cpp \ jni/src/serverenvironment.cpp \ jni/src/serverlist.cpp \ + jni/src/server/luaentity_sao.cpp \ jni/src/server/mods.cpp \ + jni/src/server/player_sao.cpp \ jni/src/server/serveractiveobject.cpp \ + jni/src/server/unit_sao.cpp \ jni/src/settings.cpp \ jni/src/staticobject.cpp \ jni/src/tileanimation.cpp \ |