diff options
author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-01-16 12:23:17 +0100 |
---|---|---|
committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-01-16 12:23:17 +0100 |
commit | deed0d07815b5f0f9b8d5005cb9015ef372af59b (patch) | |
tree | 8c82176f9080f49a11c6e1b3b35ad30ff3cadcd9 /src | |
parent | 542a89b15067ecf6ca2370e6dc22a0ce6c6f0ff0 (diff) |
Core/General: Fix some comment style. //* to // *. Fixes certain code display errors on nano. Thanks to Aokromes for pointing out.
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/AI/EventAI/CreatureEventAI.cpp | 4 | ||||
-rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.h | 16 | ||||
-rwxr-xr-x | src/server/game/Chat/Commands/Level3.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 6 | ||||
-rwxr-xr-x | src/server/game/Guilds/Guild.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Maps/Map.cpp | 4 | ||||
-rwxr-xr-x | src/server/game/Maps/Map.h | 4 | ||||
-rwxr-xr-x | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 4 | ||||
-rwxr-xr-x | src/server/game/Spells/Spell.h | 8 | ||||
-rwxr-xr-x | src/server/game/Texts/CreatureTextMgr.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/Examples/example_creature.cpp | 16 | ||||
-rw-r--r-- | src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 10 |
12 files changed, 40 insertions, 40 deletions
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index fefd89a16a5..ba7ed560589 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -1231,8 +1231,8 @@ void CreatureEventAI::DoFindFriendlyMissingBuff(std::list<Creature*>& _list, flo cell.Visit(p, grid_creature_searcher, *me->GetMap()); } -//********************************* -//*** Functions used globally *** +// ********************************* +// *** Functions used globally *** void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 36f31c52e8e..f94a41dfb10 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -45,9 +45,9 @@ struct ScriptedAI : public CreatureAI explicit ScriptedAI(Creature* pCreature); virtual ~ScriptedAI() {} - //************* + // ************* //CreatureAI Functions - //************* + // ************* void AttackStartNoMove(Unit *pTarget); @@ -81,9 +81,9 @@ struct ScriptedAI : public CreatureAI // Called when AI is temporarily replaced or put back when possess is applied or removed void OnPossess(bool /*apply*/) {} - //************* + // ************* // Variables - //************* + // ************* //Pointer to creature we are manipulating Creature* me; @@ -91,9 +91,9 @@ struct ScriptedAI : public CreatureAI //For fleeing bool IsFleeing; - //************* + // ************* //Pure virtual functions - //************* + // ************* //Called at creature reset either by death or evade void Reset() {} @@ -101,9 +101,9 @@ struct ScriptedAI : public CreatureAI //Called at creature aggro either by MoveInLOS or Attack Start void EnterCombat(Unit* /*who*/) {} - //************* + // ************* //AI Helper Functions - //************* + // ************* //Start movement toward victim void DoStartMovement(Unit* pVictim, float fDistance = 0, float fAngle = 0); diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 4043aa9e966..a10f8090927 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -2374,7 +2374,7 @@ bool ChatHandler::HandleChangeWeather(const char *args) return false; } - //*Change the weather of a cell + // *Change the weather of a cell char* px = strtok((char*)args, " "); char* py = strtok(NULL, " "); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 404b3d91b8c..d8dfecdb70c 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22492,9 +22492,9 @@ bool ItemPosCount::isContainedIn(ItemPosCountVec const& vec) const return false; } -//*********************************** -//-------------TRINITY--------------- -//*********************************** +// *********************************** +// -------------TRINITY--------------- +// *********************************** void Player::StopCastingBindSight() { diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 3f0dedda06e..a18c67384fe 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2542,7 +2542,7 @@ void Guild::_MoveItems(MoveItemData* pSrc, MoveItemData* pDest, uint32 splitedAm player->GetName(), player->GetGUIDLow(), pItemSrc->GetEntry(), tabId, slotId, destTabId, destSlotId, pItemSrc->GetEntry()); //return; // Commented out for now, uncomment when it's verified that this causes a crash!! } - //*/ + // */ // 3. Check destination rights if (!pDest->HasStoreRights(pSrc)) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index b754c87ccb1..cf26daed48a 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1020,9 +1020,9 @@ void Map::UnloadAll() } } -//***************************** +// ***************************** // Grid function -//***************************** +// ***************************** GridMap::GridMap() { m_flags = 0; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 8da8a184aef..c98bdce473b 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -60,9 +60,9 @@ struct ScriptAction ScriptInfo const* script; // pointer to static script data }; -//****************************************** +// ****************************************** // Map file format defines -//****************************************** +// ****************************************** #define MAP_MAGIC 'SPAM' #define MAP_VERSION_MAGIC '1.1v' #define MAP_AREA_MAGIC 'AERA' diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 5352c8b701f..125203dfdeb 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1142,9 +1142,9 @@ void AuraEffect::UpdatePeriodic(Unit * caster) } else { - //********************************************** + // ********************************************** // This feature uses only in arenas - //********************************************** + // ********************************************** // Here need increase mana regen per tick (6 second rule) // on 0 tick - 0 (handled in 2 second) // on 1 tick - 166% (handled in 4 second) diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 1d775c9c825..0d7f163c0ea 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -606,17 +606,17 @@ class Spell int32 m_damage; // Damge in effects count here int32 m_healing; // Healing in effects count here - //****************************************** + // ****************************************** // Spell trigger system - //****************************************** + // ****************************************** uint32 m_procAttacker; // Attacker trigger flags uint32 m_procVictim; // Victim trigger flags uint32 m_procEx; void prepareDataForTriggerSystem(AuraEffect const * triggeredByAura); - //***************************************** + // ***************************************** // Spell target subsystem - //***************************************** + // ***************************************** // Targets store structures and data struct TargetInfo { diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 3f8edaab09a..29a58d79165 100755 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -306,8 +306,8 @@ void CreatureTextMgr::BuildMonsterChat(WorldPacket *data, WorldObject* source, C { sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent WHISPER msg to Non-Player target. Ignoring.",source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); return; - //*data << (uint32)1; // target name length - //*data << (uint8)0; // target name + // *data << (uint32)1; // target name length + // *data << (uint8)0; // target name } *data << (uint32)(strlen(text)+1); *data << text; diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 7556d639770..7cc62b1d49d 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -88,11 +88,11 @@ class example_creature : public CreatureScript struct example_creatureAI : public ScriptedAI { - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** //This is the constructor, called only once when the Creature is first created example_creatureAI(Creature *c) : ScriptedAI(c) {} - //*** CUSTOM VARIABLES **** + // *** CUSTOM VARIABLES **** //These variables are for use only by this individual script. //Nothing else will ever call them but us. @@ -105,7 +105,7 @@ class example_creature : public CreatureScript uint32 m_uiPhase; // The current battle phase we are in uint32 m_uiPhaseTimer; // Timer until phase transition - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** //This is called after spawn and whenever the core decides we need to evade void Reset() { @@ -119,7 +119,7 @@ class example_creature : public CreatureScript me->RestoreFaction(); } - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** // Enter Combat called once per combat void EnterCombat(Unit* pWho) { @@ -127,7 +127,7 @@ class example_creature : public CreatureScript DoScriptText(SAY_AGGRO, me, pWho); } - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** // Attack Start is called when victim change (including at start of combat) // By default, attack pWho and start movement toward the victim. //void AttackStart(Unit* pWho) @@ -135,14 +135,14 @@ class example_creature : public CreatureScript // ScriptedAI::AttackStart(pWho); //} - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** // Called when going out of combat. Reset is called just after. void EnterEvadeMode() { DoScriptText(SAY_EVADE, me); } - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** //Our Receive emote function void ReceiveEmote(Player* /*pPlayer*/, uint32 uiTextEmote) { @@ -159,7 +159,7 @@ class example_creature : public CreatureScript } } - //*** HANDLED FUNCTION *** + // *** HANDLED FUNCTION *** //Update AI is called Every single map update (roughly once every 50ms if a player is within the grid) void UpdateAI(const uint32 uiDiff) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 08bfd7128f5..031c0faaf01 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -78,13 +78,13 @@ enum Creatures { MOB_CTHUN_PORTAL = 15896, - //***** Main Phase 1 ******** + // ***** Main Phase 1 ******** BOSS_EYE_OF_CTHUN = 15589, MOB_CLAW_TENTACLE = 15725, MOB_EYE_TENTACLE = 15726, MOB_SMALL_PORTAL = 15904, - //***** Main Phase 2 ******** + // ***** Main Phase 2 ******** MOB_BODY_OF_CTHUN = 15809, MOB_GIANT_CLAW_TENTACLE = 15728, MOB_GIANT_EYE_TENTACLE = 15334, @@ -94,7 +94,7 @@ enum Creatures enum Spells { - //***** Main Phase 1 ******** + // ***** Main Phase 1 ******** //Eye Spells SPELL_FREEZE_ANIM = 16245, SPELL_GREEN_BEAM = 26134, @@ -108,7 +108,7 @@ enum Spells SPELL_GROUND_RUPTURE = 26139, SPELL_HAMSTRING = 26141, - //***** Main Phase 2 ****** + // ***** Main Phase 2 ****** //Body spells //#define SPELL_CARAPACE_CTHUN 26156 //Was removed from client dbcs SPELL_TRANSFORM = 26232, @@ -142,7 +142,7 @@ enum Yells //Text emote EMOTE_WEAKENED = -1531011, - //****** Out of Combat ****** + // ****** Out of Combat ****** // Random Wispers - No txt only sound // The random sound is chosen by the client. RANDOM_SOUND_WHISPER = 8663, |