summaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
authorRogier <rogier777@gmail.com>2016-12-13 23:16:26 +0100
committerparamat <mat.gregory@virginmedia.com>2016-12-24 00:32:50 +0000
commit4d4b8bb8a46b6472d86fa848954dbc26b4fadb50 (patch)
tree1f6bff842b0ee81027de44d7c27e16a8e4518bbc /src/content_cao.cpp
parent2f59a0c840e9101c87e2d59fabf34116b3328121 (diff)
downloadminetest-4d4b8bb8a46b6472d86fa848954dbc26b4fadb50.tar.gz
minetest-4d4b8bb8a46b6472d86fa848954dbc26b4fadb50.tar.bz2
minetest-4d4b8bb8a46b6472d86fa848954dbc26b4fadb50.zip
Move PP() and PP2() macros to basic_macros.h
Instead of redefining them everywhere.
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 6b35d5881..a02d5168e 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/numeric.h" // For IntervalLimiter
#include "util/serialize.h"
#include "util/mathconstants.h"
+#include "util/basic_macros.h"
#include "client/tile.h"
#include "environment.h"
#include "collision.h"
@@ -49,8 +50,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class Settings;
struct ToolCapabilities;
-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
-
UNORDERED_MAP<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
SmoothTranslator::SmoothTranslator():