diff options
| -rw-r--r-- | src/Entities/Entity.cpp | 10 | ||||
| -rw-r--r-- | src/Entities/Entity.h | 2 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 43 | ||||
| -rw-r--r-- | src/Entities/Player.h | 9 | ||||
| -rw-r--r-- | src/Entities/ProjectileEntity.cpp | 4 | ||||
| -rw-r--r-- | src/Mobs/Monster.cpp | 14 | ||||
| -rw-r--r-- | src/Mobs/Monster.h | 2 | ||||
| -rw-r--r-- | src/Mobs/Wolf.cpp | 4 | ||||
| -rw-r--r-- | src/Mobs/Zombie.cpp | 9 | ||||
| -rw-r--r-- | src/Mobs/Zombie.h | 9 |
10 files changed, 57 insertions, 49 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 32ee7f2bd..37fdc38ee 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -33,23 +33,19 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_Attachee(NULL) , m_Referencers(new cReferenceManager(cReferenceManager::RFMNGR_REFERENCERS)) , m_References(new cReferenceManager(cReferenceManager::RFMNGR_REFERENCES)) - , m_HeadYaw( 0.0 ) - , m_Rot(0.0, 0.0, 0.0) - , m_Pos(a_X, a_Y, a_Z) - , m_Mass (0.001) //Default 1g , m_bDirtyHead(true) , m_bDirtyOrientation(true) , m_bDirtyPosition(true) , m_bDirtySpeed(true) , m_bOnGround( false ) , m_Gravity( -9.81f ) - , m_IsInitialized(false) , m_LastPosX( 0.0 ) , m_LastPosY( 0.0 ) , m_LastPosZ( 0.0 ) , m_TimeLastTeleportPacket(0) , m_TimeLastMoveReltPacket(0) , m_TimeLastSpeedPacket(0) + , m_IsInitialized(false) , m_EntityType(a_EntityType) , m_World(NULL) , m_TicksSinceLastBurnDamage(0) @@ -57,6 +53,10 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_TicksSinceLastFireDamage(0) , m_TicksSinceLastVoidDamage(0) , m_TicksLeftBurning(0) + , m_HeadYaw( 0.0 ) + , m_Rot(0.0, 0.0, 0.0) + , m_Pos(a_X, a_Y, a_Z) + , m_Mass (0.001) //Default 1g , m_WaterSpeed(0, 0, 0) , m_Width(a_Width) , m_Height(a_Height) diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 7107a4a13..9cb36eb14 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -387,7 +387,7 @@ protected: double m_LastPosX, m_LastPosY, m_LastPosZ; // This variables keep track of the last time a packet was sent - Int64 m_TimeLastTeleportPacket,m_TimeLastMoveReltPacket,m_TimeLastSpeedPacket; // In ticks + Int64 m_TimeLastTeleportPacket, m_TimeLastMoveReltPacket, m_TimeLastSpeedPacket; // In ticks bool m_IsInitialized; // Is set to true when it's initialized, until it's destroyed (Initialize() till Destroy() ) diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index ca0d625e2..8f30cd4cc 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -36,43 +36,44 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) : super(etPlayer, 0.6, 1.8) - , m_GameMode(eGameMode_NotSet) - , m_IP("") - , m_LastBlockActionTime( 0 ) - , m_LastBlockActionCnt( 0 ) , m_AirLevel( MAX_AIR_LEVEL ) - , m_AirTickTimer( DROWNING_TICKS ) - , m_bVisible( true ) - , m_LastGroundHeight( 0 ) - , m_bTouchGround( false ) - , m_Stance( 0.0 ) - , m_Inventory(*this) - , m_CurrentWindow(NULL) - , m_InventoryWindow(NULL) - , m_TimeLastPickupCheck( 0.f ) - , m_Color('-') - , m_ClientHandle( a_Client ) + , m_AirTickTimer(DROWNING_TICKS) + , m_bVisible(true) , m_FoodLevel(MAX_FOOD_LEVEL) , m_FoodSaturationLevel(5) , m_FoodTickTimer(0) , m_FoodExhaustionLevel(0) , m_FoodPoisonedTicksRemaining(0) + , m_LastJumpHeight(0) + , m_LastGroundHeight(0) + , m_bTouchGround(false) + , m_Stance(0.0) + , m_Inventory(*this) + , m_CurrentWindow(NULL) + , m_InventoryWindow(NULL) + , m_TimeLastPickupCheck(0.f) + , m_Color('-') + , m_LastBlockActionTime(0) + , m_LastBlockActionCnt(0) + , m_GameMode(eGameMode_NotSet) + , m_IP("") + , m_ClientHandle(a_Client) , m_NormalMaxSpeed(0.1) , m_SprintingMaxSpeed(0.13) , m_IsCrouched(false) , m_IsSprinting(false) + , m_IsFlying(false) , m_IsSwimming(false) , m_IsSubmerged(false) - , m_IsFlying(false) - , m_CanFly(false) , m_IsFishing(false) - , m_FloaterID(-1) + , m_CanFly(false) , m_EatingFinishTick(-1) - , m_IsChargingBow(false) - , m_BowCharge(0) - , m_CurrentXp(0) , m_LifetimeTotalXp(0) + , m_CurrentXp(0) , m_bDirtyExperience(false) + , m_IsChargingBow(false) + , m_BowCharge(0) + , m_FloaterID(-1) { LOGD("Created a player object for \"%s\" @ \"%s\" at %p, ID %d", a_PlayerName.c_str(), a_Client->GetIPString().c_str(), diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 74da857e8..c0ad9eeac 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -407,9 +407,6 @@ protected: float m_TimeLastPickupCheck; - void ResolvePermissions(); - - void ResolveGroups(); char m_Color; float m_LastBlockActionTime; @@ -417,6 +414,7 @@ protected: eGameMode m_GameMode; std::string m_IP; + /// The item being dragged by the cursor while in a UI window cItem m_DraggingItem; long long m_LastPlayerListTime; @@ -456,6 +454,11 @@ protected: int m_FloaterID; + + + void ResolvePermissions(void); + void ResolveGroups(void); + virtual void Destroyed(void); /// Filters out damage for creative mode diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 1d49c2445..e6355c788 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -396,9 +396,9 @@ cArrowEntity::cArrowEntity(cEntity * a_Creator, double a_X, double a_Y, double a m_DamageCoeff(2), m_IsCritical(false), m_Timer(0), + m_HitGroundTimer(0), m_bIsCollected(false), - m_HitBlockPos(Vector3i(0, 0, 0)), - m_HitGroundTimer(0) + m_HitBlockPos(Vector3i(0, 0, 0)) { SetSpeed(a_Speed); SetMass(0.1); diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 606e93408..e5d21b2f2 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -68,9 +68,12 @@ static const struct cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height) : super(etMonster, a_Width, a_Height) + , m_EMState(IDLE) + , m_EMPersonality(AGGRESSIVE) + , m_SightDistance(25) , m_Target(NULL) , m_AttackRate(3) - , idle_interval(0) + , m_IdleInterval(0) , m_bMovingToDestination(false) , m_DestinationTime( 0 ) , m_DestroyTimer( 0 ) @@ -78,10 +81,7 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString , m_MobType(a_MobType) , m_SoundHurt(a_SoundHurt) , m_SoundDeath(a_SoundDeath) - , m_EMState(IDLE) - , m_SightDistance(25) , m_SeePlayerInterval (0) - , m_EMPersonality(AGGRESSIVE) , m_AttackDamage(1.0f) , m_AttackRange(2.0f) , m_AttackInterval(0) @@ -435,13 +435,13 @@ void cMonster::EventLosePlayer(void) // What to do if in Idle State void cMonster::InStateIdle(float a_Dt) { - idle_interval += a_Dt; - if (idle_interval > 1) + m_IdleInterval += a_Dt; + if (m_IdleInterval > 1) { // at this interval the results are predictable int rem = m_World->GetTickRandomNumber(6) + 1; // LOGD("Moving: int: %3.3f rem: %i",idle_interval,rem); - idle_interval -= 1; // So nothing gets dropped when the server hangs for a few seconds + m_IdleInterval -= 1; // So nothing gets dropped when the server hangs for a few seconds Vector3f Dist; Dist.x = (float)(m_World->GetTickRandomNumber(10) - 5); Dist.z = (float)(m_World->GetTickRandomNumber(10) - 5); diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 29a705d11..dafb33574 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -161,7 +161,7 @@ protected: cEntity * m_Target; float m_AttackRate; - float idle_interval; + float m_IdleInterval; Vector3f m_Destination; bool m_bMovingToDestination; diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index c86250142..3d4e97c80 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -11,10 +11,10 @@ cWolf::cWolf(void) : super("Wolf", mtWolf, "mob.wolf.hurt", "mob.wolf.death", 0.6, 0.8), - m_IsAngry(false), - m_IsTame(false), m_IsSitting(false), + m_IsTame(false), m_IsBegging(false), + m_IsAngry(false), m_OwnerName(""), m_CollarColor(14) { diff --git a/src/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp index a485d2b55..29563a755 100644 --- a/src/Mobs/Zombie.cpp +++ b/src/Mobs/Zombie.cpp @@ -8,10 +8,11 @@ -cZombie::cZombie(bool IsVillagerZombie) : + +cZombie::cZombie(bool a_IsVillagerZombie) : super("Zombie", mtZombie, "mob.zombie.hurt", "mob.zombie.death", 0.6, 1.8), - m_bIsConverting(false), - m_bIsVillagerZombie(IsVillagerZombie) + m_IsConverting(false), + m_IsVillagerZombie(a_IsVillagerZombie) { SetBurnsInDaylight(true); } @@ -45,3 +46,5 @@ void cZombie::MoveToPosition(const Vector3f & a_Position) } + + diff --git a/src/Mobs/Zombie.h b/src/Mobs/Zombie.h index 7e14fe42f..1ba368f9c 100644 --- a/src/Mobs/Zombie.h +++ b/src/Mobs/Zombie.h @@ -12,19 +12,20 @@ class cZombie : typedef cAggressiveMonster super; public: - cZombie(bool IsVillagerZombie); + cZombie(bool a_IsVillagerZombie); CLASS_PROTODEF(cZombie); virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; virtual void MoveToPosition(const Vector3f & a_Position) override; - bool IsVillagerZombie(void) const {return m_bIsVillagerZombie; } - bool IsConverting(void) const {return m_bIsConverting; } + bool IsVillagerZombie(void) const {return m_IsVillagerZombie; } + bool IsConverting (void) const {return m_IsConverting; } private: - bool m_bIsVillagerZombie, m_bIsConverting; + bool m_IsVillagerZombie; + bool m_IsConverting; } ; |