From 0fc68c5e1e73185428b5d650616040cf73f706a4 Mon Sep 17 00:00:00 2001 From: freghar Date: Fri, 3 Apr 2009 16:43:24 +0200 Subject: [PATCH 1/2] [7609] Trailing whitespace cleaning Here we are again! "git diff --check" !! Signed-off-by: freghar --- sql/mangos.sql | 4 ++-- sql/updates/7292_01_mangos_points_of_interest.sql | 2 +- sql/updates/7292_02_mangos_locales_points_of_interest.sql | 2 +- src/game/AchievementMgr.cpp | 6 +++--- src/game/Level3.cpp | 2 +- src/game/Map.h | 2 +- src/game/SpellAuras.cpp | 6 +++--- src/game/SpellEffects.cpp | 2 +- src/game/Unit.cpp | 2 +- src/mangosd/mangosd.conf.dist.in | 2 +- src/shared/revision_nr.h | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sql/mangos.sql b/sql/mangos.sql index 564a6a0d4..ad5cc0dc5 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -2134,7 +2134,7 @@ UNLOCK TABLES; -- Table structure for table `locales_points_of_interest` -- -DROP TABLE IF EXISTS `locales_points_of_interest`; +DROP TABLE IF EXISTS `locales_points_of_interest`; CREATE TABLE `locales_points_of_interest` ( `entry` mediumint(8) unsigned NOT NULL default '0', `icon_name_loc1` text, @@ -12771,7 +12771,7 @@ UNLOCK TABLES; -- Table structure for table `points_of_interest` -- -DROP TABLE IF EXISTS `points_of_interest`; +DROP TABLE IF EXISTS `points_of_interest`; CREATE TABLE `points_of_interest` ( `entry` mediumint(8) unsigned NOT NULL default '0', `x` float NOT NULL default '0', diff --git a/sql/updates/7292_01_mangos_points_of_interest.sql b/sql/updates/7292_01_mangos_points_of_interest.sql index 800a31e70..2980fb3c4 100644 --- a/sql/updates/7292_01_mangos_points_of_interest.sql +++ b/sql/updates/7292_01_mangos_points_of_interest.sql @@ -1,6 +1,6 @@ ALTER TABLE db_version CHANGE COLUMN required_7290_01_mangos_command required_7292_01_mangos_points_of_interest bit; -DROP TABLE IF EXISTS `points_of_interest`; +DROP TABLE IF EXISTS `points_of_interest`; CREATE TABLE `points_of_interest` ( `entry` mediumint(8) unsigned NOT NULL default '0', `x` float NOT NULL default '0', diff --git a/sql/updates/7292_02_mangos_locales_points_of_interest.sql b/sql/updates/7292_02_mangos_locales_points_of_interest.sql index ec763a3fc..84a74a835 100644 --- a/sql/updates/7292_02_mangos_locales_points_of_interest.sql +++ b/sql/updates/7292_02_mangos_locales_points_of_interest.sql @@ -1,6 +1,6 @@ ALTER TABLE db_version CHANGE COLUMN required_7292_01_mangos_points_of_interest required_7292_02_mangos_locales_points_of_interest bit; -DROP TABLE IF EXISTS `locales_points_of_interest`; +DROP TABLE IF EXISTS `locales_points_of_interest`; CREATE TABLE `locales_points_of_interest` ( `entry` mediumint(8) unsigned NOT NULL default '0', `icon_name_loc1` text, diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 1191fdb36..3ba6f27bb 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -1185,17 +1185,17 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, { case PROGRESS_SET: newValue = changeValue; - break; + break; case PROGRESS_ACCUMULATE: { // avoid overflow uint32 max_value = std::numeric_limits::max(); newValue = max_value - progress->counter > changeValue ? progress->counter + changeValue : max_value; - break; + break; } case PROGRESS_HIGHEST: newValue = progress->counter < changeValue ? changeValue : progress->counter; - break; + break; } // not update (not mark as changed) if counter will have same value diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 575762c86..af451ebc0 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -1768,7 +1768,7 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) // search highest talent rank uint32 spellid = 0; - + for(int rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank]!=0) diff --git a/src/game/Map.h b/src/game/Map.h index 9252f9928..5388d3963 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -178,7 +178,7 @@ class GridMap bool loadLiquidData(FILE *in, uint32 offset, uint32 size); // Get height functions and pointers - typedef float (GridMap::*pGetHeightPtr) (float x, float y) const; + typedef float (GridMap::*pGetHeightPtr) (float x, float y) const; pGetHeightPtr m_gridGetHeight; float getHeightFromFloat(float x, float y) const; float getHeightFromUint16(float x, float y) const; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index debda4800..ea3e83715 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -230,7 +230,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &Aura::HandleNoImmediateEffect, //178 SPELL_AURA_MOD_DEBUFF_RESISTANCE implemented in Unit::MagicSpellHitResult &Aura::HandleNoImmediateEffect, //179 SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE implemented in Unit::SpellCriticalBonus &Aura::HandleNoImmediateEffect, //180 SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS implemented in Unit::SpellDamageBonus - &Aura::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS + &Aura::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS &Aura::HandleAuraModResistenceOfStatPercent, //182 SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT &Aura::HandleNULL, //183 SPELL_AURA_MOD_CRITICAL_THREAT only used in 28746 &Aura::HandleNoImmediateEffect, //184 SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst @@ -4223,7 +4223,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real) if (apply) { if(loading) - return; + return; Unit *caster = GetCaster(); if (!caster) @@ -6160,7 +6160,7 @@ void Aura::PeriodicTick() } // Anger Management - // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3 + // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3 // so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec if(pt == POWER_RAGE) m_target->ModifyPower(pt, m_modifier.m_amount*3/5); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 474f9e887..4969f4d91 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2397,7 +2397,7 @@ void Spell::EffectPowerBurn(uint32 i) { uint32 maxdamage = m_caster->GetMaxPower(powertype) * damage * 2 / 100; damage = unitTarget->GetMaxPower(powertype) * damage / 100; - if(damage > maxdamage) damage = maxdamage; + if(damage > maxdamage) damage = maxdamage; } int32 curPower = int32(unitTarget->GetPower(powertype)); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index ee93fa4e2..e3c46f3d5 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10653,7 +10653,7 @@ Player* Unit::GetSpellModOwner() void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg) { if(msg == SPELL_CAST_OK) - return; + return; Unit *owner = GetCharmerOrOwner(); if(!owner || owner->GetTypeId() != TYPEID_PLAYER) diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index 0534b3391..4b579656c 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -25,7 +25,7 @@ ConfVersion=2008080101 # WorldDatabaseInfo # CharacterDatabaseInfo # Database connection settings for the world server. -# Default: +# Default: # ---MYSQL--- # hostname;port;username;password;database # .;somenumber;username;password;database - use named pipes at Windows diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cdfa2499e..2b70281bf 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7608" + #define REVISION_NR "7609" #endif // __REVISION_NR_H__ From 031e83baa3e3cf8158a99a7b177bd95482bc2a45 Mon Sep 17 00:00:00 2001 From: tomrus88 Date: Sun, 22 Mar 2009 10:12:11 +0300 Subject: [PATCH 2/2] Removed some outdated comments --- src/game/Chat.cpp | 2 +- src/game/Unit.cpp | 25 ++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 4fd0277f8..ae31edde8 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -205,7 +205,7 @@ ChatCommand * ChatHandler::getCommandTable() { "listbinds", SEC_ADMINISTRATOR, false, &ChatHandler::HandleInstanceListBindsCommand, "", NULL }, { "unbind", SEC_ADMINISTRATOR, false, &ChatHandler::HandleInstanceUnbindCommand, "", NULL }, { "stats", SEC_ADMINISTRATOR, true, &ChatHandler::HandleInstanceStatsCommand, "", NULL }, - { "savedata", SEC_ADMINISTRATOR, false, &ChatHandler::HandleInstanceSaveDataCommand, "", NULL }, + { "savedata", SEC_ADMINISTRATOR, false, &ChatHandler::HandleInstanceSaveDataCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e3c46f3d5..517c5c994 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -260,38 +260,32 @@ void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint8 ty WorldPacket data( SMSG_MONSTER_MOVE, (41 + GetPackGUID().size()) ); data.append(GetPackGUID()); - // Point A, starting location data << GetPositionX() << GetPositionY() << GetPositionZ(); - // unknown field - unrelated to orientation - // seems to increment about 1000 for every 1.7 seconds - // for now, we'll just use mstime - data << getMSTime(); + data << uint32(getMSTime()); data << uint8(type); // unknown switch(type) { case 0: // normal packet break; - case 1: // stop packet + case 1: // stop packet (raw pos?) SendMessageToSet( &data, true ); return; - case 2: // not used currently + case 2: // facing spot, not used currently data << float(0); data << float(0); data << float(0); break; case 3: // not used currently - data << uint64(0); // probably target guid + data << uint64(0); // probably target guid (facing target?) break; case 4: // not used currently - data << float(0); // probably orientation + data << float(0); // facing angle break; } - //Movement Flags (0x0 = walk, 0x100 = run, 0x200 = fly/swim) data << uint32(MovementFlags); - - data << Time; // Time in between points + data << uint32(Time); // Time in between points data << uint32(1); // 1 single waypoint data << NewPosX << NewPosY << NewPosZ; // the single waypoint Point B @@ -312,19 +306,12 @@ void Unit::SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end, uin data << GetPositionX(); data << GetPositionY(); data << GetPositionZ(); - - // unknown field - unrelated to orientation - // seems to increment about 1000 for every 1.7 seconds - // for now, we'll just use mstime data << getMSTime(); - data << uint8( 0 ); data << uint32( MovementFlags ); data << uint32( traveltime ); data << uint32( pathSize ); data.append( (char*)path.GetNodes(start), pathSize * 4 * 3 ); - - //WPAssert( data.size() == 37 + pathnodes.Size( ) * 4 * 3 ); SendMessageToSet(&data, true); }