summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorVitaliy <silverunicorn2011@yandex.ru>2018-04-03 09:23:46 +0300
committerLoïc Blot <nerzhul@users.noreply.github.com>2018-04-03 08:23:46 +0200
commit528908a4c3dd190cb7a6007df1e3fcd8e4604bfa (patch)
treeecec86bd3388301bd67e2eb8e597f37b328f6764 /util
parent2481ea27ce0f423f3e6f3522539d20e1500cf572 (diff)
downloadminetest-528908a4c3dd190cb7a6007df1e3fcd8e4604bfa.tar.gz
minetest-528908a4c3dd190cb7a6007df1e3fcd8e4604bfa.tar.bz2
minetest-528908a4c3dd190cb7a6007df1e3fcd8e4604bfa.zip
Optimize entity-entity collision (#6587)
* Add IrrLicht type aliases * Add hash for IrrLicht vector * Add object map
Diffstat (limited to 'util')
-rw-r--r--util/travis/clang-format-whitelist.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 8f3b0ee6c..e0da7173f 100644
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -311,8 +311,7 @@ src/script/scripting_server.cpp
src/script/scripting_server.h
src/serialization.cpp
src/serialization.h
-src/serveractiveobjectmap.cpp
-src/serveractiveobjectmap.h
+src/server/serveractiveobjectmap.cpp
src/server.cpp
src/serverenvironment.cpp
src/serverenvironment.h