1
0

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,9 +1,9 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #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"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #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 //TODO Implement sized slimes

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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