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

Removed nonsense "virtual inline" declaration from functions

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@223 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-02-02 12:43:30 +00:00
parent 865216b15a
commit f1aaea5022
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/cFireSimulator.h
View File

@ -13,17 +13,17 @@ public:
virtual void Simulate( float a_Dt ); virtual void Simulate( float a_Dt );
virtual inline bool IsAllowedBlock( char a_BlockID ); virtual bool IsAllowedBlock( char a_BlockID );
virtual inline bool IsBurnable( char a_BlockID ); virtual bool IsBurnable( char a_BlockID );
virtual inline bool IsForeverBurnable( char a_BlockID ); virtual bool IsForeverBurnable( char a_BlockID );
virtual inline bool FiresForever( char a_BlockID ); virtual bool FiresForever( char a_BlockID );
protected: protected:
virtual void AddBlock(int a_X, int a_Y, int a_Z); virtual void AddBlock(int a_X, int a_Y, int a_Z);
virtual void _AddBlock(int a_X, int a_Y, int a_Z); virtual void _AddBlock(int a_X, int a_Y, int a_Z);
virtual inline bool BurnBlockAround(int a_X, int a_Y, int a_Z); virtual bool BurnBlockAround(int a_X, int a_Y, int a_Z);
virtual inline bool BurnBlock(int a_X, int a_Y, int a_Z); virtual bool BurnBlock(int a_X, int a_Y, int a_Z);
std::vector <Vector3i *> *m_Blocks; std::vector <Vector3i *> *m_Blocks;
std::vector <Vector3i *> *m_Buffer; std::vector <Vector3i *> *m_Buffer;

4
source/cFluidSimulator.h
View File

@ -28,8 +28,8 @@ public:
//Gets the flowing direction. if a_Over is true also the block over the current block affects the direction (standard) //Gets the flowing direction. if a_Over is true also the block over the current block affects the direction (standard)
Direction GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a_Over = true); Direction GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a_Over = true);
virtual inline bool IsAllowedBlock( char a_BlockID ) = 0; virtual bool IsAllowedBlock( char a_BlockID ) = 0;
virtual inline bool IsPassableForFluid( char a_BlockID ); virtual bool IsPassableForFluid( char a_BlockID );
bool CanWashAway( char a_BlockID ); bool CanWashAway( char a_BlockID );
protected: protected:
virtual void AddBlock( int a_X, int a_Y, int a_Z); virtual void AddBlock( int a_X, int a_Y, int a_Z);

2
source/cLavaSimulator.h
View File

@ -6,6 +6,6 @@ class cLavaSimulator : public cFluidSimulator
public: public:
cLavaSimulator( cWorld* a_World ); cLavaSimulator( cWorld* a_World );
virtual inline bool IsAllowedBlock( char a_BlockID ); virtual bool IsAllowedBlock( char a_BlockID );
}; };

26
source/cPawn.h
View File

@ -28,26 +28,26 @@ public:
enum MetaData {NORMAL, BURNING, CROUCHED, RIDING, SPRINTING, EATING, BLOCKING}; enum MetaData {NORMAL, BURNING, CROUCHED, RIDING, SPRINTING, EATING, BLOCKING};
virtual inline void SetMetaData(MetaData a_MetaData); virtual void SetMetaData(MetaData a_MetaData);
virtual inline MetaData GetMetaData() { return m_MetaData; } virtual MetaData GetMetaData() { return m_MetaData; }
virtual inline void InStateBurning(float a_Dt); virtual void InStateBurning(float a_Dt);
virtual void CheckMetaDataBurn(); virtual void CheckMetaDataBurn();
virtual inline void SetMaxHealth(short a_MaxHealth); virtual void SetMaxHealth(short a_MaxHealth);
virtual inline short GetMaxHealth() { return m_MaxHealth; } virtual short GetMaxHealth() { return m_MaxHealth; }
//virtual inline void SetMaxFood(short a_MaxFood); //virtual void SetMaxFood(short a_MaxFood);
virtual inline short GetMaxFood() { return m_MaxFoodLevel/6; } virtual short GetMaxFood() { return m_MaxFoodLevel/6; }
virtual inline short GetFood() { return m_FoodLevel/6; } virtual short GetFood() { return m_FoodLevel/6; }
//virtual inline void SetMaxFoodSaturation(float a_MaxFoodSaturation); //virtual void SetMaxFoodSaturation(float a_MaxFoodSaturation);
virtual inline float GetMaxFoodSaturation() { return fmod(m_MaxFoodLevel, 6.f); } virtual float GetMaxFoodSaturation() { return fmod(m_MaxFoodLevel, 6.f); }
virtual inline float GetFoodSaturation() { return fmod(m_FoodLevel, 6.f); } virtual float GetFoodSaturation() { return fmod(m_FoodLevel, 6.f); }
virtual inline void SetMaxFoodLevel(short a_MaxFoodLevel); virtual void SetMaxFoodLevel(short a_MaxFoodLevel);
virtual inline short GetMaxFoodLevel() { return m_MaxFoodLevel; } virtual short GetMaxFoodLevel() { return m_MaxFoodLevel; }
protected: protected:
short m_Health; short m_Health;

6
source/cSandSimulator.h
View File

@ -12,10 +12,10 @@ public:
~cSandSimulator(); ~cSandSimulator();
virtual void Simulate( float a_Dt ); virtual void Simulate( float a_Dt );
virtual inline void WakeUp( int a_X, int a_Y, int a_Z ); virtual void WakeUp( int a_X, int a_Y, int a_Z );
virtual inline bool IsAllowedBlock( char a_BlockID ); virtual bool IsAllowedBlock( char a_BlockID );
virtual inline bool IsPassable( char a_BlockID ); virtual bool IsPassable( char a_BlockID );
protected: protected:
virtual void AddBlock(int a_X, int a_Y, int a_Z); virtual void AddBlock(int a_X, int a_Y, int a_Z);

4
source/cSimulator.h
View File

@ -9,9 +9,9 @@ public:
~cSimulator(); ~cSimulator();
virtual void Simulate( float a_Dt ) = 0; virtual void Simulate( float a_Dt ) = 0;
virtual inline void WakeUp( int a_X, int a_Y, int a_Z ); //Used often so inline saves some calls virtual void WakeUp( int a_X, int a_Y, int a_Z );
virtual inline bool IsAllowedBlock( char a_BlockID ) = 0; virtual bool IsAllowedBlock( char a_BlockID ) = 0;
protected: protected:
virtual void AddBlock(int a_X, int a_Y, int a_Z) = 0; virtual void AddBlock(int a_X, int a_Y, int a_Z) = 0;

2
source/cWaterSimulator.h
View File

@ -7,6 +7,6 @@ class cWaterSimulator : public cFluidSimulator
public: public:
cWaterSimulator( cWorld* a_World ); cWaterSimulator( cWorld* a_World );
virtual inline bool IsAllowedBlock( char a_BlockID ); virtual bool IsAllowedBlock( char a_BlockID );
}; };