diff options
| -rw-r--r-- | VC2008/MCServer.vcproj | 474 | ||||
| -rw-r--r-- | VC2008/WebServer.vcproj | 4 | ||||
| -rw-r--r-- | WebServer/Events.cpp (renamed from WebServer/cEvents.cpp) | 2 | ||||
| -rw-r--r-- | WebServer/Events.h (renamed from WebServer/cEvents.h) | 0 | ||||
| -rw-r--r-- | WebServer/WebServer.cpp | 2 | ||||
| -rw-r--r-- | source/Authenticator.cpp (renamed from source/cAuthenticator.cpp) | 6 | ||||
| -rw-r--r-- | source/Authenticator.h (renamed from source/cAuthenticator.h) | 0 | ||||
| -rw-r--r-- | source/Bindings.cpp | 56 | ||||
| -rw-r--r-- | source/BlockArea.cpp | 2 | ||||
| -rw-r--r-- | source/BlockEntity.h (renamed from source/cBlockEntity.h) | 4 | ||||
| -rw-r--r-- | source/BlockID.cpp | 2 | ||||
| -rw-r--r-- | source/ChatColor.cpp (renamed from source/cChatColor.cpp) | 2 | ||||
| -rw-r--r-- | source/ChatColor.h (renamed from source/cChatColor.h) | 0 | ||||
| -rw-r--r-- | source/ChestEntity.cpp (renamed from source/cChestEntity.cpp) | 14 | ||||
| -rw-r--r-- | source/ChestEntity.h (renamed from source/cChestEntity.h) | 2 | ||||
| -rw-r--r-- | source/Chunk.cpp (renamed from source/cChunk.cpp) | 40 | ||||
| -rw-r--r-- | source/Chunk.h (renamed from source/cChunk.h) | 4 | ||||
| -rw-r--r-- | source/Chunk.inl.h (renamed from source/cChunk.inl.h) | 0 | ||||
| -rw-r--r-- | source/ChunkMap.cpp (renamed from source/cChunkMap.cpp) | 14 | ||||
| -rw-r--r-- | source/ChunkMap.h (renamed from source/cChunkMap.h) | 0 | ||||
| -rw-r--r-- | source/ChunkSender.cpp | 4 | ||||
| -rw-r--r-- | source/ClientHandle.cpp (renamed from source/cClientHandle.cpp) | 46 | ||||
| -rw-r--r-- | source/ClientHandle.h (renamed from source/cClientHandle.h) | 0 | ||||
| -rw-r--r-- | source/CraftingRecipes.cpp | 4 | ||||
| -rw-r--r-- | source/CraftingRecipes.h | 2 | ||||
| -rw-r--r-- | source/Cuboid.cpp (renamed from source/cCuboid.cpp) | 2 | ||||
| -rw-r--r-- | source/Cuboid.h (renamed from source/cCuboid.h) | 0 | ||||
| -rw-r--r-- | source/Doors.h (renamed from source/cDoors.h) | 0 | ||||
| -rw-r--r-- | source/Entity.cpp (renamed from source/cEntity.cpp) | 12 | ||||
| -rw-r--r-- | source/Entity.h (renamed from source/cEntity.h) | 0 | ||||
| -rw-r--r-- | source/FireSimulator.cpp (renamed from source/cFireSimulator.cpp) | 4 | ||||
| -rw-r--r-- | source/FireSimulator.h (renamed from source/cFireSimulator.h) | 4 | ||||
| -rw-r--r-- | source/FluidSimulator.cpp (renamed from source/cFluidSimulator.cpp) | 8 | ||||
| -rw-r--r-- | source/FluidSimulator.h (renamed from source/cFluidSimulator.h) | 2 | ||||
| -rw-r--r-- | source/FurnaceEntity.cpp (renamed from source/cFurnaceEntity.cpp) | 18 | ||||
| -rw-r--r-- | source/FurnaceEntity.h (renamed from source/cFurnaceEntity.h) | 4 | ||||
| -rw-r--r-- | source/FurnaceRecipe.cpp (renamed from source/cFurnaceRecipe.cpp) | 4 | ||||
| -rw-r--r-- | source/FurnaceRecipe.h (renamed from source/cFurnaceRecipe.h) | 0 | ||||
| -rw-r--r-- | source/Generating/BioGen.h | 2 | ||||
| -rw-r--r-- | source/Generating/Caves.h | 2 | ||||
| -rw-r--r-- | source/Generating/ChunkGenerator.cpp | 8 | ||||
| -rw-r--r-- | source/Generating/CompoGen.h | 2 | ||||
| -rw-r--r-- | source/Generating/FinishGen.cpp | 2 | ||||
| -rw-r--r-- | source/Generating/FinishGen.h | 2 | ||||
| -rw-r--r-- | source/Generating/HeiGen.h | 2 | ||||
| -rw-r--r-- | source/Generating/Ravines.h | 2 | ||||
| -rw-r--r-- | source/Generating/StructGen.h | 2 | ||||
| -rw-r--r-- | source/Generating/Trees.h | 2 | ||||
| -rw-r--r-- | source/Globals.h | 2 | ||||
| -rw-r--r-- | source/Group.cpp (renamed from source/cGroup.cpp) | 2 | ||||
| -rw-r--r-- | source/Group.h (renamed from source/cGroup.h) | 0 | ||||
| -rw-r--r-- | source/GroupManager.cpp (renamed from source/cGroupManager.cpp) | 8 | ||||
| -rw-r--r-- | source/GroupManager.h (renamed from source/cGroupManager.h) | 0 | ||||
| -rw-r--r-- | source/HeartBeat.cpp (renamed from source/cHeartBeat.cpp) | 8 | ||||
| -rw-r--r-- | source/HeartBeat.h (renamed from source/cHeartBeat.h) | 0 | ||||
| -rw-r--r-- | source/Inventory.cpp (renamed from source/cInventory.cpp) | 12 | ||||
| -rw-r--r-- | source/Inventory.h (renamed from source/cInventory.h) | 2 | ||||
| -rw-r--r-- | source/Item.cpp (renamed from source/cItem.cpp) | 2 | ||||
| -rw-r--r-- | source/Item.h (renamed from source/cItem.h) | 0 | ||||
| -rw-r--r-- | source/Ladder.h (renamed from source/cLadder.h) | 0 | ||||
| -rw-r--r-- | source/LavaSimulator.cpp (renamed from source/cLavaSimulator.cpp) | 4 | ||||
| -rw-r--r-- | source/LavaSimulator.h (renamed from source/cLavaSimulator.h) | 2 | ||||
| -rw-r--r-- | source/LightingThread.cpp | 4 | ||||
| -rw-r--r-- | source/Log.cpp (renamed from source/cLog.cpp) | 2 | ||||
| -rw-r--r-- | source/Log.h (renamed from source/cLog.h) | 0 | ||||
| -rw-r--r-- | source/LuaChunk.cpp (renamed from source/cLuaChunk.cpp) | 2 | ||||
| -rw-r--r-- | source/LuaChunk.h (renamed from source/cLuaChunk.h) | 0 | ||||
| -rw-r--r-- | source/LuaCommandBinder.cpp (renamed from source/cLuaCommandBinder.cpp) | 8 | ||||
| -rw-r--r-- | source/LuaCommandBinder.h (renamed from source/cLuaCommandBinder.h) | 0 | ||||
| -rw-r--r-- | source/LuaFunctions.h | 2 | ||||
| -rw-r--r-- | source/LuaItems.h | 2 | ||||
| -rw-r--r-- | source/MCLogger.cpp (renamed from source/cMCLogger.cpp) | 2 | ||||
| -rw-r--r-- | source/MCLogger.h (renamed from source/cMCLogger.h) | 0 | ||||
| -rw-r--r-- | source/ManualBindings.cpp | 20 | ||||
| -rw-r--r-- | source/Mobs/AggressiveMonster.cpp | 2 | ||||
| -rw-r--r-- | source/Mobs/Monster.cpp | 14 | ||||
| -rw-r--r-- | source/Mobs/Monster.h | 6 | ||||
| -rw-r--r-- | source/Mobs/PassiveAggressiveMonster.cpp | 2 | ||||
| -rw-r--r-- | source/MonsterConfig.cpp (renamed from source/cMonsterConfig.cpp) | 2 | ||||
| -rw-r--r-- | source/MonsterConfig.h (renamed from source/cMonsterConfig.h) | 0 | ||||
| -rw-r--r-- | source/Noise.cpp (renamed from source/cNoise.cpp) | 4 | ||||
| -rw-r--r-- | source/Noise.h (renamed from source/cNoise.h) | 2 | ||||
| -rw-r--r-- | source/Noise.inc (renamed from source/cNoise.inc) | 0 | ||||
| -rw-r--r-- | source/NoteEntity.cpp (renamed from source/cNoteEntity.cpp) | 4 | ||||
| -rw-r--r-- | source/NoteEntity.h (renamed from source/cNoteEntity.h) | 2 | ||||
| -rw-r--r-- | source/Pawn.cpp (renamed from source/cPawn.cpp) | 12 | ||||
| -rw-r--r-- | source/Pawn.h (renamed from source/cPawn.h) | 2 | ||||
| -rw-r--r-- | source/Pickup.cpp (renamed from source/cPickup.cpp) | 22 | ||||
| -rw-r--r-- | source/Pickup.h (renamed from source/cPickup.h) | 2 | ||||
| -rw-r--r-- | source/Piston.cpp (renamed from source/cPiston.cpp) | 18 | ||||
| -rw-r--r-- | source/Piston.h (renamed from source/cPiston.h) | 0 | ||||
| -rw-r--r-- | source/Player.cpp (renamed from source/cPlayer.cpp) | 26 | ||||
| -rw-r--r-- | source/Player.h (renamed from source/cPlayer.h) | 4 | ||||
| -rw-r--r-- | source/Plugin.cpp (renamed from source/cPlugin.cpp) | 2 | ||||
| -rw-r--r-- | source/Plugin.h (renamed from source/cPlugin.h) | 2 | ||||
| -rw-r--r-- | source/PluginManager.cpp (renamed from source/cPluginManager.cpp) | 22 | ||||
| -rw-r--r-- | source/PluginManager.h (renamed from source/cPluginManager.h) | 2 | ||||
| -rw-r--r-- | source/Plugin_Lua.cpp (renamed from source/cPlugin_Lua.cpp) | 6 | ||||
| -rw-r--r-- | source/Plugin_Lua.h (renamed from source/cPlugin_Lua.h) | 0 | ||||
| -rw-r--r-- | source/Plugin_NewLua.cpp (renamed from source/cPlugin_NewLua.cpp) | 4 | ||||
| -rw-r--r-- | source/Plugin_NewLua.h (renamed from source/cPlugin_NewLua.h) | 4 | ||||
| -rw-r--r-- | source/Plugin_Squirrel.cpp (renamed from source/cPlugin_Squirrel.cpp) | 4 | ||||
| -rw-r--r-- | source/Plugin_Squirrel.h (renamed from source/cPlugin_Squirrel.h) | 2 | ||||
| -rw-r--r-- | source/Protocol/Protocol125.cpp | 14 | ||||
| -rw-r--r-- | source/Protocol/Protocol132.cpp | 10 | ||||
| -rw-r--r-- | source/Protocol/ProtocolRecognizer.cpp | 8 | ||||
| -rw-r--r-- | source/Redstone.cpp (renamed from source/cRedstone.cpp) | 8 | ||||
| -rw-r--r-- | source/Redstone.h (renamed from source/cRedstone.h) | 0 | ||||
| -rw-r--r-- | source/RedstoneSimulator.cpp (renamed from source/cRedstoneSimulator.cpp) | 10 | ||||
| -rw-r--r-- | source/RedstoneSimulator.h (renamed from source/cRedstoneSimulator.h) | 2 | ||||
| -rw-r--r-- | source/ReferenceManager.cpp (renamed from source/cReferenceManager.cpp) | 4 | ||||
| -rw-r--r-- | source/ReferenceManager.h (renamed from source/cReferenceManager.h) | 0 | ||||
| -rw-r--r-- | source/Root.cpp (renamed from source/cRoot.cpp) | 29 | ||||
| -rw-r--r-- | source/Root.h (renamed from source/cRoot.h) | 2 | ||||
| -rw-r--r-- | source/SandSimulator.cpp (renamed from source/cSandSimulator.cpp) | 4 | ||||
| -rw-r--r-- | source/SandSimulator.h (renamed from source/cSandSimulator.h) | 4 | ||||
| -rw-r--r-- | source/Server.cpp (renamed from source/cServer.cpp) | 26 | ||||
| -rw-r--r-- | source/Server.h (renamed from source/cServer.h) | 0 | ||||
| -rw-r--r-- | source/Sign.h (renamed from source/cSign.h) | 0 | ||||
| -rw-r--r-- | source/SignEntity.cpp (renamed from source/cSignEntity.cpp) | 10 | ||||
| -rw-r--r-- | source/SignEntity.h (renamed from source/cSignEntity.h) | 2 | ||||
| -rw-r--r-- | source/Simulator.cpp (renamed from source/cSimulator.cpp) | 4 | ||||
| -rw-r--r-- | source/Simulator.h (renamed from source/cSimulator.h) | 0 | ||||
| -rw-r--r-- | source/SimulatorManager.cpp (renamed from source/cSimulatorManager.cpp) | 2 | ||||
| -rw-r--r-- | source/SimulatorManager.h (renamed from source/cSimulatorManager.h) | 2 | ||||
| -rw-r--r-- | source/SquirrelCommandBinder.cpp (renamed from source/cSquirrelCommandBinder.cpp) | 8 | ||||
| -rw-r--r-- | source/SquirrelCommandBinder.h (renamed from source/cSquirrelCommandBinder.h) | 0 | ||||
| -rw-r--r-- | source/Stairs.h (renamed from source/cStairs.h) | 0 | ||||
| -rw-r--r-- | source/StringMap.cpp (renamed from source/cStringMap.cpp) | 2 | ||||
| -rw-r--r-- | source/StringMap.h (renamed from source/cStringMap.h) | 0 | ||||
| -rw-r--r-- | source/Torch.h (renamed from source/cTorch.h) | 0 | ||||
| -rw-r--r-- | source/Tracer.cpp (renamed from source/cTracer.cpp) | 6 | ||||
| -rw-r--r-- | source/Tracer.h (renamed from source/cTracer.h) | 0 | ||||
| -rw-r--r-- | source/UI/SlotArea.cpp | 10 | ||||
| -rw-r--r-- | source/UI/SlotArea.h | 2 | ||||
| -rw-r--r-- | source/UI/Window.cpp | 14 | ||||
| -rw-r--r-- | source/UI/Window.h | 2 | ||||
| -rw-r--r-- | source/UI/WindowOwner.h | 4 | ||||
| -rw-r--r-- | source/Vine.h (renamed from source/cVine.h) | 0 | ||||
| -rw-r--r-- | source/WaterSimulator.cpp (renamed from source/cWaterSimulator.cpp) | 4 | ||||
| -rw-r--r-- | source/WaterSimulator.h (renamed from source/cWaterSimulator.h) | 2 | ||||
| -rw-r--r-- | source/WebAdmin.cpp (renamed from source/cWebAdmin.cpp) | 18 | ||||
| -rw-r--r-- | source/WebAdmin.h (renamed from source/cWebAdmin.h) | 0 | ||||
| -rw-r--r-- | source/WebPlugin.cpp (renamed from source/cWebPlugin.cpp) | 8 | ||||
| -rw-r--r-- | source/WebPlugin.h (renamed from source/cWebPlugin.h) | 0 | ||||
| -rw-r--r-- | source/World.cpp (renamed from source/cWorld.cpp) | 36 | ||||
| -rw-r--r-- | source/World.h (renamed from source/cWorld.h) | 6 | ||||
| -rw-r--r-- | source/WorldStorage/WSSAnvil.cpp | 14 | ||||
| -rw-r--r-- | source/WorldStorage/WSSCompact.cpp | 10 | ||||
| -rw-r--r-- | source/WorldStorage/WorldStorage.cpp | 6 | ||||
| -rw-r--r-- | source/blocks/BlockCactus.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockChest.h | 6 | ||||
| -rw-r--r-- | source/blocks/BlockCloth.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockCrops.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockDirt.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockDispenser.h | 6 | ||||
| -rw-r--r-- | source/blocks/BlockDoor.cpp | 8 | ||||
| -rw-r--r-- | source/blocks/BlockDoor.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockEntity.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockFire.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockFlower.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockFluid.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockFurnace.h | 6 | ||||
| -rw-r--r-- | source/blocks/BlockGlowstone.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockGravel.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockHandler.cpp (renamed from source/blocks/Block.cpp) | 6 | ||||
| -rw-r--r-- | source/blocks/BlockHandler.h (renamed from source/blocks/Block.h) | 0 | ||||
| -rw-r--r-- | source/blocks/BlockIce.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockLadder.h | 6 | ||||
| -rw-r--r-- | source/blocks/BlockLeaves.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockMelon.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockMushroom.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockNote.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockOre.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockPiston.cpp | 10 | ||||
| -rw-r--r-- | source/blocks/BlockPiston.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockRedstone.cpp | 8 | ||||
| -rw-r--r-- | source/blocks/BlockRedstone.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockRedstoneRepeater.cpp | 8 | ||||
| -rw-r--r-- | source/blocks/BlockRedstoneRepeater.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockRedstoneTorch.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockSand.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockSapling.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockSign.h | 8 | ||||
| -rw-r--r-- | source/blocks/BlockSlab.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockSnow.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockStairs.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockStems.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockStone.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockSugarcane.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockTallGrass.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockTorch.h | 6 | ||||
| -rw-r--r-- | source/blocks/BlockVine.h | 4 | ||||
| -rw-r--r-- | source/blocks/BlockWood.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockWorkbench.h | 4 | ||||
| -rw-r--r-- | source/cFileFormatUpdater.cpp | 143 | ||||
| -rw-r--r-- | source/cFileFormatUpdater.h | 11 | ||||
| -rw-r--r-- | source/items/ItemBucket.h | 5 | ||||
| -rw-r--r-- | source/items/ItemCloth.h | 2 | ||||
| -rw-r--r-- | source/items/ItemDoor.h | 5 | ||||
| -rw-r--r-- | source/items/ItemDye.h | 8 | ||||
| -rw-r--r-- | source/items/ItemFood.h | 3 | ||||
| -rw-r--r-- | source/items/ItemHandler.cpp (renamed from source/items/Item.cpp) | 10 | ||||
| -rw-r--r-- | source/items/ItemHandler.h (renamed from source/items/Item.h) | 0 | ||||
| -rw-r--r-- | source/items/ItemHoe.h | 8 | ||||
| -rw-r--r-- | source/items/ItemLeaves.h | 2 | ||||
| -rw-r--r-- | source/items/ItemLighter.h | 6 | ||||
| -rw-r--r-- | source/items/ItemPickaxe.h | 8 | ||||
| -rw-r--r-- | source/items/ItemRedstoneDust.h | 3 | ||||
| -rw-r--r-- | source/items/ItemRedstoneRepeater.h | 3 | ||||
| -rw-r--r-- | source/items/ItemSapling.h | 2 | ||||
| -rw-r--r-- | source/items/ItemSeeds.h | 4 | ||||
| -rw-r--r-- | source/items/ItemShears.h | 7 | ||||
| -rw-r--r-- | source/items/ItemShovel.h | 14 | ||||
| -rw-r--r-- | source/items/ItemSign.h | 5 | ||||
| -rw-r--r-- | source/items/ItemSlab.h | 4 | ||||
| -rw-r--r-- | source/items/ItemSugarcane.h | 4 | ||||
| -rw-r--r-- | source/items/ItemSword.h | 8 | ||||
| -rw-r--r-- | source/items/ItemWood.h | 2 | ||||
| -rw-r--r-- | source/main.cpp | 2 | ||||
| -rw-r--r-- | source/squirrelbindings/SquirrelBaseClass.h (renamed from source/squirrelbindings/cSquirrelBaseClass.h) | 8 | ||||
| -rw-r--r-- | source/squirrelbindings/SquirrelBindings.cpp | 4 |
222 files changed, 801 insertions, 967 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index cafb18701..dfbe8380a 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -281,184 +281,204 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\source\BlockArea.cpp"
+ RelativePath="..\source\Authenticator.cpp"
>
</File>
<File
- RelativePath="..\source\BlockArea.h"
+ RelativePath="..\source\Authenticator.h"
>
</File>
<File
- RelativePath="..\source\BlockID.cpp"
+ RelativePath="..\source\BlockArea.cpp"
>
</File>
<File
- RelativePath="..\source\BlockID.h"
+ RelativePath="..\source\BlockArea.h"
>
</File>
<File
- RelativePath="..\source\ByteBuffer.cpp"
+ RelativePath="..\source\BlockID.cpp"
>
</File>
<File
- RelativePath="..\source\ByteBuffer.h"
+ RelativePath="..\source\BlockID.h"
>
</File>
<File
- RelativePath="..\source\cAuthenticator.cpp"
+ RelativePath="..\source\ByteBuffer.cpp"
>
</File>
<File
- RelativePath="..\source\cAuthenticator.h"
+ RelativePath="..\source\ByteBuffer.h"
>
</File>
<File
- RelativePath="..\source\cChatColor.cpp"
+ RelativePath="..\source\ChatColor.cpp"
>
</File>
<File
- RelativePath="..\source\cChatColor.h"
+ RelativePath="..\source\ChatColor.h"
>
</File>
<File
- RelativePath="..\source\cChunk.cpp"
+ RelativePath="..\source\Chunk.cpp"
>
</File>
<File
- RelativePath="..\source\cChunk.h"
+ RelativePath="..\source\Chunk.h"
>
</File>
<File
- RelativePath="..\source\cChunk.inl.h"
+ RelativePath="..\source\Chunk.inl.h"
>
</File>
<File
- RelativePath="..\source\cChunkMap.cpp"
+ RelativePath="..\source\ChunkDef.h"
>
</File>
<File
- RelativePath="..\source\cChunkMap.h"
+ RelativePath="..\source\ChunkMap.cpp"
>
</File>
<File
- RelativePath="..\source\cClientHandle.cpp"
+ RelativePath="..\source\ChunkMap.h"
>
</File>
<File
- RelativePath="..\source\cClientHandle.h"
+ RelativePath="..\source\ChunkSender.cpp"
>
</File>
<File
- RelativePath="..\source\cCuboid.cpp"
+ RelativePath="..\source\ChunkSender.h"
>
</File>
<File
- RelativePath="..\source\cCuboid.h"
+ RelativePath="..\source\ClientHandle.cpp"
>
</File>
<File
- RelativePath="..\source\cFileFormatUpdater.cpp"
+ RelativePath="..\source\ClientHandle.h"
>
</File>
<File
- RelativePath="..\source\cFileFormatUpdater.h"
+ RelativePath="..\source\CraftingRecipes.cpp"
>
</File>
<File
- RelativePath="..\source\cFurnaceRecipe.cpp"
+ RelativePath="..\source\CraftingRecipes.h"
>
</File>
<File
- RelativePath="..\source\cFurnaceRecipe.h"
+ RelativePath="..\source\Cuboid.cpp"
>
</File>
<File
- RelativePath="..\source\cGroup.cpp"
+ RelativePath="..\source\Cuboid.h"
>
</File>
<File
- RelativePath="..\source\cGroup.h"
+ RelativePath="..\source\Defines.h"
>
</File>
<File
- RelativePath="..\source\cGroupManager.cpp"
+ RelativePath="..\source\Endianness.h"
>
</File>
<File
- RelativePath="..\source\cGroupManager.h"
+ RelativePath="..\source\FurnaceRecipe.cpp"
>
</File>
<File
- RelativePath="..\source\cHeartBeat.cpp"
+ RelativePath="..\source\FurnaceRecipe.h"
>
</File>
<File
- RelativePath="..\source\cHeartBeat.h"
+ RelativePath="..\source\Globals.cpp"
>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release profiled|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
</File>
<File
- RelativePath="..\source\ChunkDef.h"
+ RelativePath="..\source\Globals.h"
>
</File>
<File
- RelativePath="..\source\ChunkSender.cpp"
+ RelativePath="..\source\Group.cpp"
>
</File>
<File
- RelativePath="..\source\ChunkSender.h"
+ RelativePath="..\source\Group.h"
>
</File>
<File
- RelativePath="..\source\cInventory.cpp"
+ RelativePath="..\source\GroupManager.cpp"
>
</File>
<File
- RelativePath="..\source\cInventory.h"
+ RelativePath="..\source\GroupManager.h"
>
</File>
<File
- RelativePath="..\source\cLog.cpp"
+ RelativePath="..\source\HeartBeat.cpp"
>
</File>
<File
- RelativePath="..\source\cLog.h"
+ RelativePath="..\source\HeartBeat.h"
>
</File>
<File
- RelativePath="..\source\cMCLogger.cpp"
+ RelativePath="..\source\Inventory.cpp"
>
</File>
<File
- RelativePath="..\source\cMCLogger.h"
+ RelativePath="..\source\Inventory.h"
>
</File>
<File
- RelativePath="..\source\cMonsterConfig.cpp"
+ RelativePath="..\source\Item.cpp"
>
</File>
<File
- RelativePath="..\source\cMonsterConfig.h"
+ RelativePath="..\source\Item.h"
>
</File>
<File
- RelativePath="..\source\cNoise.cpp"
+ RelativePath="..\source\LeakFinder.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- BasicRuntimeChecks="0"
UsePrecompiledHeader="0"
- DebugInformationFormat="3"
+ WarningLevel="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -467,6 +487,7 @@ </FileConfiguration>
<FileConfiguration
Name="Release profiled|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -475,151 +496,107 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\source\cNoise.h"
- >
- </File>
- <File
- RelativePath="..\source\cNoise.inc"
- >
- </File>
- <File
- RelativePath="..\source\cPiston.cpp"
- >
- </File>
- <File
- RelativePath="..\source\cPiston.h"
- >
- </File>
- <File
- RelativePath="..\source\CraftingRecipes.cpp"
- >
- </File>
- <File
- RelativePath="..\source\CraftingRecipes.h"
+ RelativePath="..\source\LeakFinder.h"
>
</File>
<File
- RelativePath="..\source\cRedstone.cpp"
+ RelativePath="..\source\LightingThread.cpp"
>
</File>
<File
- RelativePath="..\source\cRedstone.h"
+ RelativePath="..\source\LightingThread.h"
>
</File>
<File
- RelativePath="..\source\cReferenceManager.cpp"
+ RelativePath="..\source\Log.cpp"
>
</File>
<File
- RelativePath="..\source\cReferenceManager.h"
+ RelativePath="..\source\Log.h"
>
</File>
<File
- RelativePath="..\source\cRoot.cpp"
+ RelativePath="..\source\main.cpp"
>
</File>
<File
- RelativePath="..\source\cRoot.h"
+ RelativePath="..\source\Matrix4f.cpp"
>
</File>
<File
- RelativePath="..\source\cServer.cpp"
+ RelativePath="..\source\Matrix4f.h"
>
</File>
<File
- RelativePath="..\source\cServer.h"
+ RelativePath="..\source\MCLogger.cpp"
>
</File>
<File
- RelativePath="..\source\cSimulator.cpp"
+ RelativePath="..\source\MCLogger.h"
>
</File>
<File
- RelativePath="..\source\cSimulator.h"
+ RelativePath="..\source\MemoryLeak.h"
>
</File>
<File
- RelativePath="..\source\cSimulatorManager.cpp"
+ RelativePath="..\source\MersenneTwister.h"
>
</File>
<File
- RelativePath="..\source\cSimulatorManager.h"
+ RelativePath="..\source\MonsterConfig.cpp"
>
</File>
<File
- RelativePath="..\source\cTracer.cpp"
+ RelativePath="..\source\MonsterConfig.h"
>
</File>
<File
- RelativePath="..\source\cTracer.h"
+ RelativePath="..\source\Noise.cpp"
>
</File>
<File
- RelativePath="..\source\cWebAdmin.cpp"
+ RelativePath="..\source\Noise.h"
>
</File>
<File
- RelativePath="..\source\cWebAdmin.h"
+ RelativePath="..\source\Noise.inc"
>
</File>
<File
- RelativePath="..\source\cWebPlugin.cpp"
+ RelativePath="..\source\Piston.cpp"
>
</File>
<File
- RelativePath="..\source\cWebPlugin.h"
+ RelativePath="..\source\Piston.h"
>
</File>
<File
- RelativePath="..\source\cWorld.cpp"
+ RelativePath="..\source\ReferenceManager.cpp"
>
</File>
<File
- RelativePath="..\source\cWorld.h"
+ RelativePath="..\source\ReferenceManager.h"
>
</File>
<File
- RelativePath="..\source\Defines.h"
+ RelativePath="..\source\Root.cpp"
>
</File>
<File
- RelativePath="..\source\Endianness.h"
+ RelativePath="..\source\Root.h"
>
</File>
<File
- RelativePath="..\source\Globals.cpp"
+ RelativePath="..\source\Server.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release profiled|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
</File>
<File
- RelativePath="..\source\Globals.h"
+ RelativePath="..\source\Server.h"
>
</File>
<File
- RelativePath="..\source\LeakFinder.cpp"
+ RelativePath="..\source\StackWalker.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -650,110 +627,79 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\source\LeakFinder.h"
- >
- </File>
- <File
- RelativePath="..\source\LightingThread.cpp"
+ RelativePath="..\source\StackWalker.h"
>
</File>
<File
- RelativePath="..\source\LightingThread.h"
+ RelativePath="..\source\StringCompression.cpp"
>
</File>
<File
- RelativePath="..\source\main.cpp"
+ RelativePath="..\source\StringCompression.h"
>
</File>
<File
- RelativePath="..\source\Matrix4f.cpp"
+ RelativePath="..\source\StringUtils.cpp"
>
</File>
<File
- RelativePath="..\source\Matrix4f.h"
+ RelativePath="..\source\StringUtils.h"
>
</File>
<File
- RelativePath="..\source\MemoryLeak.h"
+ RelativePath="..\source\Tracer.cpp"
>
</File>
<File
- RelativePath="..\source\MersenneTwister.h"
+ RelativePath="..\source\Tracer.h"
>
</File>
<File
- RelativePath="..\source\StackWalker.cpp"
+ RelativePath="..\source\Vector3d.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release profiled|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
- RelativePath="..\source\StackWalker.h"
+ RelativePath="..\source\Vector3d.h"
>
</File>
<File
- RelativePath="..\source\StringCompression.cpp"
+ RelativePath="..\source\Vector3f.cpp"
>
</File>
<File
- RelativePath="..\source\StringCompression.h"
+ RelativePath="..\source\Vector3f.h"
>
</File>
<File
- RelativePath="..\source\StringUtils.cpp"
+ RelativePath="..\source\Vector3i.cpp"
>
</File>
<File
- RelativePath="..\source\StringUtils.h"
+ RelativePath="..\source\Vector3i.h"
>
</File>
<File
- RelativePath="..\source\Vector3d.cpp"
+ RelativePath="..\source\WebAdmin.cpp"
>
</File>
<File
- RelativePath="..\source\Vector3d.h"
+ RelativePath="..\source\WebAdmin.h"
>
</File>
<File
- RelativePath="..\source\Vector3f.cpp"
+ RelativePath="..\source\WebPlugin.cpp"
>
</File>
<File
- RelativePath="..\source\Vector3f.h"
+ RelativePath="..\source\WebPlugin.h"
>
</File>
<File
- RelativePath="..\source\Vector3i.cpp"
+ RelativePath="..\source\World.cpp"
>
</File>
<File
- RelativePath="..\source\Vector3i.h"
+ RelativePath="..\source\World.h"
>
</File>
<Filter
@@ -924,107 +870,95 @@ Name="Entities"
>
<File
- RelativePath="..\source\cBlockEntity.h"
- >
- </File>
- <File
- RelativePath="..\source\cChestEntity.cpp"
+ RelativePath="..\source\BlockEntity.h"
>
</File>
<File
- RelativePath="..\source\cChestEntity.h"
+ RelativePath="..\source\ChestEntity.cpp"
>
</File>
<File
- RelativePath="..\source\cDoors.h"
+ RelativePath="..\source\ChestEntity.h"
>
</File>
<File
- RelativePath="..\source\cEntity.cpp"
+ RelativePath="..\source\Doors.h"
>
</File>
<File
- RelativePath="..\source\cEntity.h"
+ RelativePath="..\source\Entity.cpp"
>
</File>
<File
- RelativePath="..\source\cFurnaceEntity.cpp"
+ RelativePath="..\source\Entity.h"
>
</File>
<File
- RelativePath="..\source\cFurnaceEntity.h"
+ RelativePath="..\source\FurnaceEntity.cpp"
>
</File>
<File
- RelativePath="..\source\cItem.cpp"
+ RelativePath="..\source\FurnaceEntity.h"
>
</File>
<File
- RelativePath="..\source\cItem.h"
+ RelativePath="..\source\Ladder.h"
>
</File>
<File
- RelativePath="..\source\cLadder.h"
+ RelativePath="..\source\NoteEntity.cpp"
>
</File>
<File
- RelativePath="..\source\cNoteEntity.cpp"
+ RelativePath="..\source\NoteEntity.h"
>
</File>
<File
- RelativePath="..\source\cNoteEntity.h"
+ RelativePath="..\source\Pawn.cpp"
>
</File>
<File
- RelativePath="..\source\cPawn.cpp"
+ RelativePath="..\source\Pawn.h"
>
</File>
<File
- RelativePath="..\source\cPawn.h"
+ RelativePath="..\source\Pickup.cpp"
>
</File>
<File
- RelativePath="..\source\cPickup.cpp"
+ RelativePath="..\source\Pickup.h"
>
</File>
<File
- RelativePath="..\source\cPickup.h"
+ RelativePath="..\source\Player.cpp"
>
</File>
<File
- RelativePath="..\source\cPlayer.cpp"
+ RelativePath="..\source\Player.h"
>
</File>
<File
- RelativePath="..\source\cPlayer.h"
+ RelativePath="..\source\Sign.h"
>
</File>
<File
- RelativePath="..\source\cSign.h"
+ RelativePath="..\source\SignEntity.cpp"
>
</File>
<File
- RelativePath="..\source\cSignEntity.cpp"
+ RelativePath="..\source\SignEntity.h"
>
</File>
<File
- RelativePath="..\source\cSignEntity.h"
+ RelativePath="..\source\Stairs.h"
>
</File>
<File
- RelativePath="..\source\cStairs.h"
+ RelativePath="..\source\Torch.h"
>
</File>
<File
- RelativePath="..\source\cStep.h"
- >
- </File>
- <File
- RelativePath="..\source\cTorch.h"
- >
- </File>
- <File
- RelativePath="..\source\cVine.h"
+ RelativePath="..\source\Vine.h"
>
</File>
</Filter>
@@ -1056,51 +990,75 @@ Name="Physics"
>
<File
- RelativePath="..\source\cFireSimulator.cpp"
+ RelativePath="..\source\FireSimulator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\FireSimulator.h"
>
</File>
<File
- RelativePath="..\source\cFireSimulator.h"
+ RelativePath="..\source\FluidSimulator.cpp"
>
</File>
<File
- RelativePath="..\source\cFluidSimulator.cpp"
+ RelativePath="..\source\FluidSimulator.h"
>
</File>
<File
- RelativePath="..\source\cFluidSimulator.h"
+ RelativePath="..\source\LavaSimulator.cpp"
>
</File>
<File
- RelativePath="..\source\cLavaSimulator.cpp"
+ RelativePath="..\source\LavaSimulator.h"
>
</File>
<File
- RelativePath="..\source\cLavaSimulator.h"
+ RelativePath="..\source\Redstone.cpp"
>
</File>
<File
- RelativePath="..\source\cRedstoneSimulator.cpp"
+ RelativePath="..\source\Redstone.h"
>
</File>
<File
- RelativePath="..\source\cRedstoneSimulator.h"
+ RelativePath="..\source\RedstoneSimulator.cpp"
>
</File>
<File
- RelativePath="..\source\cSandSimulator.cpp"
+ RelativePath="..\source\RedstoneSimulator.h"
>
</File>
<File
- RelativePath="..\source\cSandSimulator.h"
+ RelativePath="..\source\SandSimulator.cpp"
>
</File>
<File
- RelativePath="..\source\cWaterSimulator.cpp"
+ RelativePath="..\source\SandSimulator.h"
>
</File>
<File
- RelativePath="..\source\cWaterSimulator.h"
+ RelativePath="..\source\Simulator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\Simulator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\source\SimulatorManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\SimulatorManager.h"
+ >
+ </File>
+ <File
+ RelativePath="..\source\WaterSimulator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\WaterSimulator.h"
>
</File>
</Filter>
@@ -1429,91 +1387,91 @@ >
</File>
<File
- RelativePath="..\source\cLuaChunk.cpp"
+ RelativePath="..\source\LuaChunk.cpp"
>
</File>
<File
- RelativePath="..\source\cLuaChunk.h"
+ RelativePath="..\source\LuaChunk.h"
>
</File>
<File
- RelativePath="..\source\cLuaCommandBinder.cpp"
+ RelativePath="..\source\LuaCommandBinder.cpp"
>
</File>
<File
- RelativePath="..\source\cLuaCommandBinder.h"
+ RelativePath="..\source\LuaCommandBinder.h"
>
</File>
<File
- RelativePath="..\source\cPlugin.cpp"
+ RelativePath="..\source\LuaFunctions.h"
>
</File>
<File
- RelativePath="..\source\cPlugin.h"
+ RelativePath="..\source\LuaItems.h"
>
</File>
<File
- RelativePath="..\source\cPlugin_Lua.cpp"
+ RelativePath="..\source\ManualBindings.cpp"
>
</File>
<File
- RelativePath="..\source\cPlugin_Lua.h"
+ RelativePath="..\source\ManualBindings.h"
>
</File>
<File
- RelativePath="..\source\cPlugin_NewLua.cpp"
+ RelativePath="..\source\Plugin.cpp"
>
</File>
<File
- RelativePath="..\source\cPlugin_NewLua.h"
+ RelativePath="..\source\Plugin.h"
>
</File>
<File
- RelativePath="..\source\cPlugin_Squirrel.cpp"
+ RelativePath="..\source\Plugin_Lua.cpp"
>
</File>
<File
- RelativePath="..\source\cPlugin_Squirrel.h"
+ RelativePath="..\source\Plugin_Lua.h"
>
</File>
<File
- RelativePath="..\source\cPluginManager.cpp"
+ RelativePath="..\source\Plugin_NewLua.cpp"
>
</File>
<File
- RelativePath="..\source\cPluginManager.h"
+ RelativePath="..\source\Plugin_NewLua.h"
>
</File>
<File
- RelativePath="..\source\cSquirrelCommandBinder.cpp"
+ RelativePath="..\source\Plugin_Squirrel.cpp"
>
</File>
<File
- RelativePath="..\source\cSquirrelCommandBinder.h"
+ RelativePath="..\source\Plugin_Squirrel.h"
>
</File>
<File
- RelativePath="..\source\cStringMap.cpp"
+ RelativePath="..\source\PluginManager.cpp"
>
</File>
<File
- RelativePath="..\source\cStringMap.h"
+ RelativePath="..\source\PluginManager.h"
>
</File>
<File
- RelativePath="..\source\LuaFunctions.h"
+ RelativePath="..\source\SquirrelCommandBinder.cpp"
>
</File>
<File
- RelativePath="..\source\LuaItems.h"
+ RelativePath="..\source\SquirrelCommandBinder.h"
>
</File>
<File
- RelativePath="..\source\ManualBindings.cpp"
+ RelativePath="..\source\StringMap.cpp"
>
</File>
<File
- RelativePath="..\source\ManualBindings.h"
+ RelativePath="..\source\StringMap.h"
>
</File>
<File
@@ -1528,11 +1486,11 @@ Name="Squirrel"
>
<File
- RelativePath="..\source\squirrelbindings\cSquirrelBaseClass.h"
+ RelativePath="..\source\squirrelbindings\SquirrelArray.h"
>
</File>
<File
- RelativePath="..\source\squirrelbindings\SquirrelArray.h"
+ RelativePath="..\source\squirrelbindings\SquirrelBaseClass.h"
>
</File>
<File
@@ -1720,14 +1678,6 @@ Name="Blocks"
>
<File
- RelativePath="..\source\blocks\Block.cpp"
- >
- </File>
- <File
- RelativePath="..\source\blocks\Block.h"
- >
- </File>
- <File
RelativePath="..\source\blocks\BlockCactus.h"
>
</File>
@@ -1788,6 +1738,14 @@ >
</File>
<File
+ RelativePath="..\source\blocks\BlockHandler.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\blocks\BlockHandler.h"
+ >
+ </File>
+ <File
RelativePath="..\source\blocks\BlockIce.h"
>
</File>
@@ -1908,27 +1866,31 @@ Name="Items"
>
<File
- RelativePath="..\source\items\Item.cpp"
+ RelativePath="..\source\items\ItemBucket.h"
>
</File>
<File
- RelativePath="..\source\items\Item.h"
+ RelativePath="..\source\items\ItemCloth.h"
>
</File>
<File
- RelativePath="..\source\items\ItemBucket.h"
+ RelativePath="..\source\items\ItemDoor.h"
>
</File>
<File
- RelativePath="..\source\items\ItemCloth.h"
+ RelativePath="..\source\items\ItemDye.h"
>
</File>
<File
- RelativePath="..\source\items\ItemDoor.h"
+ RelativePath="..\source\items\ItemFood.h"
>
</File>
<File
- RelativePath="..\source\items\ItemDye.h"
+ RelativePath="..\source\items\ItemHandler.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\items\ItemHandler.h"
>
</File>
<File
@@ -1952,6 +1914,10 @@ >
</File>
<File
+ RelativePath="..\source\items\ItemRedstoneRepeater.h"
+ >
+ </File>
+ <File
RelativePath="..\source\items\ItemSapling.h"
>
</File>
@@ -1968,6 +1934,10 @@ >
</File>
<File
+ RelativePath="..\source\items\ItemSign.h"
+ >
+ </File>
+ <File
RelativePath="..\source\items\ItemSlab.h"
>
</File>
diff --git a/VC2008/WebServer.vcproj b/VC2008/WebServer.vcproj index 460f0920c..078100bfd 100644 --- a/VC2008/WebServer.vcproj +++ b/VC2008/WebServer.vcproj @@ -222,11 +222,11 @@ >
</File>
<File
- RelativePath="..\WebServer\cEvents.cpp"
+ RelativePath="..\WebServer\Events.cpp"
>
</File>
<File
- RelativePath="..\WebServer\cEvents.h"
+ RelativePath="..\WebServer\Events.h"
>
</File>
<File
diff --git a/WebServer/cEvents.cpp b/WebServer/Events.cpp index a00a0e817..30eb731f9 100644 --- a/WebServer/cEvents.cpp +++ b/WebServer/Events.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cEvents.h" +#include "Events.h" diff --git a/WebServer/cEvents.h b/WebServer/Events.h index c8a6a7df9..c8a6a7df9 100644 --- a/WebServer/cEvents.h +++ b/WebServer/Events.h diff --git a/WebServer/WebServer.cpp b/WebServer/WebServer.cpp index c0331dc28..eb9a09049 100644 --- a/WebServer/WebServer.cpp +++ b/WebServer/WebServer.cpp @@ -42,7 +42,7 @@ #include "WebServer.h" -#include "cEvents.h" +#include "Events.h" #include "Socket.h" #include "UrlHelper.h" #include "base64.h" diff --git a/source/cAuthenticator.cpp b/source/Authenticator.cpp index 171c90598..dcc63299e 100644 --- a/source/cAuthenticator.cpp +++ b/source/Authenticator.cpp @@ -1,10 +1,10 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cAuthenticator.h" +#include "Authenticator.h" #include "OSSupport/BlockingTCPLink.h" -#include "cRoot.h" -#include "cServer.h" +#include "Root.h" +#include "Server.h" #include "../iniFile/iniFile.h" diff --git a/source/cAuthenticator.h b/source/Authenticator.h index c9e647329..c9e647329 100644 --- a/source/cAuthenticator.h +++ b/source/Authenticator.h diff --git a/source/Bindings.cpp b/source/Bindings.cpp index 8b9718386..e835fa1a6 100644 --- a/source/Bindings.cpp +++ b/source/Bindings.cpp @@ -16,44 +16,44 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S); #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "tolua_base.h" #include "ChunkDef.h" -#include "cTorch.h" -#include "cStairs.h" -#include "cLadder.h" -#include "cVine.h" +#include "Torch.h" +#include "Stairs.h" +#include "Ladder.h" +#include "Vine.h" #include "../iniFile/iniFile.h" #include "BlockID.h" #include "Defines.h" #include "LuaFunctions.h" -#include "cStringMap.h" -#include "cChatColor.h" -#include "cClientHandle.h" -#include "cEntity.h" -#include "cPawn.h" -#include "cPlayer.h" -#include "cPluginManager.h" -#include "cPlugin.h" -#include "cPlugin_NewLua.h" -#include "cPlugin_Lua.h" -#include "cServer.h" -#include "cWorld.h" -#include "cInventory.h" -#include "cItem.h" -#include "cChestEntity.h" -#include "cWebAdmin.h" -#include "cWebPlugin.h" -#include "cPickup.h" -#include "cRoot.h" +#include "StringMap.h" +#include "ChatColor.h" +#include "ClientHandle.h" +#include "Entity.h" +#include "Pawn.h" +#include "Player.h" +#include "PluginManager.h" +#include "Plugin.h" +#include "Plugin_NewLua.h" +#include "Plugin_Lua.h" +#include "Server.h" +#include "World.h" +#include "Inventory.h" +#include "Item.h" +#include "ChestEntity.h" +#include "WebAdmin.h" +#include "WebPlugin.h" +#include "Pickup.h" +#include "Root.h" #include "OSSupport/TCPLink.h" #include "Vector3f.h" #include "Vector3d.h" #include "Vector3i.h" #include "Matrix4f.h" -#include "cCuboid.h" -#include "cMCLogger.h" -#include "cTracer.h" -#include "cGroup.h" +#include "Cuboid.h" +#include "MCLogger.h" +#include "Tracer.h" +#include "Group.h" #include "BlockArea.h" -#include "cLuaChunk.h" +#include "LuaChunk.h" #include "CraftingRecipes.h" #include "LuaItems.h" diff --git a/source/BlockArea.cpp b/source/BlockArea.cpp index 7750b94fb..caeaf609e 100644 --- a/source/BlockArea.cpp +++ b/source/BlockArea.cpp @@ -6,7 +6,7 @@ #include "Globals.h"
#include "BlockArea.h"
-#include "cWorld.h"
+#include "World.h"
diff --git a/source/cBlockEntity.h b/source/BlockEntity.h index f5730d67e..b7d1fe6c4 100644 --- a/source/cBlockEntity.h +++ b/source/BlockEntity.h @@ -1,8 +1,8 @@ #pragma once -#include "cClientHandle.h" -#include "cWorld.h" +#include "ClientHandle.h" +#include "World.h" diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 9cdc05c58..6553b612e 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "BlockID.h" #include "../iniFile/iniFile.h" -#include "cItem.h" +#include "Item.h" diff --git a/source/cChatColor.cpp b/source/ChatColor.cpp index 262130897..2b223ee76 100644 --- a/source/cChatColor.cpp +++ b/source/ChatColor.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cChatColor.h" +#include "ChatColor.h" const std::string cChatColor::Color = "\xc2\xa7"; // or in other words: "§" in UTF-8 const std::string cChatColor::Delimiter = "\xc2\xa7"; // or in other words: "§" in UTF-8 diff --git a/source/cChatColor.h b/source/ChatColor.h index 85b10f400..85b10f400 100644 --- a/source/cChatColor.h +++ b/source/ChatColor.h diff --git a/source/cChestEntity.cpp b/source/ChestEntity.cpp index 659bd7083..262217da8 100644 --- a/source/cChestEntity.cpp +++ b/source/ChestEntity.cpp @@ -1,14 +1,14 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cChestEntity.h" -#include "cItem.h" -#include "cClientHandle.h" -#include "cPlayer.h" +#include "ChestEntity.h" +#include "Item.h" +#include "ClientHandle.h" +#include "Player.h" #include "UI/Window.h" -#include "cWorld.h" -#include "cRoot.h" -#include "cPickup.h" +#include "World.h" +#include "Root.h" +#include "Pickup.h" #include <json/json.h> diff --git a/source/cChestEntity.h b/source/ChestEntity.h index 2f6301479..2269e6614 100644 --- a/source/cChestEntity.h +++ b/source/ChestEntity.h @@ -1,7 +1,7 @@ #pragma once -#include "cBlockEntity.h" +#include "BlockEntity.h" #include "UI/WindowOwner.h" diff --git a/source/cChunk.cpp b/source/Chunk.cpp index d2d680794..7cd3b961f 100644 --- a/source/cChunk.cpp +++ b/source/Chunk.cpp @@ -6,30 +6,30 @@ #endif -#include "cChunk.h" -#include "cWorld.h" -#include "cWaterSimulator.h" -#include "cLavaSimulator.h" -#include "cClientHandle.h" -#include "cServer.h" +#include "Chunk.h" +#include "World.h" +#include "WaterSimulator.h" +#include "LavaSimulator.h" +#include "ClientHandle.h" +#include "Server.h" #include "zlib.h" #include "Defines.h" -#include "cChestEntity.h" -#include "cFurnaceEntity.h" -#include "cSignEntity.h" -#include "cNoteEntity.h" -#include "cTorch.h" -#include "cLadder.h" -#include "cPickup.h" -#include "cRedstone.h" -#include "cItem.h" -#include "cNoise.h" -#include "cRoot.h" +#include "ChestEntity.h" +#include "FurnaceEntity.h" +#include "SignEntity.h" +#include "NoteEntity.h" +#include "Torch.h" +#include "Ladder.h" +#include "Pickup.h" +#include "Redstone.h" +#include "Item.h" +#include "Noise.h" +#include "Root.h" #include "MersenneTwister.h" -#include "cPlayer.h" +#include "Player.h" #include "BlockArea.h" -#include "cPluginManager.h" -#include "blocks/Block.h" +#include "PluginManager.h" +#include "blocks/BlockHandler.h" #include <json/json.h> diff --git a/source/cChunk.h b/source/Chunk.h index d094a3a64..c9d1e0899 100644 --- a/source/cChunk.h +++ b/source/Chunk.h @@ -1,7 +1,7 @@ #pragma once -#include "cEntity.h" +#include "Entity.h" #include "ChunkDef.h" @@ -313,7 +313,7 @@ typedef std::list<cChunkPtr> cChunkPtrList; #if C_CHUNK_USE_INLINE - #include "cChunk.inl.h" + #include "Chunk.inl.h" #endif diff --git a/source/cChunk.inl.h b/source/Chunk.inl.h index fb9c4dad1..fb9c4dad1 100644 --- a/source/cChunk.inl.h +++ b/source/Chunk.inl.h diff --git a/source/cChunkMap.cpp b/source/ChunkMap.cpp index a53357c50..508d5ae11 100644 --- a/source/cChunkMap.cpp +++ b/source/ChunkMap.cpp @@ -1,14 +1,14 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cChunkMap.h" -#include "cWorld.h" -#include "cRoot.h" -#include "cPlayer.h" +#include "ChunkMap.h" +#include "World.h" +#include "Root.h" +#include "Player.h" #include "BlockID.h" -#include "cItem.h" -#include "cPickup.h" -#include "cChunk.h" +#include "Item.h" +#include "Pickup.h" +#include "Chunk.h" #include "Generating/Trees.h" // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination #ifndef _WIN32 diff --git a/source/cChunkMap.h b/source/ChunkMap.h index 4165be089..4165be089 100644 --- a/source/cChunkMap.h +++ b/source/ChunkMap.h diff --git a/source/ChunkSender.cpp b/source/ChunkSender.cpp index 922d77ad6..ea5ed91ea 100644 --- a/source/ChunkSender.cpp +++ b/source/ChunkSender.cpp @@ -9,8 +9,8 @@ #include "Globals.h" #include "ChunkSender.h" -#include "cWorld.h" -#include "cBlockEntity.h" +#include "World.h" +#include "BlockEntity.h" #include "Protocol/ChunkDataSerializer.h" diff --git a/source/cClientHandle.cpp b/source/ClientHandle.cpp index 2d97cfa01..a080b4ed6 100644 --- a/source/cClientHandle.cpp +++ b/source/ClientHandle.cpp @@ -1,38 +1,38 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cClientHandle.h" -#include "cServer.h" -#include "cWorld.h" -#include "cPickup.h" -#include "cPluginManager.h" -#include "cPlayer.h" -#include "cInventory.h" -#include "cChestEntity.h" -#include "cSignEntity.h" +#include "ClientHandle.h" +#include "Server.h" +#include "World.h" +#include "Pickup.h" +#include "PluginManager.h" +#include "Player.h" +#include "Inventory.h" +#include "ChestEntity.h" +#include "SignEntity.h" #include "UI/Window.h" -#include "cItem.h" -#include "cTorch.h" -#include "cDoors.h" -#include "cLadder.h" -#include "cVine.h" -#include "cSign.h" -#include "cRedstone.h" -#include "cPiston.h" +#include "Item.h" +#include "Torch.h" +#include "Doors.h" +#include "Ladder.h" +#include "Vine.h" +#include "Sign.h" +#include "Redstone.h" +#include "Piston.h" #include "Mobs/Monster.h" -#include "cChatColor.h" +#include "ChatColor.h" #include "OSSupport/Socket.h" #include "OSSupport/Timer.h" -#include "items/Item.h" -#include "blocks/Block.h" +#include "items/ItemHandler.h" +#include "blocks/BlockHandler.h" -#include "cTracer.h" +#include "Tracer.h" #include "Vector3f.h" #include "Vector3d.h" -#include "cRoot.h" +#include "Root.h" -#include "cAuthenticator.h" +#include "Authenticator.h" #include "MersenneTwister.h" #include "Protocol/ProtocolRecognizer.h" diff --git a/source/cClientHandle.h b/source/ClientHandle.h index 83d0fd9c0..83d0fd9c0 100644 --- a/source/cClientHandle.h +++ b/source/ClientHandle.h diff --git a/source/CraftingRecipes.cpp b/source/CraftingRecipes.cpp index f75434e75..4cf503b3a 100644 --- a/source/CraftingRecipes.cpp +++ b/source/CraftingRecipes.cpp @@ -5,8 +5,8 @@ #include "Globals.h" #include "CraftingRecipes.h" -#include "cRoot.h" -#include "cPluginManager.h" +#include "Root.h" +#include "PluginManager.h" diff --git a/source/CraftingRecipes.h b/source/CraftingRecipes.h index 74d103f4d..9d92cbfab 100644 --- a/source/CraftingRecipes.h +++ b/source/CraftingRecipes.h @@ -8,7 +8,7 @@ #pragma once -#include "cItem.h" +#include "Item.h" diff --git a/source/cCuboid.cpp b/source/Cuboid.cpp index 86600f6b6..7b3b24528 100644 --- a/source/cCuboid.cpp +++ b/source/Cuboid.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cCuboid.h" +#include "Cuboid.h" diff --git a/source/cCuboid.h b/source/Cuboid.h index a07d665fc..a07d665fc 100644 --- a/source/cCuboid.h +++ b/source/Cuboid.h diff --git a/source/cDoors.h b/source/Doors.h index 71fec0d39..71fec0d39 100644 --- a/source/cDoors.h +++ b/source/Doors.h diff --git a/source/cEntity.cpp b/source/Entity.cpp index e6ed2baaa..6bc5dfc39 100644 --- a/source/cEntity.cpp +++ b/source/Entity.cpp @@ -1,15 +1,15 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cEntity.h" -#include "cWorld.h" -#include "cServer.h" -#include "cRoot.h" +#include "Entity.h" +#include "World.h" +#include "Server.h" +#include "Root.h" #include "Vector3d.h" #include "Vector3f.h" #include "Matrix4f.h" -#include "cReferenceManager.h" -#include "cClientHandle.h" +#include "ReferenceManager.h" +#include "ClientHandle.h" diff --git a/source/cEntity.h b/source/Entity.h index 15c351a09..15c351a09 100644 --- a/source/cEntity.h +++ b/source/Entity.h diff --git a/source/cFireSimulator.cpp b/source/FireSimulator.cpp index da447a01f..9a08524ef 100644 --- a/source/cFireSimulator.cpp +++ b/source/FireSimulator.cpp @@ -1,8 +1,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cFireSimulator.h" -#include "cWorld.h" +#include "FireSimulator.h" +#include "World.h" #include "Vector3i.h" #include "BlockID.h" #include "Defines.h" diff --git a/source/cFireSimulator.h b/source/FireSimulator.h index 5c6a3aeaa..863fa9835 100644 --- a/source/cFireSimulator.h +++ b/source/FireSimulator.h @@ -1,8 +1,8 @@ #pragma once -#include "cSimulator.h" -#include "cBlockEntity.h" +#include "Simulator.h" +#include "BlockEntity.h" diff --git a/source/cFluidSimulator.cpp b/source/FluidSimulator.cpp index 937a40c68..804db9d36 100644 --- a/source/cFluidSimulator.cpp +++ b/source/FluidSimulator.cpp @@ -3,13 +3,13 @@ #include <set> #include <queue> -#include "cFluidSimulator.h" -#include "cWorld.h" +#include "FluidSimulator.h" +#include "World.h" #include "Vector3i.h" #include "BlockID.h" #include "Defines.h" -#include "cItem.h" -#include "blocks/Block.h" +#include "Item.h" +#include "blocks/BlockHandler.h" diff --git a/source/cFluidSimulator.h b/source/FluidSimulator.h index 4557d3ef1..1ec254595 100644 --- a/source/cFluidSimulator.h +++ b/source/FluidSimulator.h @@ -1,6 +1,6 @@ #pragma once -#include "cSimulator.h" +#include "Simulator.h" #include "Vector3i.h" diff --git a/source/cFurnaceEntity.cpp b/source/FurnaceEntity.cpp index 07df83452..15298cbdd 100644 --- a/source/cFurnaceEntity.cpp +++ b/source/FurnaceEntity.cpp @@ -1,17 +1,17 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cFurnaceEntity.h" +#include "FurnaceEntity.h" #include "BlockID.h" -#include "cItem.h" +#include "Item.h" #include "UI/Window.h" -#include "cPlayer.h" -#include "cWorld.h" -#include "cClientHandle.h" -#include "cFurnaceRecipe.h" -#include "cServer.h" -#include "cPickup.h" -#include "cRoot.h" +#include "Player.h" +#include "World.h" +#include "ClientHandle.h" +#include "FurnaceRecipe.h" +#include "Server.h" +#include "Pickup.h" +#include "Root.h" #include <json/json.h> diff --git a/source/cFurnaceEntity.h b/source/FurnaceEntity.h index 60aec47af..1c417c739 100644 --- a/source/cFurnaceEntity.h +++ b/source/FurnaceEntity.h @@ -1,9 +1,9 @@ #pragma once -#include "cBlockEntity.h" +#include "BlockEntity.h" #include "UI/WindowOwner.h" -#include "cItem.h" +#include "Item.h" diff --git a/source/cFurnaceRecipe.cpp b/source/FurnaceRecipe.cpp index 3f6416d92..444d46f74 100644 --- a/source/cFurnaceRecipe.cpp +++ b/source/FurnaceRecipe.cpp @@ -1,8 +1,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cFurnaceRecipe.h" -#include "cItem.h" +#include "FurnaceRecipe.h" +#include "Item.h" #include <fstream> #include <sstream> diff --git a/source/cFurnaceRecipe.h b/source/FurnaceRecipe.h index ccb008604..ccb008604 100644 --- a/source/cFurnaceRecipe.h +++ b/source/FurnaceRecipe.h diff --git a/source/Generating/BioGen.h b/source/Generating/BioGen.h index 6cd78b7e0..d268c1de6 100644 --- a/source/Generating/BioGen.h +++ b/source/Generating/BioGen.h @@ -15,7 +15,7 @@ Interfaces to the various biome generators: #pragma once #include "ChunkGenerator.h" -#include "../cNoise.h" +#include "../Noise.h" diff --git a/source/Generating/Caves.h b/source/Generating/Caves.h index cc3f00a52..2e66c909c 100644 --- a/source/Generating/Caves.h +++ b/source/Generating/Caves.h @@ -13,7 +13,7 @@ #pragma once
#include "ChunkGenerator.h"
-#include "../cNoise.h"
+#include "../Noise.h"
diff --git a/source/Generating/ChunkGenerator.cpp b/source/Generating/ChunkGenerator.cpp index 5862c0f5f..eca24c6a7 100644 --- a/source/Generating/ChunkGenerator.cpp +++ b/source/Generating/ChunkGenerator.cpp @@ -2,16 +2,16 @@ #include "Globals.h" #include "ChunkGenerator.h" -#include "../cWorld.h" +#include "../World.h" #include "../../iniFile/iniFile.h" #include "BioGen.h" #include "HeiGen.h" #include "CompoGen.h" #include "StructGen.h" #include "FinishGen.h" -#include "../cRoot.h" -#include "../cPluginManager.h" -#include "../cLuaChunk.h" +#include "../Root.h" +#include "../PluginManager.h" +#include "../LuaChunk.h" #include "Ravines.h" #include "Caves.h" diff --git a/source/Generating/CompoGen.h b/source/Generating/CompoGen.h index 235b9dafd..f6dfa6131 100644 --- a/source/Generating/CompoGen.h +++ b/source/Generating/CompoGen.h @@ -15,7 +15,7 @@ #pragma once #include "ChunkGenerator.h" -#include "../cNoise.h" +#include "../Noise.h" diff --git a/source/Generating/FinishGen.cpp b/source/Generating/FinishGen.cpp index c3aedd1a0..6d0811891 100644 --- a/source/Generating/FinishGen.cpp +++ b/source/Generating/FinishGen.cpp @@ -10,7 +10,7 @@ #include "Globals.h" #include "FinishGen.h" -#include "../cNoise.h" +#include "../Noise.h" #include "../BlockID.h" diff --git a/source/Generating/FinishGen.h b/source/Generating/FinishGen.h index f9a539572..b6d3c3935 100644 --- a/source/Generating/FinishGen.h +++ b/source/Generating/FinishGen.h @@ -14,7 +14,7 @@ #include "ChunkGenerator.h" -#include "../cNoise.h" +#include "../Noise.h" diff --git a/source/Generating/HeiGen.h b/source/Generating/HeiGen.h index 42e70f2a5..101179bfc 100644 --- a/source/Generating/HeiGen.h +++ b/source/Generating/HeiGen.h @@ -15,7 +15,7 @@ Interfaces to the various height generators: #pragma once #include "ChunkGenerator.h" -#include "../cNoise.h" +#include "../Noise.h" diff --git a/source/Generating/Ravines.h b/source/Generating/Ravines.h index 623986f29..d2d2b9391 100644 --- a/source/Generating/Ravines.h +++ b/source/Generating/Ravines.h @@ -10,7 +10,7 @@ #pragma once
#include "ChunkGenerator.h"
-#include "../cNoise.h"
+#include "../Noise.h"
diff --git a/source/Generating/StructGen.h b/source/Generating/StructGen.h index 8ddfdadba..fafd0f85d 100644 --- a/source/Generating/StructGen.h +++ b/source/Generating/StructGen.h @@ -14,7 +14,7 @@ #pragma once #include "ChunkGenerator.h" -#include "../cNoise.h" +#include "../Noise.h" diff --git a/source/Generating/Trees.h b/source/Generating/Trees.h index d3e76a78c..f5148ad6f 100644 --- a/source/Generating/Trees.h +++ b/source/Generating/Trees.h @@ -18,7 +18,7 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is #pragma once #include "../ChunkDef.h" -#include "../cNoise.h" +#include "../Noise.h" diff --git a/source/Globals.h b/source/Globals.h index f8d3a7bbc..b9892c933 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -169,7 +169,7 @@ typedef short Int16; #include "OSSupport/Event.h" #include "OSSupport/Thread.h" #include "OSSupport/File.h" -#include "cMCLogger.h" +#include "MCLogger.h" diff --git a/source/cGroup.cpp b/source/Group.cpp index 04549b0eb..448d29d87 100644 --- a/source/cGroup.cpp +++ b/source/Group.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cGroup.h" +#include "Group.h" void cGroup::AddCommand( std::string a_Command ) { diff --git a/source/cGroup.h b/source/Group.h index 447802e88..447802e88 100644 --- a/source/cGroup.h +++ b/source/Group.h diff --git a/source/cGroupManager.cpp b/source/GroupManager.cpp index 2458308c9..982b67b45 100644 --- a/source/cGroupManager.cpp +++ b/source/GroupManager.cpp @@ -1,11 +1,11 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cGroupManager.h" -#include "cGroup.h" +#include "GroupManager.h" +#include "Group.h" #include "../iniFile/iniFile.h" -#include "cChatColor.h" -#include "cRoot.h" +#include "ChatColor.h" +#include "Root.h" diff --git a/source/cGroupManager.h b/source/GroupManager.h index 214d6991d..214d6991d 100644 --- a/source/cGroupManager.h +++ b/source/GroupManager.h diff --git a/source/cHeartBeat.cpp b/source/HeartBeat.cpp index 1cff0abb2..45acd0e1f 100644 --- a/source/cHeartBeat.cpp +++ b/source/HeartBeat.cpp @@ -1,12 +1,12 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cHeartBeat.h" -#include "cMCLogger.h" +#include "HeartBeat.h" +#include "MCLogger.h" #include "md5/md5.h" -#include "cRoot.h" -#include "cServer.h" +#include "Root.h" +#include "Server.h" diff --git a/source/cHeartBeat.h b/source/HeartBeat.h index 79465507c..79465507c 100644 --- a/source/cHeartBeat.h +++ b/source/HeartBeat.h diff --git a/source/cInventory.cpp b/source/Inventory.cpp index 41d4c14fa..1ad349fb5 100644 --- a/source/cInventory.cpp +++ b/source/Inventory.cpp @@ -1,16 +1,16 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cInventory.h" -#include "cPlayer.h" -#include "cClientHandle.h" +#include "Inventory.h" +#include "Player.h" +#include "ClientHandle.h" #include "UI/Window.h" -#include "cItem.h" -#include "cRoot.h" +#include "Item.h" +#include "Root.h" #include <json/json.h> -#include "items/Item.h" +#include "items/ItemHandler.h" diff --git a/source/cInventory.h b/source/Inventory.h index bce485852..1dd22deec 100644 --- a/source/cInventory.h +++ b/source/Inventory.h @@ -1,7 +1,7 @@ #pragma once -#include "cItem.h" +#include "Item.h" diff --git a/source/cItem.cpp b/source/Item.cpp index fd71a0b54..7d8a18f98 100644 --- a/source/cItem.cpp +++ b/source/Item.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cItem.h" +#include "Item.h" #include <json/json.h> diff --git a/source/cItem.h b/source/Item.h index aa4b76bbc..aa4b76bbc 100644 --- a/source/cItem.h +++ b/source/Item.h diff --git a/source/cLadder.h b/source/Ladder.h index b3dc0fb96..b3dc0fb96 100644 --- a/source/cLadder.h +++ b/source/Ladder.h diff --git a/source/cLavaSimulator.cpp b/source/LavaSimulator.cpp index 6e3c2a3fa..15cf5591c 100644 --- a/source/cLavaSimulator.cpp +++ b/source/LavaSimulator.cpp @@ -1,7 +1,7 @@ #include "Globals.h" -#include "cLavaSimulator.h" +#include "LavaSimulator.h" #include "Defines.h" -#include "cWorld.h" +#include "World.h" cLavaSimulator::cLavaSimulator(cWorld *a_World) diff --git a/source/cLavaSimulator.h b/source/LavaSimulator.h index 44f9935dd..3a9159f1c 100644 --- a/source/cLavaSimulator.h +++ b/source/LavaSimulator.h @@ -1,5 +1,5 @@ #pragma once -#include "cFluidSimulator.h" +#include "FluidSimulator.h" class cLavaSimulator : public cFluidSimulator { diff --git a/source/LightingThread.cpp b/source/LightingThread.cpp index 67f3b4116..071c1893a 100644 --- a/source/LightingThread.cpp +++ b/source/LightingThread.cpp @@ -5,8 +5,8 @@ #include "Globals.h" #include "LightingThread.h" -#include "cChunkMap.h" -#include "cWorld.h" +#include "ChunkMap.h" +#include "World.h" diff --git a/source/cLog.cpp b/source/Log.cpp index 142aabe28..42c58eb27 100644 --- a/source/cLog.cpp +++ b/source/Log.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cLog.h" +#include "Log.h" #include <fstream> #include <ctime> diff --git a/source/cLog.h b/source/Log.h index b405b52a4..b405b52a4 100644 --- a/source/cLog.h +++ b/source/Log.h diff --git a/source/cLuaChunk.cpp b/source/LuaChunk.cpp index a5f831ba7..8e3148cbe 100644 --- a/source/cLuaChunk.cpp +++ b/source/LuaChunk.cpp @@ -1,4 +1,4 @@ #include "Globals.h" -#include "cLuaChunk.h" +#include "LuaChunk.h" diff --git a/source/cLuaChunk.h b/source/LuaChunk.h index dc6f2a0f2..dc6f2a0f2 100644 --- a/source/cLuaChunk.h +++ b/source/LuaChunk.h diff --git a/source/cLuaCommandBinder.cpp b/source/LuaCommandBinder.cpp index 62d57b640..c25b422a7 100644 --- a/source/cLuaCommandBinder.cpp +++ b/source/LuaCommandBinder.cpp @@ -1,10 +1,10 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cLuaCommandBinder.h" -#include "cPlayer.h" -#include "cPlugin.h" -#include "cPlugin_Lua.h" +#include "LuaCommandBinder.h" +#include "Player.h" +#include "Plugin.h" +#include "Plugin_Lua.h" #include "tolua++.h" diff --git a/source/cLuaCommandBinder.h b/source/LuaCommandBinder.h index 768d097f8..768d097f8 100644 --- a/source/cLuaCommandBinder.h +++ b/source/LuaCommandBinder.h diff --git a/source/LuaFunctions.h b/source/LuaFunctions.h index 66a505980..0ad420881 100644 --- a/source/LuaFunctions.h +++ b/source/LuaFunctions.h @@ -1,6 +1,6 @@ #pragma once -#include "cMCLogger.h" +#include "MCLogger.h" #include <time.h> // tolua_begin diff --git a/source/LuaItems.h b/source/LuaItems.h index 37bd713c4..f6f06c903 100644 --- a/source/LuaItems.h +++ b/source/LuaItems.h @@ -9,7 +9,7 @@ #pragma once -#include "cItem.h" +#include "Item.h" diff --git a/source/cMCLogger.cpp b/source/MCLogger.cpp index 4e0823d14..daf43f796 100644 --- a/source/cMCLogger.cpp +++ b/source/MCLogger.cpp @@ -2,7 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include <time.h> -#include "cLog.h" +#include "Log.h" diff --git a/source/cMCLogger.h b/source/MCLogger.h index 04ba732bf..04ba732bf 100644 --- a/source/cMCLogger.h +++ b/source/MCLogger.h diff --git a/source/ManualBindings.cpp b/source/ManualBindings.cpp index 6e07b0aff..34cf73520 100644 --- a/source/ManualBindings.cpp +++ b/source/ManualBindings.cpp @@ -4,16 +4,16 @@ #include "ManualBindings.h" #include "tolua++.h" -#include "cRoot.h" -#include "cWorld.h" -#include "cPlugin.h" -#include "cPlugin_NewLua.h" -#include "cPluginManager.h" -#include "cLuaCommandBinder.h" -#include "cPlayer.h" -#include "cWebAdmin.h" -#include "cStringMap.h" -#include "cClientHandle.h" +#include "Root.h" +#include "World.h" +#include "Plugin.h" +#include "Plugin_NewLua.h" +#include "PluginManager.h" +#include "LuaCommandBinder.h" +#include "Player.h" +#include "WebAdmin.h" +#include "StringMap.h" +#include "ClientHandle.h" #include "md5/md5.h" diff --git a/source/Mobs/AggressiveMonster.cpp b/source/Mobs/AggressiveMonster.cpp index 2a5370968..d178ce8f8 100644 --- a/source/Mobs/AggressiveMonster.cpp +++ b/source/Mobs/AggressiveMonster.cpp @@ -4,7 +4,7 @@ #include "AggressiveMonster.h" #include "../Vector3f.h" -#include "../cPlayer.h" +#include "../Player.h" #include "../MersenneTwister.h" diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp index 9142bd6a8..1a93f8d75 100644 --- a/source/Mobs/Monster.cpp +++ b/source/Mobs/Monster.cpp @@ -2,20 +2,20 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Monster.h" -#include "../cRoot.h" -#include "../cServer.h" -#include "../cClientHandle.h" -#include "../cWorld.h" -#include "../cPlayer.h" +#include "../Root.h" +#include "../Server.h" +#include "../ClientHandle.h" +#include "../World.h" +#include "../Player.h" #include "../Defines.h" -#include "../cMonsterConfig.h" +#include "../MonsterConfig.h" #include "../MersenneTwister.h" #include "../Vector3f.h" #include "../Vector3i.h" #include "../Vector3d.h" -#include "../cTracer.h" +#include "../Tracer.h" #include "../../iniFile/iniFile.h" /* diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h index 0958d182c..f0da23977 100644 --- a/source/Mobs/Monster.h +++ b/source/Mobs/Monster.h @@ -1,11 +1,11 @@ #pragma once -#include "../cPawn.h" +#include "../Pawn.h" #include "../Defines.h" -#include "../cWorld.h" +#include "../World.h" #include "../BlockID.h" -#include "../cItem.h" +#include "../Item.h" diff --git a/source/Mobs/PassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp index abf37ee59..9d9e156ee 100644 --- a/source/Mobs/PassiveAggressiveMonster.cpp +++ b/source/Mobs/PassiveAggressiveMonster.cpp @@ -3,7 +3,7 @@ #include "PassiveAggressiveMonster.h" -#include "../cPlayer.h" +#include "../Player.h" diff --git a/source/cMonsterConfig.cpp b/source/MonsterConfig.cpp index c399902c3..f4e1d2c70 100644 --- a/source/cMonsterConfig.cpp +++ b/source/MonsterConfig.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cMonsterConfig.h" +#include "MonsterConfig.h" #include "Mobs/Monster.h" #include "../iniFile/iniFile.h" //#include <cstdio> diff --git a/source/cMonsterConfig.h b/source/MonsterConfig.h index d1a514b17..d1a514b17 100644 --- a/source/cMonsterConfig.h +++ b/source/MonsterConfig.h diff --git a/source/cNoise.cpp b/source/Noise.cpp index b4e7a5752..fab46d652 100644 --- a/source/cNoise.cpp +++ b/source/Noise.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cNoise.h" +#include "Noise.h" #include <math.h> #if NOISE_USE_SSE @@ -369,7 +369,7 @@ void IntArrayLinearInterpolate2D( #if NOISE_USE_INLINE -# include "cNoise.inc" + #include "Noise.inc" #endif diff --git a/source/cNoise.h b/source/Noise.h index 6d0a69483..68428d33e 100644 --- a/source/cNoise.h +++ b/source/Noise.h @@ -86,7 +86,7 @@ extern void IntArrayLinearInterpolate2D( #if NOISE_USE_INLINE -# include "cNoise.inc" + #include "Noise.inc" #endif diff --git a/source/cNoise.inc b/source/Noise.inc index 60fd2f394..60fd2f394 100644 --- a/source/cNoise.inc +++ b/source/Noise.inc diff --git a/source/cNoteEntity.cpp b/source/NoteEntity.cpp index f007433fc..6dc32ddd5 100644 --- a/source/cNoteEntity.cpp +++ b/source/NoteEntity.cpp @@ -1,8 +1,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "cNoteEntity.h"
-#include "cWorld.h"
+#include "NoteEntity.h"
+#include "World.h"
#include <json/json.h>
diff --git a/source/cNoteEntity.h b/source/NoteEntity.h index fad1f8f06..b78437f6f 100644 --- a/source/cNoteEntity.h +++ b/source/NoteEntity.h @@ -1,7 +1,7 @@ #pragma once
-#include "cBlockEntity.h"
+#include "BlockEntity.h"
namespace Json
diff --git a/source/cPawn.cpp b/source/Pawn.cpp index cecc19522..ae8133420 100644 --- a/source/cPawn.cpp +++ b/source/Pawn.cpp @@ -1,12 +1,12 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cPawn.h" -#include "cRoot.h" -#include "cServer.h" -#include "cWorld.h" -#include "cPlayer.h" -#include "cPluginManager.h" +#include "Pawn.h" +#include "Root.h" +#include "Server.h" +#include "World.h" +#include "Player.h" +#include "PluginManager.h" #include "Vector3d.h" #include "BlockID.h" #include "Defines.h" diff --git a/source/cPawn.h b/source/Pawn.h index b48ce94ab..9cc106cc1 100644 --- a/source/cPawn.h +++ b/source/Pawn.h @@ -1,7 +1,7 @@ #pragma once -#include "cEntity.h" +#include "Entity.h" diff --git a/source/cPickup.cpp b/source/Pickup.cpp index a9545e57d..8a32a328b 100644 --- a/source/cPickup.cpp +++ b/source/Pickup.cpp @@ -5,17 +5,17 @@ #include <cstdlib> #endif -#include "cPickup.h" -#include "cClientHandle.h" -#include "cInventory.h" -#include "cWorld.h" -#include "cWaterSimulator.h" -#include "cServer.h" -#include "cPlayer.h" -#include "cPluginManager.h" -#include "cItem.h" -#include "cRoot.h" -#include "cTracer.h" +#include "Pickup.h" +#include "ClientHandle.h" +#include "Inventory.h" +#include "World.h" +#include "WaterSimulator.h" +#include "Server.h" +#include "Player.h" +#include "PluginManager.h" +#include "Item.h" +#include "Root.h" +#include "Tracer.h" #include "Vector3d.h" #include "Vector3f.h" diff --git a/source/cPickup.h b/source/Pickup.h index 8e8f514b8..56a34c6a6 100644 --- a/source/cPickup.h +++ b/source/Pickup.h @@ -1,7 +1,7 @@ #pragma once -#include "cEntity.h" +#include "Entity.h" diff --git a/source/cPiston.cpp b/source/Piston.cpp index 4d6ccef0e..a4c014729 100644 --- a/source/cPiston.cpp +++ b/source/Piston.cpp @@ -1,17 +1,17 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cPiston.h" -#include "cRedstone.h" +#include "Piston.h" +#include "Redstone.h" #include "ChunkDef.h" -#include "cPickup.h" -#include "cItem.h" -#include "cRoot.h" -#include "cClientHandle.h" -#include "cWorld.h" +#include "Pickup.h" +#include "Item.h" +#include "Root.h" +#include "ClientHandle.h" +#include "World.h" #include "BlockID.h" -#include "cServer.h" -#include "blocks/Block.h" +#include "Server.h" +#include "blocks/BlockHandler.h" extern bool g_BlockPistonBreakable[]; diff --git a/source/cPiston.h b/source/Piston.h index d52b92b3d..d52b92b3d 100644 --- a/source/cPiston.h +++ b/source/Piston.h diff --git a/source/cPlayer.cpp b/source/Player.cpp index 1de9bf36a..b20287750 100644 --- a/source/cPlayer.cpp +++ b/source/Player.cpp @@ -1,21 +1,21 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cPlayer.h" -#include "cServer.h" -#include "cClientHandle.h" +#include "Player.h" +#include "Server.h" +#include "ClientHandle.h" #include "UI/Window.h" #include "UI/WindowOwner.h" -#include "cWorld.h" -#include "cPickup.h" -#include "cPluginManager.h" -#include "cBlockEntity.h" -#include "cGroupManager.h" -#include "cGroup.h" -#include "cChatColor.h" -#include "cItem.h" -#include "cTracer.h" -#include "cRoot.h" +#include "World.h" +#include "Pickup.h" +#include "PluginManager.h" +#include "BlockEntity.h" +#include "GroupManager.h" +#include "Group.h" +#include "ChatColor.h" +#include "Item.h" +#include "Tracer.h" +#include "Root.h" #include "OSSupport/MakeDir.h" #include "OSSupport/Timer.h" #include "MersenneTwister.h" diff --git a/source/cPlayer.h b/source/Player.h index d5b63941c..d9cfddece 100644 --- a/source/cPlayer.h +++ b/source/Player.h @@ -1,8 +1,8 @@ #pragma once -#include "cPawn.h" -#include "cInventory.h" +#include "Pawn.h" +#include "Inventory.h" #include "Defines.h" diff --git a/source/cPlugin.cpp b/source/Plugin.cpp index ce66a9655..563e6237d 100644 --- a/source/cPlugin.cpp +++ b/source/Plugin.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cPlugin.h" +#include "Plugin.h" diff --git a/source/cPlugin.h b/source/Plugin.h index c9367051a..d88a26d4e 100644 --- a/source/cPlugin.h +++ b/source/Plugin.h @@ -1,7 +1,7 @@ #pragma once -#include "cItem.h" +#include "Item.h" class cClientHandle; class cPlayer; diff --git a/source/cPluginManager.cpp b/source/PluginManager.cpp index 8f52839c8..a76fc0442 100644 --- a/source/cPluginManager.cpp +++ b/source/PluginManager.cpp @@ -1,22 +1,22 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cPluginManager.h" -#include "cPlugin.h" -#include "cPlugin_Lua.h" -#include "cPlugin_NewLua.h" -#include "cWebAdmin.h" -#include "cItem.h" -#include "cRoot.h" -#include "cLuaCommandBinder.h" +#include "PluginManager.h" +#include "Plugin.h" +#include "Plugin_Lua.h" +#include "Plugin_NewLua.h" +#include "WebAdmin.h" +#include "Item.h" +#include "Root.h" +#include "LuaCommandBinder.h" #ifdef USE_SQUIRREL - #include "cPlugin_Squirrel.h" - #include "cSquirrelCommandBinder.h" + #include "Plugin_Squirrel.h" + #include "SquirrelCommandBinder.h" #endif #include "../iniFile/iniFile.h" #include "tolua++.h" -#include "cPlayer.h" +#include "Player.h" #ifdef USE_SQUIRREL #include "squirrelbindings/SquirrelBindings.h" diff --git a/source/cPluginManager.h b/source/PluginManager.h index ea02bff19..a62aa795a 100644 --- a/source/cPluginManager.h +++ b/source/PluginManager.h @@ -1,7 +1,7 @@ #pragma once -#include "cItem.h" +#include "Item.h" struct lua_State; class cLuaCommandBinder; diff --git a/source/cPlugin_Lua.cpp b/source/Plugin_Lua.cpp index a4cf972f4..14258dd0d 100644 --- a/source/cPlugin_Lua.cpp +++ b/source/Plugin_Lua.cpp @@ -2,9 +2,9 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #define LUA_USE_POSIX -#include "cPlugin_Lua.h" -#include "cPluginManager.h" -#include "cRoot.h" +#include "Plugin_Lua.h" +#include "PluginManager.h" +#include "Root.h" extern "C" { diff --git a/source/cPlugin_Lua.h b/source/Plugin_Lua.h index 73787de0c..73787de0c 100644 --- a/source/cPlugin_Lua.h +++ b/source/Plugin_Lua.h diff --git a/source/cPlugin_NewLua.cpp b/source/Plugin_NewLua.cpp index bb7878f60..061441735 100644 --- a/source/cPlugin_NewLua.cpp +++ b/source/Plugin_NewLua.cpp @@ -2,8 +2,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #define LUA_USE_POSIX -#include "cPlugin_NewLua.h" -#include "cMCLogger.h" +#include "Plugin_NewLua.h" +#include "MCLogger.h" #include "LuaItems.h" extern "C" diff --git a/source/cPlugin_NewLua.h b/source/Plugin_NewLua.h index 082b2a82b..38e66e329 100644 --- a/source/cPlugin_NewLua.h +++ b/source/Plugin_NewLua.h @@ -1,8 +1,8 @@ #pragma once -#include "cPlugin.h" -#include "cWebPlugin.h" +#include "Plugin.h" +#include "WebPlugin.h" diff --git a/source/cPlugin_Squirrel.cpp b/source/Plugin_Squirrel.cpp index 8b13718a7..930c0cf11 100644 --- a/source/cPlugin_Squirrel.cpp +++ b/source/Plugin_Squirrel.cpp @@ -1,8 +1,8 @@ #include "Globals.h"
-#include "cPlugin_Squirrel.h"
+#include "Plugin_Squirrel.h"
#include "squirrelbindings/SquirrelFunctions.h"
#include "squirrelbindings/SquirrelBindings.h"
-#include "squirrelbindings/cSquirrelBaseClass.h"
+#include "squirrelbindings/SquirrelBaseClass.h"
cPlugin_Squirrel::cPlugin_Squirrel( const char* a_PluginName )
diff --git a/source/cPlugin_Squirrel.h b/source/Plugin_Squirrel.h index 9cec0fee8..9d27261d0 100644 --- a/source/cPlugin_Squirrel.h +++ b/source/Plugin_Squirrel.h @@ -1,7 +1,7 @@ #pragma once
-#include "cPlugin.h"
+#include "Plugin.h"
#include <sqrat.h>
#include "squirrelbindings/SquirrelObject.h"
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp index 67c8f53b3..2ae82fb43 100644 --- a/source/Protocol/Protocol125.cpp +++ b/source/Protocol/Protocol125.cpp @@ -13,16 +13,16 @@ Documentation: #include "Protocol125.h"
-#include "../cClientHandle.h"
+#include "../ClientHandle.h"
#include "ChunkDataSerializer.h"
-#include "../cEntity.h"
+#include "../Entity.h"
#include "../Mobs/Monster.h"
-#include "../cPickup.h"
-#include "../cPlayer.h"
-#include "../cChatColor.h"
+#include "../Pickup.h"
+#include "../Player.h"
+#include "../ChatColor.h"
#include "../UI/Window.h"
-#include "../cRoot.h"
-#include "../cServer.h"
+#include "../Root.h"
+#include "../Server.h"
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp index 9e6af0729..32b55e280 100644 --- a/source/Protocol/Protocol132.cpp +++ b/source/Protocol/Protocol132.cpp @@ -5,13 +5,13 @@ #include "Globals.h"
#include "Protocol132.h"
-#include "../cRoot.h"
-#include "../cServer.h"
-#include "../cClientHandle.h"
+#include "../Root.h"
+#include "../Server.h"
+#include "../ClientHandle.h"
#include "../../CryptoPP/randpool.h"
-#include "../cItem.h"
+#include "../Item.h"
#include "ChunkDataSerializer.h"
-#include "../cPlayer.h"
+#include "../Player.h"
#include "../Mobs/Monster.h"
#include "../UI/Window.h"
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp index 18bf3b0b3..095d63f8f 100644 --- a/source/Protocol/ProtocolRecognizer.cpp +++ b/source/Protocol/ProtocolRecognizer.cpp @@ -9,10 +9,10 @@ #include "ProtocolRecognizer.h"
#include "Protocol125.h"
#include "Protocol132.h"
-#include "../cClientHandle.h"
-#include "../cRoot.h"
-#include "../cWorld.h"
-#include "../cChatColor.h"
+#include "../ClientHandle.h"
+#include "../Root.h"
+#include "../World.h"
+#include "../ChatColor.h"
diff --git a/source/cRedstone.cpp b/source/Redstone.cpp index 701835d5a..01a343223 100644 --- a/source/cRedstone.cpp +++ b/source/Redstone.cpp @@ -1,10 +1,10 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cRedstone.h" -#include "cPiston.h" -#include "cRoot.h" -#include "cWorld.h" +#include "Redstone.h" +#include "Piston.h" +#include "Root.h" +#include "World.h" #include "BlockID.h" #include <iostream> diff --git a/source/cRedstone.h b/source/Redstone.h index a5377e8a7..a5377e8a7 100644 --- a/source/cRedstone.h +++ b/source/Redstone.h diff --git a/source/cRedstoneSimulator.cpp b/source/RedstoneSimulator.cpp index 8d46b1347..3d5fd51f0 100644 --- a/source/cRedstoneSimulator.cpp +++ b/source/RedstoneSimulator.cpp @@ -1,12 +1,12 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cRedstoneSimulator.h" -#include "cPiston.h" -#include "cWorld.h" +#include "RedstoneSimulator.h" +#include "Piston.h" +#include "World.h" #include "BlockID.h" -#include "cTorch.h" +#include "Torch.h" -#include "cRedstone.h" +#include "Redstone.h" diff --git a/source/cRedstoneSimulator.h b/source/RedstoneSimulator.h index 6ac1eef5d..3a845bf6b 100644 --- a/source/cRedstoneSimulator.h +++ b/source/RedstoneSimulator.h @@ -1,6 +1,6 @@ #pragma once -#include "cSimulator.h" +#include "Simulator.h" #include "Vector3i.h" class cRedstoneSimulator : public cSimulator diff --git a/source/cReferenceManager.cpp b/source/ReferenceManager.cpp index b39d71858..259e3a1a0 100644 --- a/source/cReferenceManager.cpp +++ b/source/ReferenceManager.cpp @@ -1,8 +1,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cReferenceManager.h" -#include "cEntity.h" +#include "ReferenceManager.h" +#include "Entity.h" diff --git a/source/cReferenceManager.h b/source/ReferenceManager.h index bcd451f72..bcd451f72 100644 --- a/source/cReferenceManager.h +++ b/source/ReferenceManager.h diff --git a/source/cRoot.cpp b/source/Root.cpp index 6cd696da8..2a6afc0e7 100644 --- a/source/cRoot.cpp +++ b/source/Root.cpp @@ -1,21 +1,20 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cRoot.h" -#include "cServer.h" -#include "cWorld.h" -#include "cWebAdmin.h" -#include "cFurnaceRecipe.h" -#include "cGroupManager.h" +#include "Root.h" +#include "Server.h" +#include "World.h" +#include "WebAdmin.h" +#include "FurnaceRecipe.h" +#include "GroupManager.h" #include "CraftingRecipes.h" -#include "cPluginManager.h" -#include "cMonsterConfig.h" -#include "cFileFormatUpdater.h" -#include "cRedstone.h" -#include "cPlayer.h" -#include "blocks/Block.h" -#include "items/Item.h" -#include "cChunk.h" +#include "PluginManager.h" +#include "MonsterConfig.h" +#include "Redstone.h" +#include "Player.h" +#include "blocks/BlockHandler.h" +#include "items/ItemHandler.h" +#include "Chunk.h" #ifdef USE_SQUIRREL #include "squirrelbindings/SquirrelFunctions.h" @@ -94,8 +93,6 @@ void cRoot::Start() LoadGlobalSettings(); - cFileFormatUpdater::UpdateFileFormat(); - LOG("Creating new server instance..."); m_Server = new cServer(); diff --git a/source/cRoot.h b/source/Root.h index e25a9805b..5a2238332 100644 --- a/source/cRoot.h +++ b/source/Root.h @@ -4,7 +4,7 @@ -#include "cAuthenticator.h" +#include "Authenticator.h" diff --git a/source/cSandSimulator.cpp b/source/SandSimulator.cpp index 6e5c5ecde..1dd9d3d88 100644 --- a/source/cSandSimulator.cpp +++ b/source/SandSimulator.cpp @@ -1,8 +1,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cSandSimulator.h" -#include "cWorld.h" +#include "SandSimulator.h" +#include "World.h" #include "Vector3i.h" #include "BlockID.h" #include "Defines.h" diff --git a/source/cSandSimulator.h b/source/SandSimulator.h index c95d5e476..6dbac1974 100644 --- a/source/cSandSimulator.h +++ b/source/SandSimulator.h @@ -1,8 +1,8 @@ #pragma once -#include "cSimulator.h" -#include "cBlockEntity.h" +#include "Simulator.h" +#include "BlockEntity.h" #include "Vector3i.h" diff --git a/source/cServer.cpp b/source/Server.cpp index e8b58c756..c77892076 100644 --- a/source/cServer.cpp +++ b/source/Server.cpp @@ -3,23 +3,23 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cServer.h" -#include "cClientHandle.h" +#include "Server.h" +#include "ClientHandle.h" #include "OSSupport/Timer.h" #include "Mobs/Monster.h" #include "OSSupport/Socket.h" -#include "cRoot.h" -#include "cWorld.h" +#include "Root.h" +#include "World.h" #include "ChunkDef.h" -#include "cPluginManager.h" -#include "cGroupManager.h" -#include "cChatColor.h" -#include "cPlayer.h" -#include "cInventory.h" -#include "cItem.h" -#include "cFurnaceRecipe.h" -#include "cTracer.h" -#include "cWebAdmin.h" +#include "PluginManager.h" +#include "GroupManager.h" +#include "ChatColor.h" +#include "Player.h" +#include "Inventory.h" +#include "Item.h" +#include "FurnaceRecipe.h" +#include "Tracer.h" +#include "WebAdmin.h" #include "Protocol/ProtocolRecognizer.h" #include "MersenneTwister.h" diff --git a/source/cServer.h b/source/Server.h index b3599aa1e..b3599aa1e 100644 --- a/source/cServer.h +++ b/source/Server.h diff --git a/source/cSign.h b/source/Sign.h index 9daa8234c..9daa8234c 100644 --- a/source/cSign.h +++ b/source/Sign.h diff --git a/source/cSignEntity.cpp b/source/SignEntity.cpp index 6caff7add..f2ac4b0b1 100644 --- a/source/cSignEntity.cpp +++ b/source/SignEntity.cpp @@ -1,12 +1,12 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cSignEntity.h" +#include "SignEntity.h" -#include "cPlayer.h" -#include "cClientHandle.h" -#include "cWorld.h" -#include "cRoot.h" +#include "Player.h" +#include "ClientHandle.h" +#include "World.h" +#include "Root.h" #include <json/json.h> diff --git a/source/cSignEntity.h b/source/SignEntity.h index 4066d5070..6455afbe7 100644 --- a/source/cSignEntity.h +++ b/source/SignEntity.h @@ -1,7 +1,7 @@ #pragma once -#include "cBlockEntity.h" +#include "BlockEntity.h" diff --git a/source/cSimulator.cpp b/source/Simulator.cpp index 377d69eb3..e4608e150 100644 --- a/source/cSimulator.cpp +++ b/source/Simulator.cpp @@ -1,8 +1,8 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cSimulator.h" -#include "cWorld.h" +#include "Simulator.h" +#include "World.h" #include "Vector3i.h" #include "BlockID.h" #include "Defines.h" diff --git a/source/cSimulator.h b/source/Simulator.h index 158e74b99..158e74b99 100644 --- a/source/cSimulator.h +++ b/source/Simulator.h diff --git a/source/cSimulatorManager.cpp b/source/SimulatorManager.cpp index 0d7ef356d..0aef1ec6c 100644 --- a/source/cSimulatorManager.cpp +++ b/source/SimulatorManager.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cSimulatorManager.h" +#include "SimulatorManager.h" diff --git a/source/cSimulatorManager.h b/source/SimulatorManager.h index ec8804992..e90acffab 100644 --- a/source/cSimulatorManager.h +++ b/source/SimulatorManager.h @@ -9,7 +9,7 @@ -#include "cSimulator.h" +#include "Simulator.h" diff --git a/source/cSquirrelCommandBinder.cpp b/source/SquirrelCommandBinder.cpp index e2a34dfb6..50eae9333 100644 --- a/source/cSquirrelCommandBinder.cpp +++ b/source/SquirrelCommandBinder.cpp @@ -1,10 +1,10 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "cSquirrelCommandBinder.h"
-#include "cPlayer.h"
-#include "cPlugin.h"
-#include "cPlugin_Squirrel.h"
+#include "SquirrelCommandBinder.h"
+#include "Player.h"
+#include "Plugin.h"
+#include "Plugin_Squirrel.h"
#include "squirrelbindings/SquirrelArray.h"
diff --git a/source/cSquirrelCommandBinder.h b/source/SquirrelCommandBinder.h index 50e026d06..50e026d06 100644 --- a/source/cSquirrelCommandBinder.h +++ b/source/SquirrelCommandBinder.h diff --git a/source/cStairs.h b/source/Stairs.h index e17f4abc1..e17f4abc1 100644 --- a/source/cStairs.h +++ b/source/Stairs.h diff --git a/source/cStringMap.cpp b/source/StringMap.cpp index 26b9cf5fe..8ba8891e0 100644 --- a/source/cStringMap.cpp +++ b/source/StringMap.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cStringMap.h" +#include "StringMap.h" diff --git a/source/cStringMap.h b/source/StringMap.h index 1cf20048d..1cf20048d 100644 --- a/source/cStringMap.h +++ b/source/StringMap.h diff --git a/source/cTorch.h b/source/Torch.h index fa301c3d4..fa301c3d4 100644 --- a/source/cTorch.h +++ b/source/Torch.h diff --git a/source/cTracer.cpp b/source/Tracer.cpp index fba0f908c..fb1ab6c3b 100644 --- a/source/cTracer.cpp +++ b/source/Tracer.cpp @@ -1,15 +1,15 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cTracer.h" -#include "cWorld.h" +#include "Tracer.h" +#include "World.h" #include "Vector3f.h" #include "Vector3i.h" #include "Vector3d.h" #include "BlockID.h" -#include "cEntity.h" +#include "Entity.h" #include "Defines.h" diff --git a/source/cTracer.h b/source/Tracer.h index fa9d3c673..fa9d3c673 100644 --- a/source/cTracer.h +++ b/source/Tracer.h diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp index 655f85524..73d26eb27 100644 --- a/source/UI/SlotArea.cpp +++ b/source/UI/SlotArea.cpp @@ -5,13 +5,13 @@ #include "Globals.h"
#include "SlotArea.h"
-#include "../cPlayer.h"
-#include "../cChestEntity.h"
-#include "../cFurnaceEntity.h"
-#include "../Items/Item.h"
+#include "../Player.h"
+#include "../ChestEntity.h"
+#include "../FurnaceEntity.h"
+#include "../Items/ItemHandler.h"
#include "Window.h"
#include "../CraftingRecipes.h"
-#include "../cRoot.h"
+#include "../Root.h"
diff --git a/source/UI/SlotArea.h b/source/UI/SlotArea.h index 79f95c5d5..e356fbdd8 100644 --- a/source/UI/SlotArea.h +++ b/source/UI/SlotArea.h @@ -8,7 +8,7 @@ #pragma once
-#include "../cItem.h"
+#include "../Item.h"
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp index e6c7a9feb..b3d72570c 100644 --- a/source/UI/Window.cpp +++ b/source/UI/Window.cpp @@ -2,15 +2,15 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Window.h" -#include "../cItem.h" -#include "../cClientHandle.h" -#include "../cPlayer.h" -#include "../cPickup.h" -#include "../cInventory.h" +#include "../Item.h" +#include "../ClientHandle.h" +#include "../Player.h" +#include "../Pickup.h" +#include "../Inventory.h" #include "WindowOwner.h" -#include "../items/Item.h" +#include "../items/ItemHandler.h" #include "SlotArea.h" -#include "../cChestEntity.h" +#include "../ChestEntity.h" diff --git a/source/UI/Window.h b/source/UI/Window.h index b3df1bc86..8caab3bd1 100644 --- a/source/UI/Window.h +++ b/source/UI/Window.h @@ -9,7 +9,7 @@ #pragma once -#include "../cItem.h" +#include "../Item.h" diff --git a/source/UI/WindowOwner.h b/source/UI/WindowOwner.h index e0cc8da8a..7ad4a5739 100644 --- a/source/UI/WindowOwner.h +++ b/source/UI/WindowOwner.h @@ -1,8 +1,8 @@ #pragma once -#include "../cBlockEntity.h" -#include "../cEntity.h" +#include "../BlockEntity.h" +#include "../Entity.h" #include "Window.h" /* diff --git a/source/cVine.h b/source/Vine.h index d4bc99c1a..d4bc99c1a 100644 --- a/source/cVine.h +++ b/source/Vine.h diff --git a/source/cWaterSimulator.cpp b/source/WaterSimulator.cpp index 642d54aac..48389ccd4 100644 --- a/source/cWaterSimulator.cpp +++ b/source/WaterSimulator.cpp @@ -1,7 +1,7 @@ #include "Globals.h" -#include "cWaterSimulator.h" +#include "WaterSimulator.h" #include "Defines.h" -#include "cWorld.h" +#include "World.h" diff --git a/source/cWaterSimulator.h b/source/WaterSimulator.h index 7d4a4a19b..aa81a74f6 100644 --- a/source/cWaterSimulator.h +++ b/source/WaterSimulator.h @@ -1,5 +1,5 @@ #pragma once -#include "cFluidSimulator.h" +#include "FluidSimulator.h" class cWaterSimulator : public cFluidSimulator { diff --git a/source/cWebAdmin.cpp b/source/WebAdmin.cpp index 32cf5e338..577fbbd5f 100644 --- a/source/cWebAdmin.cpp +++ b/source/WebAdmin.cpp @@ -1,18 +1,18 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cWebAdmin.h" -#include "cStringMap.h" +#include "WebAdmin.h" +#include "StringMap.h" -#include "cWebPlugin.h" +#include "WebPlugin.h" -#include "cPluginManager.h" -#include "cPlugin.h" +#include "PluginManager.h" +#include "Plugin.h" -#include "cWorld.h" -#include "cPlayer.h" -#include "cServer.h" -#include "cRoot.h" +#include "World.h" +#include "Player.h" +#include "Server.h" +#include "Root.h" #include "../iniFile/iniFile.h" diff --git a/source/cWebAdmin.h b/source/WebAdmin.h index f50de3f64..f50de3f64 100644 --- a/source/cWebAdmin.h +++ b/source/WebAdmin.h diff --git a/source/cWebPlugin.cpp b/source/WebPlugin.cpp index 47e7d9e49..93619ef14 100644 --- a/source/cWebPlugin.cpp +++ b/source/WebPlugin.cpp @@ -1,10 +1,10 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cWebPlugin.h" -#include "cWebAdmin.h" -#include "cServer.h" -#include "cRoot.h" +#include "WebPlugin.h" +#include "WebAdmin.h" +#include "Server.h" +#include "Root.h" diff --git a/source/cWebPlugin.h b/source/WebPlugin.h index 35af88167..35af88167 100644 --- a/source/cWebPlugin.h +++ b/source/WebPlugin.h diff --git a/source/cWorld.cpp b/source/World.cpp index dd5f216d1..9b241c8ee 100644 --- a/source/cWorld.cpp +++ b/source/World.cpp @@ -2,23 +2,23 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "BlockID.h" -#include "cWorld.h" -#include "cRedstone.h" +#include "World.h" +#include "Redstone.h" #include "ChunkDef.h" -#include "cClientHandle.h" -#include "cPickup.h" -#include "cPlayer.h" -#include "cServer.h" -#include "cItem.h" -#include "cRoot.h" +#include "ClientHandle.h" +#include "Pickup.h" +#include "Player.h" +#include "Server.h" +#include "Item.h" +#include "Root.h" #include "../iniFile/iniFile.h" -#include "cChunkMap.h" -#include "cSimulatorManager.h" -#include "cWaterSimulator.h" -#include "cLavaSimulator.h" -#include "cFireSimulator.h" -#include "cSandSimulator.h" -#include "cRedstoneSimulator.h" +#include "ChunkMap.h" +#include "SimulatorManager.h" +#include "WaterSimulator.h" +#include "LavaSimulator.h" +#include "FireSimulator.h" +#include "SandSimulator.h" +#include "RedstoneSimulator.h" // Mobs: #include "Mobs/Chicken.h" @@ -40,10 +40,10 @@ #include "OSSupport/MakeDir.h" #include "MersenneTwister.h" -#include "cTracer.h" +#include "Tracer.h" #include "Generating/Trees.h" -#include "cPluginManager.h" -#include "blocks/Block.h" +#include "PluginManager.h" +#include "blocks/BlockHandler.h" #include "Vector3d.h" #include "tolua++.h" diff --git a/source/cWorld.h b/source/World.h index a65368bfe..1cbd6a2fb 100644 --- a/source/cWorld.h +++ b/source/World.h @@ -9,9 +9,9 @@ #define MAX_PLAYERS 65535 -#include "cSimulatorManager.h" +#include "SimulatorManager.h" #include "MersenneTwister.h" -#include "cChunkMap.h" +#include "ChunkMap.h" #include "WorldStorage/WorldStorage.h" #include "Generating/ChunkGenerator.h" #include "Vector3i.h" @@ -19,7 +19,7 @@ #include "ChunkSender.h" #include "Defines.h" #include "LightingThread.h" -#include "cItem.h" +#include "Item.h" diff --git a/source/WorldStorage/WSSAnvil.cpp b/source/WorldStorage/WSSAnvil.cpp index b39dee7c7..2036da92d 100644 --- a/source/WorldStorage/WSSAnvil.cpp +++ b/source/WorldStorage/WSSAnvil.cpp @@ -5,16 +5,16 @@ #include "Globals.h" #include "WSSAnvil.h" -#include "../cWorld.h" +#include "../World.h" #include "zlib.h" #include "../BlockID.h" -#include "../cChestEntity.h" -#include "../cFurnaceEntity.h" -#include "../cSignEntity.h" -#include "../cNoteEntity.h" -#include "../cItem.h" +#include "../ChestEntity.h" +#include "../FurnaceEntity.h" +#include "../SignEntity.h" +#include "../NoteEntity.h" +#include "../Item.h" #include "../StringCompression.h" -#include "../cEntity.h" +#include "../Entity.h" #include "../OSSupport/MakeDir.h" #include "FastNBT.h" diff --git a/source/WorldStorage/WSSCompact.cpp b/source/WorldStorage/WSSCompact.cpp index e604ca9b9..addb2a1cd 100644 --- a/source/WorldStorage/WSSCompact.cpp +++ b/source/WorldStorage/WSSCompact.cpp @@ -5,14 +5,14 @@ #include "Globals.h" #include "WSSCompact.h" -#include "../cWorld.h" +#include "../World.h" #include "zlib.h" #include <json/json.h> #include "../StringCompression.h" -#include "../cChestEntity.h" -#include "../cSignEntity.h" -#include "../cFurnaceEntity.h" -#include "../cNoteEntity.h" +#include "../ChestEntity.h" +#include "../SignEntity.h" +#include "../FurnaceEntity.h" +#include "../NoteEntity.h" #include "../BlockID.h" diff --git a/source/WorldStorage/WorldStorage.cpp b/source/WorldStorage/WorldStorage.cpp index 503d49527..a11956e5c 100644 --- a/source/WorldStorage/WorldStorage.cpp +++ b/source/WorldStorage/WorldStorage.cpp @@ -9,10 +9,10 @@ #include "WorldStorage.h" #include "WSSCompact.h" #include "WSSAnvil.h" -#include "../cWorld.h" +#include "../World.h" #include "../Generating/ChunkGenerator.h" -#include "../cEntity.h" -#include "../cBlockEntity.h" +#include "../Entity.h" +#include "../BlockEntity.h" #include "../BlockID.h" diff --git a/source/blocks/BlockCactus.h b/source/blocks/BlockCactus.h index 9da9d796b..964646299 100644 --- a/source/blocks/BlockCactus.h +++ b/source/blocks/BlockCactus.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
diff --git a/source/blocks/BlockChest.h b/source/blocks/BlockChest.h index 65c0ffa5c..db67fe1c8 100644 --- a/source/blocks/BlockChest.h +++ b/source/blocks/BlockChest.h @@ -1,8 +1,8 @@ #pragma once
#include "BlockEntity.h"
-#include "../cWorld.h"
-#include "../cPiston.h"
-#include "../cPlayer.h"
+#include "../World.h"
+#include "../Piston.h"
+#include "../Player.h"
class cBlockChestHandler : public cBlockEntityHandler
{
diff --git a/source/blocks/BlockCloth.h b/source/blocks/BlockCloth.h index d83b18ebb..452ad2237 100644 --- a/source/blocks/BlockCloth.h +++ b/source/blocks/BlockCloth.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockClothHandler : public cBlockHandler
diff --git a/source/blocks/BlockCrops.h b/source/blocks/BlockCrops.h index ebf911131..b30139e79 100644 --- a/source/blocks/BlockCrops.h +++ b/source/blocks/BlockCrops.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
class cBlockCropsHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockDirt.h b/source/blocks/BlockDirt.h index 28993d29c..5a2487f1b 100644 --- a/source/blocks/BlockDirt.h +++ b/source/blocks/BlockDirt.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
class cBlockDirtHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockDispenser.h b/source/blocks/BlockDispenser.h index f3ad20d5c..eee75a39a 100644 --- a/source/blocks/BlockDispenser.h +++ b/source/blocks/BlockDispenser.h @@ -1,8 +1,8 @@ #pragma once
#include "BlockEntity.h"
-#include "../cWorld.h"
-#include "../cPiston.h"
-#include "../cPlayer.h"
+#include "../World.h"
+#include "../Piston.h"
+#include "../Player.h"
class cBlockDispenserHandler : public cBlockEntityHandler
{
diff --git a/source/blocks/BlockDoor.cpp b/source/blocks/BlockDoor.cpp index 283f546b6..deed8a256 100644 --- a/source/blocks/BlockDoor.cpp +++ b/source/blocks/BlockDoor.cpp @@ -1,9 +1,9 @@ #include "Globals.h"
#include "BlockDoor.h"
-#include "../cItem.h"
-#include "../cWorld.h"
-#include "../cDoors.h"
-#include "../cPlayer.h"
+#include "../Item.h"
+#include "../World.h"
+#include "../Doors.h"
+#include "../Player.h"
cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockID)
diff --git a/source/blocks/BlockDoor.h b/source/blocks/BlockDoor.h index 6af8bd955..3316f50a4 100644 --- a/source/blocks/BlockDoor.h +++ b/source/blocks/BlockDoor.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockDoorHandler : public cBlockHandler
diff --git a/source/blocks/BlockEntity.h b/source/blocks/BlockEntity.h index bfc3241d3..caf6ee342 100644 --- a/source/blocks/BlockEntity.h +++ b/source/blocks/BlockEntity.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
diff --git a/source/blocks/BlockFire.h b/source/blocks/BlockFire.h index 1b9f68060..1fecf9a14 100644 --- a/source/blocks/BlockFire.h +++ b/source/blocks/BlockFire.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockFireHandler : public cBlockHandler
diff --git a/source/blocks/BlockFlower.h b/source/blocks/BlockFlower.h index 920cf1c8f..35a55fcac 100644 --- a/source/blocks/BlockFlower.h +++ b/source/blocks/BlockFlower.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockFlowerHandler : public cBlockHandler
diff --git a/source/blocks/BlockFluid.h b/source/blocks/BlockFluid.h index 6883ce715..c5ac660b0 100644 --- a/source/blocks/BlockFluid.h +++ b/source/blocks/BlockFluid.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockFluidHandler : public cBlockHandler
diff --git a/source/blocks/BlockFurnace.h b/source/blocks/BlockFurnace.h index d0455e805..4157b5049 100644 --- a/source/blocks/BlockFurnace.h +++ b/source/blocks/BlockFurnace.h @@ -1,8 +1,8 @@ #pragma once
#include "BlockEntity.h"
-#include "../cWorld.h"
-#include "../cPiston.h"
-#include "../cPlayer.h"
+#include "../World.h"
+#include "../Piston.h"
+#include "../Player.h"
class cBlockFurnaceHandler : public cBlockEntityHandler
{
diff --git a/source/blocks/BlockGlowstone.h b/source/blocks/BlockGlowstone.h index ecd34a1d9..0b906e2fe 100644 --- a/source/blocks/BlockGlowstone.h +++ b/source/blocks/BlockGlowstone.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockGlowstoneHandler : public cBlockHandler
diff --git a/source/blocks/BlockGravel.h b/source/blocks/BlockGravel.h index d4f36a894..da47db9bb 100644 --- a/source/blocks/BlockGravel.h +++ b/source/blocks/BlockGravel.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockGravelHandler : public cBlockHandler
diff --git a/source/blocks/Block.cpp b/source/blocks/BlockHandler.cpp index 98868de7d..f45f40f9e 100644 --- a/source/blocks/Block.cpp +++ b/source/blocks/BlockHandler.cpp @@ -1,7 +1,7 @@ #include "Globals.h"
-#include "Block.h"
-#include "../cItem.h"
-#include "../cWorld.h"
+#include "BlockHandler.h"
+#include "../Item.h"
+#include "../World.h"
#include "BlockSand.h"
#include "BlockGravel.h"
#include "BlockDoor.h"
diff --git a/source/blocks/Block.h b/source/blocks/BlockHandler.h index 859870c4a..859870c4a 100644 --- a/source/blocks/Block.h +++ b/source/blocks/BlockHandler.h diff --git a/source/blocks/BlockIce.h b/source/blocks/BlockIce.h index d6bb63b0a..cc5cc8920 100644 --- a/source/blocks/BlockIce.h +++ b/source/blocks/BlockIce.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
class cBlockIceHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockLadder.h b/source/blocks/BlockLadder.h index e30fc884d..ee48df848 100644 --- a/source/blocks/BlockLadder.h +++ b/source/blocks/BlockLadder.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
-#include "../cWorld.h"
-#include "../cLadder.h"
+#include "BlockHandler.h"
+#include "../World.h"
+#include "../Ladder.h"
class cBlockLadderHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockLeaves.h b/source/blocks/BlockLeaves.h index c2ec697ae..65c47f8de 100644 --- a/source/blocks/BlockLeaves.h +++ b/source/blocks/BlockLeaves.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
#include "../BlockArea.h"
diff --git a/source/blocks/BlockMelon.h b/source/blocks/BlockMelon.h index 3abcc6efb..87fb7e1e8 100644 --- a/source/blocks/BlockMelon.h +++ b/source/blocks/BlockMelon.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockMelonHandler : public cBlockHandler
diff --git a/source/blocks/BlockMushroom.h b/source/blocks/BlockMushroom.h index ca787dce6..c4119bad0 100644 --- a/source/blocks/BlockMushroom.h +++ b/source/blocks/BlockMushroom.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockMushroomHandler : public cBlockHandler
diff --git a/source/blocks/BlockNote.h b/source/blocks/BlockNote.h index 2c439f623..896a5d03b 100644 --- a/source/blocks/BlockNote.h +++ b/source/blocks/BlockNote.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "BlockEntity.h"
class cBlockNoteHandler : public cBlockEntityHandler
diff --git a/source/blocks/BlockOre.h b/source/blocks/BlockOre.h index 4788c9b89..556a215ce 100644 --- a/source/blocks/BlockOre.h +++ b/source/blocks/BlockOre.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
class cBlockOreHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockPiston.cpp b/source/blocks/BlockPiston.cpp index c2fcdd1f2..a4ed13d88 100644 --- a/source/blocks/BlockPiston.cpp +++ b/source/blocks/BlockPiston.cpp @@ -1,10 +1,10 @@ #include "Globals.h"
#include "BlockPiston.h"
-#include "../cItem.h"
-#include "../cWorld.h"
-#include "../cRedstone.h"
-#include "../cPlayer.h"
-#include "../cPiston.h"
+#include "../Item.h"
+#include "../World.h"
+#include "../Redstone.h"
+#include "../Player.h"
+#include "../Piston.h"
diff --git a/source/blocks/BlockPiston.h b/source/blocks/BlockPiston.h index 1493ff27e..dbce9bae5 100644 --- a/source/blocks/BlockPiston.h +++ b/source/blocks/BlockPiston.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockPistonHandler : public cBlockHandler
diff --git a/source/blocks/BlockRedstone.cpp b/source/blocks/BlockRedstone.cpp index 58edaa1cd..7653436f4 100644 --- a/source/blocks/BlockRedstone.cpp +++ b/source/blocks/BlockRedstone.cpp @@ -1,9 +1,9 @@ #include "Globals.h"
#include "BlockRedstone.h"
-#include "../cItem.h"
-#include "../cWorld.h"
-#include "../cRedstone.h"
-#include "../cTorch.h"
+#include "../Item.h"
+#include "../World.h"
+#include "../Redstone.h"
+#include "../Torch.h"
cBlockRedstoneHandler::cBlockRedstoneHandler(BLOCKTYPE a_BlockID)
: cBlockHandler(a_BlockID)
diff --git a/source/blocks/BlockRedstone.h b/source/blocks/BlockRedstone.h index dd2c75fc4..9b83b1b29 100644 --- a/source/blocks/BlockRedstone.h +++ b/source/blocks/BlockRedstone.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
-#include "../cWorld.h"
+#include "BlockHandler.h"
+#include "../World.h"
class cBlockRedstoneHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockRedstoneRepeater.cpp b/source/blocks/BlockRedstoneRepeater.cpp index 4921cd6f7..861f6e221 100644 --- a/source/blocks/BlockRedstoneRepeater.cpp +++ b/source/blocks/BlockRedstoneRepeater.cpp @@ -1,9 +1,9 @@ #include "Globals.h"
#include "BlockRedstoneRepeater.h"
-#include "../cItem.h"
-#include "../cWorld.h"
-#include "../cRedstone.h"
-#include "../cPlayer.h"
+#include "../Item.h"
+#include "../World.h"
+#include "../Redstone.h"
+#include "../Player.h"
cBlockRedstoneRepeaterHandler::cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockID)
: cBlockHandler(a_BlockID)
diff --git a/source/blocks/BlockRedstoneRepeater.h b/source/blocks/BlockRedstoneRepeater.h index c2ed30e2c..a928f554f 100644 --- a/source/blocks/BlockRedstoneRepeater.h +++ b/source/blocks/BlockRedstoneRepeater.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
-#include "../cWorld.h"
+#include "BlockHandler.h"
+#include "../World.h"
class cBlockRedstoneRepeaterHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockRedstoneTorch.h b/source/blocks/BlockRedstoneTorch.h index 42d3a0366..eeb2afc5c 100644 --- a/source/blocks/BlockRedstoneTorch.h +++ b/source/blocks/BlockRedstoneTorch.h @@ -2,7 +2,7 @@ #pragma once
#include "BlockRedstone.h"
#include "BlockTorch.h"
-#include "../cTorch.h"
+#include "../Torch.h"
diff --git a/source/blocks/BlockSand.h b/source/blocks/BlockSand.h index 71096c5a7..69fda5ec6 100644 --- a/source/blocks/BlockSand.h +++ b/source/blocks/BlockSand.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockSandHandler : public cBlockHandler
diff --git a/source/blocks/BlockSapling.h b/source/blocks/BlockSapling.h index e4ca998cb..c9862349a 100644 --- a/source/blocks/BlockSapling.h +++ b/source/blocks/BlockSapling.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
-#include "../cWorld.h"
+#include "BlockHandler.h"
+#include "../World.h"
class cBlockSaplingHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockSign.h b/source/blocks/BlockSign.h index b0f9d7f7f..dd82605b3 100644 --- a/source/blocks/BlockSign.h +++ b/source/blocks/BlockSign.h @@ -1,8 +1,8 @@ #pragma once
-#include "Block.h"
-#include "../cWorld.h"
-#include "../cSign.h"
-#include "../cPlayer.h"
+#include "BlockHandler.h"
+#include "../World.h"
+#include "../Sign.h"
+#include "../Player.h"
class cBlockSignHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockSlab.h b/source/blocks/BlockSlab.h index 11d1933c3..ad9970d67 100644 --- a/source/blocks/BlockSlab.h +++ b/source/blocks/BlockSlab.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockSlabHandler : public cBlockHandler
diff --git a/source/blocks/BlockSnow.h b/source/blocks/BlockSnow.h index ba9d35183..c8e6b4c1c 100644 --- a/source/blocks/BlockSnow.h +++ b/source/blocks/BlockSnow.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockSnowHandler : public cBlockHandler
diff --git a/source/blocks/BlockStairs.h b/source/blocks/BlockStairs.h index 4e06a6e3f..4d0007bc5 100644 --- a/source/blocks/BlockStairs.h +++ b/source/blocks/BlockStairs.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
-#include "../cStairs.h"
+#include "BlockHandler.h"
+#include "../Stairs.h"
class cBlockStairsHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockStems.h b/source/blocks/BlockStems.h index aa6229536..be4519a52 100644 --- a/source/blocks/BlockStems.h +++ b/source/blocks/BlockStems.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
class cBlockStemsHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockStone.h b/source/blocks/BlockStone.h index bd644a3a4..8b645bf1e 100644 --- a/source/blocks/BlockStone.h +++ b/source/blocks/BlockStone.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../MersenneTwister.h"
-#include "../cWorld.h"
+#include "../World.h"
class cBlockStoneHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockSugarcane.h b/source/blocks/BlockSugarcane.h index 4b0cb5408..1d477b42b 100644 --- a/source/blocks/BlockSugarcane.h +++ b/source/blocks/BlockSugarcane.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
diff --git a/source/blocks/BlockTallGrass.h b/source/blocks/BlockTallGrass.h index 6e7854db8..f5bb1b373 100644 --- a/source/blocks/BlockTallGrass.h +++ b/source/blocks/BlockTallGrass.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockTallGrassHandler : public cBlockHandler
diff --git a/source/blocks/BlockTorch.h b/source/blocks/BlockTorch.h index f3b172bf9..450b5ecab 100644 --- a/source/blocks/BlockTorch.h +++ b/source/blocks/BlockTorch.h @@ -1,8 +1,8 @@ #pragma once
-#include "Block.h"
-#include "../cTorch.h"
-#include "../cWorld.h"
+#include "BlockHandler.h"
+#include "../Torch.h"
+#include "../World.h"
diff --git a/source/blocks/BlockVine.h b/source/blocks/BlockVine.h index 6b8d85339..56317219a 100644 --- a/source/blocks/BlockVine.h +++ b/source/blocks/BlockVine.h @@ -1,6 +1,6 @@ #pragma once
-#include "Block.h"
-#include "../cVine.h"
+#include "BlockHandler.h"
+#include "../Vine.h"
class cBlockVineHandler : public cBlockHandler
{
diff --git a/source/blocks/BlockWood.h b/source/blocks/BlockWood.h index 5e6615c1b..d71d5d71c 100644 --- a/source/blocks/BlockWood.h +++ b/source/blocks/BlockWood.h @@ -1,5 +1,5 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
class cBlockWoodHandler : public cBlockHandler
diff --git a/source/blocks/BlockWorkbench.h b/source/blocks/BlockWorkbench.h index 776628382..c1c004dc5 100644 --- a/source/blocks/BlockWorkbench.h +++ b/source/blocks/BlockWorkbench.h @@ -1,7 +1,7 @@ #pragma once
-#include "Block.h"
+#include "BlockHandler.h"
#include "../UI/Window.h"
-#include "../cPlayer.h"
+#include "../Player.h"
diff --git a/source/cFileFormatUpdater.cpp b/source/cFileFormatUpdater.cpp deleted file mode 100644 index 3991ede34..000000000 --- a/source/cFileFormatUpdater.cpp +++ /dev/null @@ -1,143 +0,0 @@ - -#include "Globals.h" - -#include "cFileFormatUpdater.h" -#include "Vector3d.h" -#include "Vector3f.h" - -#include "cItem.h" -#include <json/json.h> - - - - - -void cFileFormatUpdater::UpdateFileFormat() -{ - UpdatePlayersOfWorld("world"); -} - - - - - -// Convert player .bin files to JSON -void cFileFormatUpdater::UpdatePlayersOfWorld( const char* a_WorldName ) -{ - AString PlayerDir = AString( a_WorldName ) + "/player/"; - - AStringList AllFiles = GetDirectoryContents( PlayerDir.c_str() ); - for (AStringList::iterator itr = AllFiles.begin(); itr != AllFiles.end(); ++itr ) - { - AString & FileName = *itr; - if (FileName.rfind(".bin") != AString::npos) // Get only the files ending in .bin - { - PlayerBINtoJSON( (PlayerDir + FileName).c_str() ); - } - } -} - - - - - -#define READ(File, Var) \ - if (File.Read(&Var, sizeof(Var)) != sizeof(Var)) \ - { \ - LOGERROR("ERROR READING \"%s\" FROM FILE \"%s\"", #Var, a_FileName); \ - return; \ - } - -// Converts player binary files to human readable JSON -void cFileFormatUpdater::PlayerBINtoJSON( const char* a_FileName ) -{ - Vector3d PlayerPos; - Vector3f PlayerRot; - short PlayerHealth = 0; - - const unsigned int NumInventorySlots = 45; // At this time the player inventory has/had 45 slots - cItem IventoryItems[ NumInventorySlots ]; - - cFile f; - if (!f.Open(a_FileName, cFile::fmRead)) - { - return; - } - - // First read player position, rotation and health - READ(f, PlayerPos.x); - READ(f, PlayerPos.y); - READ(f, PlayerPos.z); - READ(f, PlayerRot.x); - READ(f, PlayerRot.y); - READ(f, PlayerRot.z); - READ(f, PlayerHealth); - - - for(unsigned int i = 0; i < NumInventorySlots; i++) - { - cItem & Item = IventoryItems[i]; - READ(f, Item.m_ItemID); - READ(f, Item.m_ItemCount); - READ(f, Item.m_ItemHealth); - } - f.Close(); - - // Loaded all the data, now create the JSON data - Json::Value JSON_PlayerPosition; - JSON_PlayerPosition.append( Json::Value( PlayerPos.x ) ); - JSON_PlayerPosition.append( Json::Value( PlayerPos.y ) ); - JSON_PlayerPosition.append( Json::Value( PlayerPos.z ) ); - - Json::Value JSON_PlayerRotation; - JSON_PlayerRotation.append( Json::Value( PlayerRot.x ) ); - JSON_PlayerRotation.append( Json::Value( PlayerRot.y ) ); - JSON_PlayerRotation.append( Json::Value( PlayerRot.z ) ); - - Json::Value JSON_Inventory; - for(unsigned int i = 0; i < NumInventorySlots; i++) - { - Json::Value JSON_Item; - IventoryItems[i].GetJson( JSON_Item ); - JSON_Inventory.append( JSON_Item ); - } - - Json::Value root; - root["position"] = JSON_PlayerPosition; - root["rotation"] = JSON_PlayerRotation; - root["inventory"] = JSON_Inventory; - root["health"] = PlayerHealth; - - Json::StyledWriter writer; - std::string JsonData = writer.write( root ); - - // Get correct filename - std::string FileName = a_FileName; - std::string FileNameWithoutExt = FileName.substr(0, FileName.find_last_of(".") ); - std::string FileNameJson = FileNameWithoutExt + ".json"; - - // Write to file - if (!f.Open(FileNameJson.c_str(), cFile::fmWrite)) - { - return; - } - if (f.Write(JsonData.c_str(), JsonData.size()) != JsonData.size()) - { - LOGERROR("ERROR WRITING PLAYER JSON TO FILE \"%s\"", FileNameJson.c_str()); - return; - } - f.Close(); - - // Delete old format file, only do this when conversion has succeeded - if (std::remove(a_FileName) != 0) - { - LOGERROR("COULD NOT DELETE old format file \"%s\"", a_FileName); - return; - } - - LOGINFO("Successfully converted binary to Json \"%s\"", FileNameJson.c_str() ); -} - - - - diff --git a/source/cFileFormatUpdater.h b/source/cFileFormatUpdater.h deleted file mode 100644 index 91e2761fb..000000000 --- a/source/cFileFormatUpdater.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -class cFileFormatUpdater -{ -public: - static void UpdateFileFormat(); -private: - static void UpdatePlayersOfWorld( const char* a_WorldName ); - - static void PlayerBINtoJSON( const char* a_FileName ); -};
\ No newline at end of file diff --git a/source/items/ItemBucket.h b/source/items/ItemBucket.h index 3e233e4f6..736112960 100644 --- a/source/items/ItemBucket.h +++ b/source/items/ItemBucket.h @@ -1,7 +1,8 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
class cItemBucketHandler : public cItemHandler
{
diff --git a/source/items/ItemCloth.h b/source/items/ItemCloth.h index d67e14864..5de064397 100644 --- a/source/items/ItemCloth.h +++ b/source/items/ItemCloth.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/items/ItemDoor.h b/source/items/ItemDoor.h index ac5bc6872..6e841333f 100644 --- a/source/items/ItemDoor.h +++ b/source/items/ItemDoor.h @@ -1,7 +1,8 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
class cItemDoorHandler : public cItemHandler
{
diff --git a/source/items/ItemDye.h b/source/items/ItemDye.h index 2203f410b..5b21a501c 100644 --- a/source/items/ItemDye.h +++ b/source/items/ItemDye.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemDyeHandler : public cItemHandler
{
diff --git a/source/items/ItemFood.h b/source/items/ItemFood.h index 8998fd503..6e5a27d5d 100644 --- a/source/items/ItemFood.h +++ b/source/items/ItemFood.h @@ -1,6 +1,7 @@ +
#pragma once
-#include "Item.h"
+#include "ItemHandler.h"
class cItemFoodHandler : public cItemHandler
diff --git a/source/items/Item.cpp b/source/items/ItemHandler.cpp index f1b376493..44f6438e1 100644 --- a/source/items/Item.cpp +++ b/source/items/ItemHandler.cpp @@ -1,9 +1,9 @@ #include "Globals.h"
-#include "Item.h"
-#include "../cItem.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "ItemHandler.h"
+#include "../Item.h"
+#include "../World.h"
+#include "../Player.h"
//Handler
#include "ItemCloth.h"
@@ -27,7 +27,7 @@ #include "ItemFood.h"
#include "ItemSign.h"
-#include "../blocks/Block.h"
+#include "../blocks/BlockHandler.h"
diff --git a/source/items/Item.h b/source/items/ItemHandler.h index 67935ecb4..67935ecb4 100644 --- a/source/items/Item.h +++ b/source/items/ItemHandler.h diff --git a/source/items/ItemHoe.h b/source/items/ItemHoe.h index 64dc4ca34..e7ea9135c 100644 --- a/source/items/ItemHoe.h +++ b/source/items/ItemHoe.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemHoeHandler : public cItemHandler
{
diff --git a/source/items/ItemLeaves.h b/source/items/ItemLeaves.h index 01b090a2f..f96adb0b8 100644 --- a/source/items/ItemLeaves.h +++ b/source/items/ItemLeaves.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/items/ItemLighter.h b/source/items/ItemLighter.h index 213677e4e..92279aafa 100644 --- a/source/items/ItemLighter.h +++ b/source/items/ItemLighter.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemLighterHandler : public cItemHandler
{
diff --git a/source/items/ItemPickaxe.h b/source/items/ItemPickaxe.h index a179d154f..158aca44f 100644 --- a/source/items/ItemPickaxe.h +++ b/source/items/ItemPickaxe.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemPickaxeHandler : public cItemHandler
{
diff --git a/source/items/ItemRedstoneDust.h b/source/items/ItemRedstoneDust.h index 4d1459bc6..1ce316d9e 100644 --- a/source/items/ItemRedstoneDust.h +++ b/source/items/ItemRedstoneDust.h @@ -1,6 +1,7 @@ #pragma once
-#include "Item.h"
+
+#include "ItemHandler.h"
diff --git a/source/items/ItemRedstoneRepeater.h b/source/items/ItemRedstoneRepeater.h index 85500c9f4..c31c2af53 100644 --- a/source/items/ItemRedstoneRepeater.h +++ b/source/items/ItemRedstoneRepeater.h @@ -1,6 +1,7 @@ #pragma once
-#include "Item.h"
+
+#include "ItemHandler.h"
diff --git a/source/items/ItemSapling.h b/source/items/ItemSapling.h index 7edbc76c9..b0c223f29 100644 --- a/source/items/ItemSapling.h +++ b/source/items/ItemSapling.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/items/ItemSeeds.h b/source/items/ItemSeeds.h index 07cf0e5de..3eb9d6e86 100644 --- a/source/items/ItemSeeds.h +++ b/source/items/ItemSeeds.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
diff --git a/source/items/ItemShears.h b/source/items/ItemShears.h index ab2981aae..2f3476735 100644 --- a/source/items/ItemShears.h +++ b/source/items/ItemShears.h @@ -1,8 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemShearsHandler : public cItemHandler
{
diff --git a/source/items/ItemShovel.h b/source/items/ItemShovel.h index 3279ef419..24928efb8 100644 --- a/source/items/ItemShovel.h +++ b/source/items/ItemShovel.h @@ -1,9 +1,15 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
-#include "../blocks/Block.h"
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
+
+#include "../blocks/BlockHandler.h"
+
+
+
+
class cItemShovelHandler : public cItemHandler
{
diff --git a/source/items/ItemSign.h b/source/items/ItemSign.h index 06116f0e8..a0c6aaa9c 100644 --- a/source/items/ItemSign.h +++ b/source/items/ItemSign.h @@ -1,7 +1,8 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
class cItemSignHandler : public cItemHandler
{
diff --git a/source/items/ItemSlab.h b/source/items/ItemSlab.h index 955d3acfc..0bab038a2 100644 --- a/source/items/ItemSlab.h +++ b/source/items/ItemSlab.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
diff --git a/source/items/ItemSugarcane.h b/source/items/ItemSugarcane.h index 74557479e..4fdf43428 100644 --- a/source/items/ItemSugarcane.h +++ b/source/items/ItemSugarcane.h @@ -1,8 +1,8 @@ #pragma once
-#include "Item.h"
-#include "../cWorld.h"
+#include "ItemHandler.h"
+#include "../World.h"
diff --git a/source/items/ItemSword.h b/source/items/ItemSword.h index cbe172c8f..eb4aa0ef9 100644 --- a/source/items/ItemSword.h +++ b/source/items/ItemSword.h @@ -1,7 +1,9 @@ +
#pragma once
-#include "Item.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+
+#include "ItemHandler.h"
+#include "../World.h"
+#include "../Player.h"
class cItemSwordHandler : public cItemHandler
{
diff --git a/source/items/ItemWood.h b/source/items/ItemWood.h index 7e874efc2..d6f66d1c5 100644 --- a/source/items/ItemWood.h +++ b/source/items/ItemWood.h @@ -1,7 +1,7 @@ #pragma once
-#include "Item.h"
+#include "ItemHandler.h"
diff --git a/source/main.cpp b/source/main.cpp index 0fdaf2d50..5e67531ab 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cRoot.h" +#include "Root.h" #include <exception> //std::exception #include <csignal> //std::signal diff --git a/source/squirrelbindings/cSquirrelBaseClass.h b/source/squirrelbindings/SquirrelBaseClass.h index 279c47027..ef03c1a55 100644 --- a/source/squirrelbindings/cSquirrelBaseClass.h +++ b/source/squirrelbindings/SquirrelBaseClass.h @@ -1,9 +1,9 @@ #pragma once
#include "SquirrelBindings.h"
-#include "../cPlugin_Squirrel.h"
-#include "../cPluginManager.h"
-#include "../cRoot.h"
-#include "../cSquirrelCommandBinder.h"
+#include "../Plugin_Squirrel.h"
+#include "../PluginManager.h"
+#include "../Root.h"
+#include "../SquirrelCommandBinder.h"
//The baseclass for squirrel plugins
class cSquirrelBaseClass
diff --git a/source/squirrelbindings/SquirrelBindings.cpp b/source/squirrelbindings/SquirrelBindings.cpp index 206d8bbcd..5c6b585f4 100644 --- a/source/squirrelbindings/SquirrelBindings.cpp +++ b/source/squirrelbindings/SquirrelBindings.cpp @@ -2,10 +2,10 @@ #include "SquirrelBindings.h"
#include "SquirrelFunctions.h"
-#include "cSquirrelBaseClass.h"
+#include "SquirrelBaseClass.h"
#include "SquirrelArray.h"
-#include "../cPlayer.h"
+#include "../Player.h"
using namespace Sqrat;
|