diff options
| author | Spp <none@none> | 2010-04-07 18:09:10 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-04-07 18:09:10 +0200 |
| commit | b27ce42704c33e292bda390265bb8fd01a433505 (patch) | |
| tree | 29b2df222a2c1be3325e3d6fab75206100b578fd /src/scripts/world | |
| parent | f490ad5ac259712e323f0a52e608ff1383b2fc41 (diff) | |
Code Style: Remove trailing spaces
--HG--
branch : trunk
Diffstat (limited to 'src/scripts/world')
| -rw-r--r-- | src/scripts/world/areatrigger_scripts.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/world/go_scripts.cpp | 10 | ||||
| -rw-r--r-- | src/scripts/world/item_scripts.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/world/npc_innkeeper.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/scripts/world/areatrigger_scripts.cpp b/src/scripts/world/areatrigger_scripts.cpp index bda3620ce57..96bdbbeb315 100644 --- a/src/scripts/world/areatrigger_scripts.cpp +++ b/src/scripts/world/areatrigger_scripts.cpp @@ -138,7 +138,7 @@ bool AreaTrigger_at_ravenholdt(Player* pPlayer, const AreaTriggerEntry* pAt) enum eWarsongFarms { QUEST_THE_WARSONG_FARMS = 11686, - + NPC_CREDIT_SLAUGHTERHOUSE = 25672, NPC_CREDIT_GRAINERY = 25669, NPC_CREDIT_TORP_FARM = 25671, diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp index 22dd21a1075..25e794ec5ee 100644 --- a/src/scripts/world/go_scripts.cpp +++ b/src/scripts/world/go_scripts.cpp @@ -715,8 +715,8 @@ bool GOHello_go_soulwell(Player *pPlayer, GameObject* pGO) if (!pPlayer->IsInSameRaidWith(static_cast<Player *>(caster))) return true; - // Repeating this at every use is ugly and inefficient. But as long as we don't have proper - // GO scripting with at least On Create and On Update events, the other options are no less + // Repeating this at every use is ugly and inefficient. But as long as we don't have proper + // GO scripting with at least On Create and On Update events, the other options are no less // ugly and hacky. uint32 newSpell = 0; if (pGO->GetEntry() == 193169) // Soulwell for rank 2 @@ -855,8 +855,8 @@ bool GOHello_go_amberpine_outhouse(Player *pPlayer, GameObject *pGO) } else pPlayer->SEND_GOSSIP_MENU(GOSSIP_OUTHOUSE_INUSE, pGO->GetGUID()); - return true; -} + return true; +} bool GOSelect_go_amberpine_outhouse(Player *pPlayer, GameObject *pGO, uint32 uiSender, uint32 uiAction) { @@ -1044,7 +1044,7 @@ void AddSC_go_scripts() newscript->Name = "go_dragonflayer_cage"; newscript->pGOHello = &GOHello_go_dragonflayer_cage; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "go_amberpine_outhouse"; newscript->pGOHello = &GOHello_go_amberpine_outhouse; diff --git a/src/scripts/world/item_scripts.cpp b/src/scripts/world/item_scripts.cpp index 6787e8df303..fe5c304dc75 100644 --- a/src/scripts/world/item_scripts.cpp +++ b/src/scripts/world/item_scripts.cpp @@ -352,7 +352,7 @@ bool ItemUse_item_dehta_trap_smasher(Player* pPlayer, Item* pItem, const SpellCa { Creature* pMammoth; GameObject* pTrap; - + if (pPlayer->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) == QUEST_STATUS_INCOMPLETE && (pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF,5.0f)) && ((pTrap = pPlayer->FindNearestGameObject(GO_MAMMOTH_TRAP_1,5.0f)) || diff --git a/src/scripts/world/npc_innkeeper.cpp b/src/scripts/world/npc_innkeeper.cpp index 04cd92722d6..b53ba6f92ff 100644 --- a/src/scripts/world/npc_innkeeper.cpp +++ b/src/scripts/world/npc_innkeeper.cpp @@ -37,7 +37,7 @@ EndScriptData */ #define LOCALE_INNKEEPER_0 "Make this inn my home." #define LOCALE_INNKEEPER_3 "Ich möchte dieses Gasthaus zu meinem Heimatort machen." - + bool GossipHello_npc_innkeeper(Player *pPlayer, Creature *pCreature) { if (IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) @@ -80,7 +80,7 @@ bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 uiS if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) { pPlayer->CastSpell(pPlayer, SPELL_TRICK_OR_TREATED, true); - + if (urand(0, 1)) pPlayer->CastSpell(pPlayer, SPELL_TREAT, true); else |
