Skip to content

Commit

Permalink
Fixed the remaining derps
Browse files Browse the repository at this point in the history
  • Loading branch information
@bearbin
bearbin committed Nov 27, 2013
1 parent 3b790bb commit d925cf4
Show file tree
Hide file tree
Showing 26 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/BlockEntities/ChestEntity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "../Item.h"
#include "../Entities/Player.h"
#include "../UI/Window.h"
#include "lib/jsoncpp/include/json/json.h"
#include "jsoncpp/include/json/json.h"



Expand Down
2 changes: 1 addition & 1 deletion src/BlockEntities/FurnaceEntity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "../Entities/Player.h"
#include "../Root.h"
#include "../Chunk.h"
#include "lib/jsoncpp/include/json/json.h"
#include "jsoncpp/include/json/json.h"



Expand Down
2 changes: 1 addition & 1 deletion src/BlockEntities/JukeboxEntity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "JukeboxEntity.h"
#include "../World.h"
#include "lib/jsoncpp/include/json/json.h"
#include "jsoncpp/include/json/json.h"



Expand Down
2 changes: 1 addition & 1 deletion src/BlockEntities/NoteEntity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "NoteEntity.h"
#include "../World.h"
#include "lib/jsoncpp/include/json/json.h"
#include "jsoncpp/include/json/json.h"



Expand Down
2 changes: 1 addition & 1 deletion src/BlockEntities/SignEntity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Implements the cSignEntity class representing a single sign in the world

#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "lib/jsoncpp/include/json/json.h"
#include "jsoncpp/include/json/json.h"
#include "SignEntity.h"
#include "../Entities/Player.h"

Expand Down
4 changes: 2 additions & 2 deletions src/ChunkMap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <cstdlib> // abs
#endif

#include "lib/zlib/zlib.h"
#include "lib/jsoncpp/include/json/json.h"
#include "zlib/zlib.h"
#include "jsoncpp/include/json/json.h"



Expand Down
2 changes: 1 addition & 1 deletion src/Generating/BioGen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "Globals.h"
#include "BioGen.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "../LinearUpscale.h"


Expand Down
2 changes: 1 addition & 1 deletion src/Generating/ChunkGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "ChunkGenerator.h"
#include "../World.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "../Root.h"
#include "../PluginManager.h"
#include "ChunkDesc.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Generating/CompoGen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "../BlockID.h"
#include "../Item.h"
#include "../LinearUpscale.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"



Expand Down
2 changes: 1 addition & 1 deletion src/Generating/ComposableGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "ComposableGenerator.h"
#include "../World.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "../Root.h"

// Individual composed algorithms:
Expand Down
2 changes: 1 addition & 1 deletion src/Generating/DistortedHeightmap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "DistortedHeightmap.h"
#include "../OSSupport/File.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "../LinearUpscale.h"


Expand Down
2 changes: 1 addition & 1 deletion src/Generating/EndGen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "Globals.h"
#include "EndGen.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "../LinearUpscale.h"


Expand Down
2 changes: 1 addition & 1 deletion src/Generating/HeiGen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "Globals.h"
#include "HeiGen.h"
#include "../LinearUpscale.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"



Expand Down
2 changes: 1 addition & 1 deletion src/Generating/Noise3DGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "Globals.h"
#include "Noise3DGenerator.h"
#include "../OSSupport/File.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "../LinearInterpolation.h"
#include "../LinearUpscale.h"

Expand Down
2 changes: 1 addition & 1 deletion src/OSSupport/GZipFile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#pragma once

#include "lib/zlib/zlib.h"
#include "zlib/zlib.h"



Expand Down
2 changes: 1 addition & 1 deletion src/PluginLua.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

extern "C"
{
#include"lib/lua/src/lualib.h"
#include "lua/src/lualib.h"
}

#include "tolua++.h"
Expand Down
2 changes: 1 addition & 1 deletion src/PluginManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "Server.h"
#include "CommandOutput.h"

#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "tolua++.h"
#include "Entities/Player.h"

Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/ChunkDataSerializer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "Globals.h"
#include "ChunkDataSerializer.h"
#include "lib/zlib/zlib.h"
#include "zlib/zlib.h"



Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/Protocol132.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "Globals.h"
#include "ChunkDataSerializer.h"
#include "lib/cryptopp/randpool.h"
#include "cryptopp/randpool.h"
#include "Protocol132.h"
#include "../Root.h"
#include "../Server.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/Protocol14x.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Implements the 1.4.x protocol classes representing these protocols:
#include "../Root.h"
#include "../Server.h"
#include "../ClientHandle.h"
#include "lib/cryptopp/randpool.h"
#include "cryptopp/randpool.h"
#include "../Item.h"
#include "ChunkDataSerializer.h"
#include "../Entities/Player.h"
Expand Down
4 changes: 2 additions & 2 deletions src/Protocol/Protocol17x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Declares the 1.7.x protocol classes:

#include "Protocol.h"
#include "../ByteBuffer.h"
#include "lib/cryptopp/modes.h"
#include "lib/cryptopp/aes.h"
#include "cryptopp/modes.h"
#include "cryptopp/aes.h"



Expand Down
4 changes: 2 additions & 2 deletions src/Server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@

#include "MersenneTwister.h"

#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"
#include "Vector3f.h"

#include <fstream>
#include <sstream>
#include <iostream>

extern "C" {
#include "lib/zlib/zlib.h"
#include "zlib/zlib.h"
}


Expand Down
2 changes: 1 addition & 1 deletion src/Simulator/Simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#pragma once

#include "../Vector3i.h"
#include "lib/inifile/iniFile.h"
#include "inifile/iniFile.h"



Expand Down
2 changes: 1 addition & 1 deletion src/WorldStorage/WSSAnvil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "WSSAnvil.h"
#include "NBTChunkSerializer.h"
#include "../World.h"
#include "lib/zlib/zlib.h"
#include "zlib/zlib.h"
#include "../BlockID.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DispenserEntity.h"
Expand Down
4 changes: 2 additions & 2 deletions src/WorldStorage/WSSCompact.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "Globals.h"
#include "WSSCompact.h"
#include "../World.h"
#include "lib/zlib/zlib.h"
#include "lib/jsoncpp/include/json/json.h"
#include "zlib/zlib.h"
#include "jsoncpp/include/json/json.h"
#include "../StringCompression.h"
#include "../BlockEntities/ChestEntity.h"
#include "../BlockEntities/DispenserEntity.h"
Expand Down
2 changes: 1 addition & 1 deletion src/WorldStorage/WorldStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "../ChunkDef.h"
#include "../OSSupport/IsThread.h"
#include "lib/jsoncpp/include/json/json.h"
#include "jsoncpp/include/json/json.h"



Expand Down

0 comments on commit d925cf4

Please sign in to comment.