aboutsummaryrefslogtreecommitdiff
path: root/src/content_inventory.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-06-26 15:48:56 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-06-26 15:48:56 +0300
commit91cfbe2891a3fbec2aac019ccfba74b667d94fc4 (patch)
tree21ab12f020d71dc7c1534e16d2b295bdd322969e /src/content_inventory.cpp
parent3b098fd5dc1a3e05d671b3ec1a9acb20a036b88f (diff)
downloadminetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.tar.gz
minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.tar.bz2
minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.zip
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
Diffstat (limited to 'src/content_inventory.cpp')
-rw-r--r--src/content_inventory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index 3b72b31f1..ac48a6195 100644
--- a/src/content_inventory.cpp
+++ b/src/content_inventory.cpp
@@ -19,8 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_inventory.h"
#include "inventory.h"
-#include "serverobject.h"
#include "content_mapnode.h"
+//#include "serverobject.h"
+#include "content_sao.h"
bool item_material_is_cookable(u8 content)
{