From f1aaea5022a7b9a3aec79fb21e04bcdb499a253f Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 2 Feb 2012 12:43:30 +0000 Subject: Removed nonsense "virtual inline" declaration from functions git-svn-id: http://mc-server.googlecode.com/svn/trunk@223 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cFireSimulator.h | 12 ++++++------ source/cFluidSimulator.h | 4 ++-- source/cLavaSimulator.h | 2 +- source/cPawn.h | 26 +++++++++++++------------- source/cSandSimulator.h | 6 +++--- source/cSimulator.h | 4 ++-- source/cWaterSimulator.h | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/source/cFireSimulator.h b/source/cFireSimulator.h index b42131ff3..fba71fece 100644 --- a/source/cFireSimulator.h +++ b/source/cFireSimulator.h @@ -13,17 +13,17 @@ public: 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 inline bool IsForeverBurnable( char a_BlockID ); - virtual inline bool FiresForever( char a_BlockID ); + virtual bool IsBurnable( char a_BlockID ); + virtual bool IsForeverBurnable( char a_BlockID ); + virtual bool FiresForever( char a_BlockID ); 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 inline 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 BurnBlockAround(int a_X, int a_Y, int a_Z); + virtual bool BurnBlock(int a_X, int a_Y, int a_Z); std::vector *m_Blocks; std::vector *m_Buffer; diff --git a/source/cFluidSimulator.h b/source/cFluidSimulator.h index af05da2dd..d4379623d 100644 --- a/source/cFluidSimulator.h +++ b/source/cFluidSimulator.h @@ -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) Direction GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a_Over = true); - virtual inline bool IsAllowedBlock( char a_BlockID ) = 0; - virtual inline bool IsPassableForFluid( char a_BlockID ); + virtual bool IsAllowedBlock( char a_BlockID ) = 0; + virtual bool IsPassableForFluid( char a_BlockID ); bool CanWashAway( char a_BlockID ); protected: virtual void AddBlock( int a_X, int a_Y, int a_Z); diff --git a/source/cLavaSimulator.h b/source/cLavaSimulator.h index abcad6fc6..f0bfacb38 100644 --- a/source/cLavaSimulator.h +++ b/source/cLavaSimulator.h @@ -6,6 +6,6 @@ class cLavaSimulator : public cFluidSimulator public: cLavaSimulator( cWorld* a_World ); - virtual inline bool IsAllowedBlock( char a_BlockID ); + virtual bool IsAllowedBlock( char a_BlockID ); }; \ No newline at end of file diff --git a/source/cPawn.h b/source/cPawn.h index e075b422e..a5156cec3 100644 --- a/source/cPawn.h +++ b/source/cPawn.h @@ -28,26 +28,26 @@ public: enum MetaData {NORMAL, BURNING, CROUCHED, RIDING, SPRINTING, EATING, BLOCKING}; - virtual inline void SetMetaData(MetaData a_MetaData); - virtual inline MetaData GetMetaData() { return m_MetaData; } + virtual void SetMetaData(MetaData a_MetaData); + virtual MetaData GetMetaData() { return m_MetaData; } - virtual inline void InStateBurning(float a_Dt); + virtual void InStateBurning(float a_Dt); virtual void CheckMetaDataBurn(); - virtual inline void SetMaxHealth(short a_MaxHealth); - virtual inline short GetMaxHealth() { return m_MaxHealth; } + virtual void SetMaxHealth(short a_MaxHealth); + virtual short GetMaxHealth() { return m_MaxHealth; } - //virtual inline void SetMaxFood(short a_MaxFood); - virtual inline short GetMaxFood() { return m_MaxFoodLevel/6; } - virtual inline short GetFood() { return m_FoodLevel/6; } + //virtual void SetMaxFood(short a_MaxFood); + virtual short GetMaxFood() { return m_MaxFoodLevel/6; } + virtual short GetFood() { return m_FoodLevel/6; } - //virtual inline void SetMaxFoodSaturation(float a_MaxFoodSaturation); - virtual inline float GetMaxFoodSaturation() { return fmod(m_MaxFoodLevel, 6.f); } - virtual inline float GetFoodSaturation() { return fmod(m_FoodLevel, 6.f); } + //virtual void SetMaxFoodSaturation(float a_MaxFoodSaturation); + virtual float GetMaxFoodSaturation() { return fmod(m_MaxFoodLevel, 6.f); } + virtual float GetFoodSaturation() { return fmod(m_FoodLevel, 6.f); } - virtual inline void SetMaxFoodLevel(short a_MaxFoodLevel); - virtual inline short GetMaxFoodLevel() { return m_MaxFoodLevel; } + virtual void SetMaxFoodLevel(short a_MaxFoodLevel); + virtual short GetMaxFoodLevel() { return m_MaxFoodLevel; } protected: short m_Health; diff --git a/source/cSandSimulator.h b/source/cSandSimulator.h index 3a086e8cc..113a2492b 100644 --- a/source/cSandSimulator.h +++ b/source/cSandSimulator.h @@ -12,10 +12,10 @@ public: ~cSandSimulator(); 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 inline bool IsPassable( char a_BlockID ); + virtual bool IsAllowedBlock( char a_BlockID ); + virtual bool IsPassable( char a_BlockID ); protected: virtual void AddBlock(int a_X, int a_Y, int a_Z); diff --git a/source/cSimulator.h b/source/cSimulator.h index 2aaabe184..e045c18a8 100644 --- a/source/cSimulator.h +++ b/source/cSimulator.h @@ -9,9 +9,9 @@ public: ~cSimulator(); 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: virtual void AddBlock(int a_X, int a_Y, int a_Z) = 0; diff --git a/source/cWaterSimulator.h b/source/cWaterSimulator.h index 437f14387..f43a5eeef 100644 --- a/source/cWaterSimulator.h +++ b/source/cWaterSimulator.h @@ -7,6 +7,6 @@ class cWaterSimulator : public cFluidSimulator public: cWaterSimulator( cWorld* a_World ); - virtual inline bool IsAllowedBlock( char a_BlockID ); + virtual bool IsAllowedBlock( char a_BlockID ); }; \ No newline at end of file -- cgit v1.2.3