reorganized a lot of stuff and modified mapgen and objects slightly while doing it

[dragonfireclient.git] / src / content_inventory.cpp

diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index 3b72b31f1a21f72def7f4ab39b72b5c69ab29d97..ac48a619550fe414118626e9f56c515824093074 100644 (file)
--- 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)
 {