summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-07-09 09:00:28 +0200
committerlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-07-09 09:00:28 +0200
commit4b62d1c4631088eb0181048af2d57d67ab9f602e (patch)
treedf7333fa82b36fff8647d1ebea44f73ed274b266 /source
parentSquirrel Plugins (diff)
downloadcuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.tar
cuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.tar.gz
cuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.tar.bz2
cuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.tar.lz
cuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.tar.xz
cuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.tar.zst
cuberite-4b62d1c4631088eb0181048af2d57d67ab9f602e.zip
Diffstat (limited to 'source')
-rw-r--r--source/AllToLua.pkg2
-rw-r--r--source/Bindings.cpp2
-rw-r--r--source/BlockArea.cpp (renamed from source/cBlockArea.cpp)2
-rw-r--r--source/BlockArea.h (renamed from source/cBlockArea.h)0
-rw-r--r--source/cChunk.cpp2
-rw-r--r--source/squirrelbindings/cSquirrelBaseClass.h2
6 files changed, 5 insertions, 5 deletions
diff --git a/source/AllToLua.pkg b/source/AllToLua.pkg
index 4e4cfb4b5..b6ee64579 100644
--- a/source/AllToLua.pkg
+++ b/source/AllToLua.pkg
@@ -45,7 +45,7 @@ $cfile "cCuboid.h"
$cfile "cMCLogger.h"
$cfile "cTracer.h"
$cfile "cGroup.h"
-$cfile "cBlockArea.h"
+$cfile "BlockArea.h"
$cfile "packets/cPacket_Login.h"
$cfile "packets/cPacket_BlockDig.h"
$cfile "packets/cPacket_BlockPlace.h"
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 772013b25..cabd19661 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -54,7 +54,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S);
#include "cMCLogger.h"
#include "cTracer.h"
#include "cGroup.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
#include "packets/cPacket_Login.h"
#include "packets/cPacket_BlockDig.h"
#include "packets/cPacket_BlockPlace.h"
diff --git a/source/cBlockArea.cpp b/source/BlockArea.cpp
index 810503f04..7750b94fb 100644
--- a/source/cBlockArea.cpp
+++ b/source/BlockArea.cpp
@@ -5,7 +5,7 @@
// The object also supports writing the blockdata back into cWorld, even into other coords
#include "Globals.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
#include "cWorld.h"
diff --git a/source/cBlockArea.h b/source/BlockArea.h
index 5abdab3bb..5abdab3bb 100644
--- a/source/cBlockArea.h
+++ b/source/BlockArea.h
diff --git a/source/cChunk.cpp b/source/cChunk.cpp
index 489af5cc9..cd94e3413 100644
--- a/source/cChunk.cpp
+++ b/source/cChunk.cpp
@@ -27,7 +27,7 @@
#include "cBlockToPickup.h"
#include "MersenneTwister.h"
#include "cPlayer.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
#include "cPluginManager.h"
#include "packets/cPacket_DestroyEntity.h"
diff --git a/source/squirrelbindings/cSquirrelBaseClass.h b/source/squirrelbindings/cSquirrelBaseClass.h
index e06301555..a66ca7ddd 100644
--- a/source/squirrelbindings/cSquirrelBaseClass.h
+++ b/source/squirrelbindings/cSquirrelBaseClass.h
@@ -2,7 +2,7 @@
#include "SquirrelBindings.h"
#include "../cPlugin_Squirrel.h"
#include "../cPluginManager.h"
-#include "cRoot.h"
+#include "../cRoot.h"
//The baseclass for squirrel plugins
class cSquirrelBaseClass