diff options
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/environment.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..2e62a4e59 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.cpp diff=cpp +*.h diff=cpp diff --git a/.gitignore b/.gitignore index f0c372ab7..99ea36f78 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ src/jthread/CMakeFiles/* src/jthread/Makefile src/jthread/cmake_config.h src/jthread/cmake_install.cmake +.*.swp minetest.conf bin/ CMakeCache.txt diff --git a/src/environment.cpp b/src/environment.cpp index e293eb511..2349852f2 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1191,7 +1191,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object, delete object; return 0; } - /*dstream<<"INGO: ServerEnvironment::addActiveObjectRaw(): " + /*dstream<<"INFO: ServerEnvironment::addActiveObjectRaw(): " <<"added (id="<<object->getId()<<")"<<std::endl;*/ m_active_objects.insert(object->getId(), object); @@ -1792,7 +1792,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object) delete object; return 0; } - dstream<<"INGO: ClientEnvironment::addActiveObject(): " + dstream<<"INFO: ClientEnvironment::addActiveObject(): " <<"added (id="<<object->getId()<<")"<<std::endl; m_active_objects.insert(object->getId(), object); object->addToScene(m_smgr); |