flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Source files cleanup: Mobs-related files in a separate subfolder, renamed. 

git-svn-id: http://mc-server.googlecode.com/svn/trunk@883 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-09-23 20:53:08 +00:00
parent f59f5f5759
commit 16f44ab7de
47 changed files with 129 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
VC2008/MCServer.vcproj
View File

@ -768,163 +768,163 @@
Name="Mobs"
>
<File
RelativePath="..\source\cAggressiveMonster.cpp"
RelativePath="..\source\Mobs\AggressiveMonster.cpp"
>
</File>
<File
RelativePath="..\source\cAggressiveMonster.h"
RelativePath="..\source\Mobs\AggressiveMonster.h"
>
</File>
<File
RelativePath="..\source\cCavespider.cpp"
RelativePath="..\source\Mobs\Cavespider.cpp"
>
</File>
<File
RelativePath="..\source\cCavespider.h"
RelativePath="..\source\Mobs\Cavespider.h"
>
</File>
<File
RelativePath="..\source\cChicken.cpp"
RelativePath="..\source\Mobs\Chicken.cpp"
>
</File>
<File
RelativePath="..\source\cChicken.h"
RelativePath="..\source\Mobs\Chicken.h"
>
</File>
<File
RelativePath="..\source\cCow.cpp"
RelativePath="..\source\Mobs\Cow.cpp"
>
</File>
<File
RelativePath="..\source\cCow.h"
RelativePath="..\source\Mobs\Cow.h"
>
</File>
<File
RelativePath="..\source\cCreeper.cpp"
RelativePath="..\source\Mobs\Creeper.cpp"
>
</File>
<File
RelativePath="..\source\cCreeper.h"
RelativePath="..\source\Mobs\Creeper.h"
>
</File>
<File
RelativePath="..\source\cEnderman.cpp"
RelativePath="..\source\Mobs\Enderman.cpp"
>
</File>
<File
RelativePath="..\source\cEnderman.h"
RelativePath="..\source\Mobs\Enderman.h"
>
</File>
<File
RelativePath="..\source\cGhast.cpp"
RelativePath="..\source\Mobs\Ghast.cpp"
>
</File>
<File
RelativePath="..\source\cGhast.h"
RelativePath="..\source\Mobs\Ghast.h"
>
</File>
<File
RelativePath="..\source\cMonster.cpp"
RelativePath="..\source\Mobs\Monster.cpp"
>
</File>
<File
RelativePath="..\source\cMonster.h"
RelativePath="..\source\Mobs\Monster.h"
>
</File>
<File
RelativePath="..\source\cPassiveAggressiveMonster.cpp"
RelativePath="..\source\Mobs\PassiveAggressiveMonster.cpp"
>
</File>
<File
RelativePath="..\source\cPassiveAggressiveMonster.h"
RelativePath="..\source\Mobs\PassiveAggressiveMonster.h"
>
</File>
<File
RelativePath="..\source\cPassiveMonster.cpp"
RelativePath="..\source\Mobs\PassiveMonster.cpp"
>
</File>
<File
RelativePath="..\source\cPassiveMonster.h"
RelativePath="..\source\Mobs\PassiveMonster.h"
>
</File>
<File
RelativePath="..\source\cPig.cpp"
RelativePath="..\source\Mobs\Pig.cpp"
>
</File>
<File
RelativePath="..\source\cPig.h"
RelativePath="..\source\Mobs\Pig.h"
>
</File>
<File
RelativePath="..\source\cSheep.cpp"
RelativePath="..\source\Mobs\Sheep.cpp"
>
</File>
<File
RelativePath="..\source\cSheep.h"
RelativePath="..\source\Mobs\Sheep.h"
>
</File>
<File
RelativePath="..\source\cSilverfish.cpp"
RelativePath="..\source\Mobs\Silverfish.cpp"
>
</File>
<File
RelativePath="..\source\cSilverfish.h"
RelativePath="..\source\Mobs\Silverfish.h"
>
</File>
<File
RelativePath="..\source\cSkeleton.cpp"
RelativePath="..\source\Mobs\Skeleton.cpp"
>
</File>
<File
RelativePath="..\source\cSkeleton.h"
RelativePath="..\source\Mobs\Skeleton.h"
>
</File>
<File
RelativePath="..\source\cSlime.cpp"
RelativePath="..\source\Mobs\Slime.cpp"
>
</File>
<File
RelativePath="..\source\cSlime.h"
RelativePath="..\source\Mobs\Slime.h"
>
</File>
<File
RelativePath="..\source\cSpider.cpp"
RelativePath="..\source\Mobs\Spider.cpp"
>
</File>
<File
RelativePath="..\source\cSpider.h"
RelativePath="..\source\Mobs\Spider.h"
>
</File>
<File
RelativePath="..\source\cSquid.cpp"
RelativePath="..\source\Mobs\Squid.cpp"
>
</File>
<File
RelativePath="..\source\cSquid.h"
RelativePath="..\source\Mobs\Squid.h"
>
</File>
<File
RelativePath="..\source\cWolf.cpp"
RelativePath="..\source\Mobs\Wolf.cpp"
>
</File>
<File
RelativePath="..\source\cWolf.h"
RelativePath="..\source\Mobs\Wolf.h"
>
</File>
<File
RelativePath="..\source\cZombie.cpp"
RelativePath="..\source\Mobs\Zombie.cpp"
>
</File>
<File
RelativePath="..\source\cZombie.h"
RelativePath="..\source\Mobs\Zombie.h"
>
</File>
<File
RelativePath="..\source\cZombiepigman.cpp"
RelativePath="..\source\Mobs\Zombiepigman.cpp"
>
</File>
<File
RelativePath="..\source\cZombiepigman.h"
RelativePath="..\source\Mobs\Zombiepigman.h"
>
</File>
</Filter>

8
source/cAggressiveMonster.cpp → source/Mobs/AggressiveMonster.cpp
View File

@ -1,11 +1,11 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
#include "Vector3f.h"
#include "cPlayer.h"
#include "MersenneTwister.h"
#include "../Vector3f.h"
#include "../cPlayer.h"
#include "../MersenneTwister.h"
cAggressiveMonster::cAggressiveMonster()

2
source/cAggressiveMonster.h → source/Mobs/AggressiveMonster.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cMonster.h"
#include "Monster.h"
class cAggressiveMonster : public cMonster
{

2
source/cCavespider.cpp → source/Mobs/Cavespider.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cCavespider.h"
#include "Cavespider.h"

2
source/cCavespider.h → source/Mobs/Cavespider.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cCavespider : public cAggressiveMonster
{

2
source/cChicken.cpp → source/Mobs/Chicken.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cChicken.h"
#include "Chicken.h"

2
source/cChicken.h → source/Mobs/Chicken.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveMonster.h"
#include "PassiveMonster.h"
class cChicken : public cPassiveMonster
{

2
source/cCow.cpp → source/Mobs/Cow.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cCow.h"
#include "Cow.h"

2
source/cCow.h → source/Mobs/Cow.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveMonster.h"
#include "PassiveMonster.h"
class cCow : public cPassiveMonster
{

2
source/cCreeper.cpp → source/Mobs/Creeper.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cCreeper.h"
#include "Creeper.h"

2
source/cCreeper.h → source/Mobs/Creeper.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cCreeper : public cAggressiveMonster
{

2
source/cEnderman.cpp → source/Mobs/Enderman.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cEnderman.h"
#include "Enderman.h"

2
source/cEnderman.h → source/Mobs/Enderman.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveAggressiveMonster.h"
#include "PassiveAggressiveMonster.h"
class cEnderman : public cPassiveAggressiveMonster
{

2
source/cGhast.cpp → source/Mobs/Ghast.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cGhast.h"
#include "Ghast.h"

2
source/cGhast.h → source/Mobs/Ghast.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cGhast : public cAggressiveMonster
{

31
source/cMonster.cpp → source/Mobs/Monster.cpp
View File

@ -1,27 +1,28 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cMonster.h"
#include "cRoot.h"
#include "cServer.h"
#include "cClientHandle.h"
#include "cWorld.h"
#include "cPlayer.h"
#include "Defines.h"
#include "cMonsterConfig.h"
#include "MersenneTwister.h"
#include "Monster.h"
#include "../cRoot.h"
#include "../cServer.h"
#include "../cClientHandle.h"
#include "../cWorld.h"
#include "../cPlayer.h"
#include "../Defines.h"
#include "../cMonsterConfig.h"
#include "../MersenneTwister.h"
#include "Vector3f.h"
#include "Vector3i.h"
#include "Vector3d.h"
#include "../Vector3f.h"
#include "../Vector3i.h"
#include "../Vector3d.h"
#include "cTracer.h"
#include "../iniFile/iniFile.h"
#include "../cTracer.h"
#include "../../iniFile/iniFile.h"
/*
#ifndef _WIN32
#include <cstdlib> // rand
#include <unistd.h>
#endif
*/

11
source/cMonster.h → source/Mobs/Monster.h
View File

@ -1,12 +1,11 @@
#pragma once
#include "cPawn.h"
#include "Defines.h"
#include "cWorld.h"
#include "BlockID.h"
#include "cItem.h"
#include "BlockID.h"
#include "../cPawn.h"
#include "../Defines.h"
#include "../cWorld.h"
#include "../BlockID.h"
#include "../cItem.h"

4
source/cPassiveAggressiveMonster.cpp → source/Mobs/PassiveAggressiveMonster.cpp
View File

@ -1,9 +1,9 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cPassiveAggressiveMonster.h"
#include "PassiveAggressiveMonster.h"
#include "cPlayer.h"
#include "../cPlayer.h"

2
source/cPassiveAggressiveMonster.h → source/Mobs/PassiveAggressiveMonster.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cPassiveAggressiveMonster : public cAggressiveMonster
{

4
source/cPassiveMonster.cpp → source/Mobs/PassiveMonster.cpp
View File

@ -1,8 +1,8 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cPassiveMonster.h"
#include "MersenneTwister.h"
#include "PassiveMonster.h"
#include "../MersenneTwister.h"

2
source/cPassiveMonster.h → source/Mobs/PassiveMonster.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cMonster.h"
#include "Monster.h"
class cPassiveMonster : public cMonster
{

2
source/cPig.cpp → source/Mobs/Pig.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cPig.h"
#include "Pig.h"

2
source/cPig.h → source/Mobs/Pig.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveMonster.h"
#include "PassiveMonster.h"
class cPig : public cPassiveMonster
{

2
source/cSheep.cpp → source/Mobs/Sheep.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cSheep.h"
#include "Sheep.h"

2
source/cSheep.h → source/Mobs/Sheep.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveMonster.h"
#include "PassiveMonster.h"
class cSheep : public cPassiveMonster
{

2
source/cSilverfish.cpp → source/Mobs/Silverfish.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cSilverfish.h"
#include "Silverfish.h"

2
source/cSilverfish.h → source/Mobs/Silverfish.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cSilverfish : public cAggressiveMonster
{

2
source/cSkeleton.cpp → source/Mobs/Skeleton.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cSkeleton.h"
#include "Skeleton.h"

2
source/cSkeleton.h → source/Mobs/Skeleton.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cSkeleton : public cAggressiveMonster
{

2
source/cSlime.cpp → source/Mobs/Slime.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cSlime.h"
#include "Slime.h"
//TODO Implement sized slimes

2
source/cSlime.h → source/Mobs/Slime.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cSlime : public cAggressiveMonster
{

2
source/cSpider.cpp → source/Mobs/Spider.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cSpider.h"
#include "Spider.h"

2
source/cSpider.h → source/Mobs/Spider.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cSpider : public cAggressiveMonster
{

4
source/cSquid.cpp → source/Mobs/Squid.cpp
View File

@ -1,8 +1,8 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cSquid.h"
#include "Vector3d.h"
#include "Squid.h"
#include "../Vector3d.h"

2
source/cSquid.h → source/Mobs/Squid.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveMonster.h"
#include "PassiveMonster.h"
class cSquid : public cPassiveMonster
{

2
source/cWolf.cpp → source/Mobs/Wolf.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cWolf.h"
#include "Wolf.h"
cWolf::cWolf()
{

2
source/cWolf.h → source/Mobs/Wolf.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveAggressiveMonster.h"
#include "PassiveAggressiveMonster.h"
class cWolf : public cPassiveAggressiveMonster
{

2
source/cZombie.cpp → source/Mobs/Zombie.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cZombie.h"
#include "Zombie.h"

2
source/cZombie.h → source/Mobs/Zombie.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cAggressiveMonster.h"
#include "AggressiveMonster.h"
class cZombie : public cAggressiveMonster
{

2
source/cZombiepigman.cpp → source/Mobs/Zombiepigman.cpp
View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cZombiepigman.h"
#include "Zombiepigman.h"

2
source/cZombiepigman.h → source/Mobs/Zombiepigman.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "cPassiveAggressiveMonster.h"
#include "PassiveAggressiveMonster.h"
class cZombiepigman : public cPassiveAggressiveMonster
{

2
source/Protocol/Protocol125.cpp
View File

@ -16,7 +16,7 @@ Documentation:
#include "../cClientHandle.h"
#include "../ChunkDataSerializer.h"
#include "../cEntity.h"
#include "../cMonster.h"
#include "../Mobs/Monster.h"
#include "../cPickup.h"
#include "../cPlayer.h"
#include "../cChatColor.h"

2
source/Protocol/Protocol132.cpp
View File

@ -12,7 +12,7 @@
#include "../cItem.h"
#include "../ChunkDataSerializer.h"
#include "../cPlayer.h"
#include "../cMonster.h"
#include "../Mobs/Monster.h"
#include "../UI/Window.h"

2
source/cClientHandle.cpp
View File

@ -20,7 +20,7 @@
#include "cRedstone.h"
#include "cPiston.h"
#include "cBlockToPickup.h"
#include "cMonster.h"
#include "Mobs/Monster.h"
#include "cChatColor.h"
#include "cSocket.h"
#include "cTimer.h"

2
source/cMonsterConfig.cpp
View File

@ -2,7 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cMonsterConfig.h"
#include "cMonster.h"
#include "Mobs/Monster.h"
#include "../iniFile/iniFile.h"
//#include <cstdio>

2
source/cServer.cpp
View File

@ -6,7 +6,7 @@
#include "cServer.h"
#include "cClientHandle.h"
#include "cTimer.h"
#include "cMonster.h"
#include "Mobs/Monster.h"
#include "cSocket.h"
#include "cRoot.h"
#include "cWorld.h"

35
source/cWorld.cpp
View File

@ -20,22 +20,25 @@
#include "cFireSimulator.h"
#include "cSandSimulator.h"
#include "cRedstoneSimulator.h"
#include "cChicken.h"
#include "cSpider.h"
#include "cCow.h" //cow
#include "cSquid.h" //Squid
#include "cWolf.h" //wolf
#include "cSlime.h" //slime
#include "cSkeleton.h" //Skeleton
#include "cSilverfish.h" //Silverfish
#include "cPig.h" //pig
#include "cSheep.h" //sheep
#include "cZombie.h" //zombie
#include "cEnderman.h" //enderman
#include "cCreeper.h" //creeper
#include "cCavespider.h" //cavespider
#include "cGhast.h" //Ghast
#include "cZombiepigman.h" //Zombiepigman
// Mobs:
#include "Mobs/Chicken.h"
#include "Mobs/Spider.h"
#include "Mobs/Cow.h"
#include "Mobs/Squid.h"
#include "Mobs/Wolf.h"
#include "Mobs/Slime.h"
#include "Mobs/Skeleton.h"
#include "Mobs/Silverfish.h"
#include "Mobs/Pig.h"
#include "Mobs/Sheep.h"
#include "Mobs/Zombie.h"
#include "Mobs/Enderman.h"
#include "Mobs/Creeper.h"
#include "Mobs/Cavespider.h"
#include "Mobs/Ghast.h"
#include "Mobs/Zombiepigman.h"
#include "cMakeDir.h"
#include "MersenneTwister.h"
#include "cTracer.h"