From 3e9ee0954bfaa74c6e4aa2a882e616e1f1b936dc Mon Sep 17 00:00:00 2001 From: Guillaume Dupuy Date: Thu, 20 Oct 2016 16:02:02 +0200 Subject: [PATCH] Fix coding guidelines + double initialized as 0.0 --- .../game_item_manager/game_item.cpp | 4 ++-- .../phrase_manager/combat_attacker.cpp | 2 +- .../phrase_manager/combat_attacker.h | 2 +- .../phrase_manager/combat_phrase.cpp | 8 ++++---- .../phrase_manager/magic_phrase.cpp | 4 ++-- .../phrase_manager/phrase_manager.cpp | 11 ++++++----- .../entities_game_service/phrase_manager/s_phrase.h | 2 +- .../phrase_manager/special_power_phrase.cpp | 2 +- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp index a8b60a174..11b612781 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp @@ -1085,7 +1085,7 @@ void CGameItem::resetEnchantment() _SapLoad = 0; _Enchantment.clear(); contReset( _Enchantment ); - _LatencyEndDate = 0.0f; + _LatencyEndDate = 0.0; if (getInventory() != NULL) getInventory()->onItemChanged(getInventorySlot(), INVENTORIES::TItemChangeFlags(INVENTORIES::itc_enchant)); @@ -1351,7 +1351,7 @@ void CGameItem::clear() _Destroyable = true; _Dropable = true; // _SlotImage = 0xFFFF; - _LatencyEndDate = 0.0f; + _LatencyEndDate = 0.0; // _Parent = NULL; _Inventory = NULL; _InventorySlot = INVENTORIES::INVALID_INVENTORY_SLOT; diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp index 6b0a88ff0..fa8bdb1ff 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp @@ -130,7 +130,7 @@ CCombatWeapon::CCombatWeapon(CGameItemPtr itemPtr) // weapon hit rate is in hit/10s and we use ticks/hits.... if (itemPtr->hitRate() != 0) { - LatencyInTicks = (10.0f / itemPtr->hitRate() ) / CTickEventHandler::getGameTimeStep(); + LatencyInTicks = (10.0 / itemPtr->hitRate() ) / CTickEventHandler::getGameTimeStep(); } Quality = (uint16)itemPtr->recommended(); diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h index fb992fd77..02f0f39f8 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h @@ -111,7 +111,7 @@ public: private: void init() { - LatencyInTicks = 0.0f; + LatencyInTicks = 0.0; Damage = 0; Quality = 0; DmgType = DMGTYPE::UNDEFINED; diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp index c25e31ea7..6dfd7a6b2 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp @@ -382,7 +382,7 @@ void CCombatPhrase::init() _CriticalHit = false; _ExecutionEndDate = 0; - _LatencyEndDate = 0.0f; + _LatencyEndDate = 0.0; _SabrinaCost = 0; _SabrinaRelativeCost = 1.0f; @@ -892,7 +892,7 @@ bool CCombatPhrase::evaluate() _NotEnoughStaminaMsg = false; _NotEnoughHpMsg = false; _DisengageOnEnd = false; - _LatencyEndDate = 0.0f; + _LatencyEndDate = 0.0; _ExecutionEndDate = 0; return true; @@ -1702,7 +1702,7 @@ bool CCombatPhrase::launch() { H_AUTO(CCombatPhrase_launch); - _LatencyEndDate = 0.0f; + _LatencyEndDate = 0.0; _ApplyDate = 0; if ( !_Attacker ) @@ -2183,7 +2183,7 @@ bool CCombatPhrase::launch() } else { - _LatencyEndDate = (double)time + latency; + _LatencyEndDate = (double)time + latency; } // compute the apply date if (_Targets[0].Target!=NULL && actingEntity->getEntityRowId() == _Targets[0].Target->getEntityRowId()) diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_phrase.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_phrase.cpp index 5cd4a5c82..8895f48b9 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_phrase.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_phrase.cpp @@ -1568,7 +1568,7 @@ bool CMagicPhrase::launch() if (_DivineInterventionOccured||_ShootAgainOccured?_BaseCastingTime:_CastingTime) _LatencyEndDate = (double)time + PostCastLatency + _PostCastTime; else - _LatencyEndDate = 0.0f + _PostCastTime; + _LatencyEndDate = 0.0 + _PostCastTime; // compute the apply date if ( !_Targets.empty() && _ActorRowId != _Targets[0].getId()) @@ -1898,7 +1898,7 @@ void CMagicPhrase::enchantPhrase(CCharacter * user,float successFactor) _Targets.resize(1); // user->setActionFlag( RYZOMACTIONFLAGS::Attacks, true ); - _LatencyEndDate = 0.0f;//time + _HitRateModifier + weapon.LatencyInTicks + ammo.SpeedInTicks ; + _LatencyEndDate = 0.0;//time + _HitRateModifier + weapon.LatencyInTicks + ammo.SpeedInTicks ; // _BeingProcessed = false; } // enchantPhrase // diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_manager.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_manager.cpp index c8d55ad72..cf6581464 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_manager.cpp @@ -459,11 +459,12 @@ void CPhraseManager::updatePhrases() CSPhrase::TPhraseState old_state; do { - old_state = phrase->state(); - updateEntityCurrentAction( (*it).first, entityPhrases); - phrase = entityPhrases.getCurrentAction(); - //Every time we get the next action, th phrase might be deleted (if the action is invalid or finished for non-cyclic actions like digging / crafting), always check ! - } while(phrase != NULL && old_state != phrase->state()); + old_state = phrase->state(); + updateEntityCurrentAction( (*it).first, entityPhrases); + phrase = entityPhrases.getCurrentAction(); + //Every time we get the next action, th phrase might be deleted (if the action is invalid or finished for non-cyclic actions like digging / crafting), always check ! + } + while(phrase != NULL && old_state != phrase->state()); // get next entity sentences ++it; diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h index e2164f34d..3edff92ad 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h @@ -56,7 +56,7 @@ public: _Idle = false; _ExecutionEndDate = 0; _ApplyDate = ~0; // ensure apply() never called before launch() - _LatencyEndDate = 0.0f; // by default, time between apply() and end() is immediate + _LatencyEndDate = 0.0; // by default, time between apply() and end() is immediate _PhraseBookIndex = 0; _NextCounter = 0; _IsStatic = false; diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_phrase.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_phrase.cpp index 4bf951737..7e24f427e 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_phrase.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_phrase.cpp @@ -758,7 +758,7 @@ bool CSpecialPowerPhrase::launch() //----------------------------------------------- void CSpecialPowerPhrase::apply() { - _LatencyEndDate = 0.0f; + _LatencyEndDate = 0.0; // TODO // apply effect