Skip to content

Commit 2f8f52f

Browse files
VladimirMangosNoFantasy
VladimirMangos
authored and
NoFantasy
committed
[2094] Convert ~500 GetGUID() to GetObjectGuid() used in misc functions
Signed-off-by: NoFantasy <nofantasy@nf.no>
1 parent c4130c2 commit 2f8f52f

95 files changed

Lines changed: 671 additions & 671 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/sc_creature.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, flo
383383

384384
if (pUnit->GetTypeId() != TYPEID_PLAYER)
385385
{
386-
error_log("SD2: Creature " UI64FMTD " (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: " UI64FMTD ") to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
386+
error_log("SD2: %s tried to teleport non-player (%s) to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGuidStr().c_str(), pUnit->GetGuidStr().c_str(), fX, fY, fZ, fO);
387387
return;
388388
}
389389

‎scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ enum
524524
bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature)
525525
{
526526
if (pCreature->isQuestGiver())
527-
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
527+
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
528528

529529
if (pPlayer->GetQuestStatus(QUEST_WHAT_IS_GOING_ON) == QUEST_STATUS_INCOMPLETE)
530530
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
@@ -533,9 +533,9 @@ bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature)
533533
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
534534

535535
if (pPlayer->GetTeam() == HORDE)
536-
pPlayer->SEND_GOSSIP_MENU(2473, pCreature->GetGUID());
536+
pPlayer->SEND_GOSSIP_MENU(2473, pCreature->GetObjectGuid());
537537
else
538-
pPlayer->SEND_GOSSIP_MENU(2474, pCreature->GetGUID());
538+
pPlayer->SEND_GOSSIP_MENU(2474, pCreature->GetObjectGuid());
539539

540540
return true;
541541
}
@@ -546,36 +546,36 @@ bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, u
546546
{
547547
case GOSSIP_ACTION_INFO_DEF+1:
548548
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
549-
pPlayer->SEND_GOSSIP_MENU(2475, pCreature->GetGUID());
549+
pPlayer->SEND_GOSSIP_MENU(2475, pCreature->GetObjectGuid());
550550
break;
551551
case GOSSIP_ACTION_INFO_DEF+2:
552552
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
553-
pPlayer->SEND_GOSSIP_MENU(2476, pCreature->GetGUID());
553+
pPlayer->SEND_GOSSIP_MENU(2476, pCreature->GetObjectGuid());
554554
break;
555555

556556
case GOSSIP_ACTION_INFO_DEF+3:
557557
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
558-
pPlayer->SEND_GOSSIP_MENU(2477, pCreature->GetGUID());
558+
pPlayer->SEND_GOSSIP_MENU(2477, pCreature->GetObjectGuid());
559559
break;
560560
case GOSSIP_ACTION_INFO_DEF+4:
561561
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
562-
pPlayer->SEND_GOSSIP_MENU(2478, pCreature->GetGUID());
562+
pPlayer->SEND_GOSSIP_MENU(2478, pCreature->GetObjectGuid());
563563
break;
564564
case GOSSIP_ACTION_INFO_DEF+5:
565565
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
566-
pPlayer->SEND_GOSSIP_MENU(2479, pCreature->GetGUID());
566+
pPlayer->SEND_GOSSIP_MENU(2479, pCreature->GetObjectGuid());
567567
break;
568568
case GOSSIP_ACTION_INFO_DEF+6:
569569
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
570-
pPlayer->SEND_GOSSIP_MENU(2480, pCreature->GetGUID());
570+
pPlayer->SEND_GOSSIP_MENU(2480, pCreature->GetObjectGuid());
571571
break;
572572
case GOSSIP_ACTION_INFO_DEF+7:
573573
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
574-
pPlayer->SEND_GOSSIP_MENU(2481, pCreature->GetGUID());
574+
pPlayer->SEND_GOSSIP_MENU(2481, pCreature->GetObjectGuid());
575575
break;
576576
case GOSSIP_ACTION_INFO_DEF+8:
577577
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
578-
pPlayer->SEND_GOSSIP_MENU(2482, pCreature->GetGUID());
578+
pPlayer->SEND_GOSSIP_MENU(2482, pCreature->GetObjectGuid());
579579
break;
580580
case GOSSIP_ACTION_INFO_DEF+9:
581581
pPlayer->CLOSE_GOSSIP_MENU();
@@ -610,7 +610,7 @@ enum
610610
bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature)
611611
{
612612
if (pCreature->isQuestGiver())
613-
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
613+
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
614614

615615
if (pCreature->isVendor() && pPlayer->GetReputationRank(FACTION_THORIUM_BROTHERHOOD) >= REP_FRIENDLY)
616616
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
@@ -623,9 +623,9 @@ bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature)
623623
}
624624

625625
if (pPlayer->GetReputationRank(FACTION_THORIUM_BROTHERHOOD) < REP_FRIENDLY)
626-
pPlayer->SEND_GOSSIP_MENU(3673, pCreature->GetGUID());
626+
pPlayer->SEND_GOSSIP_MENU(3673, pCreature->GetObjectGuid());
627627
else
628-
pPlayer->SEND_GOSSIP_MENU(3677, pCreature->GetGUID());
628+
pPlayer->SEND_GOSSIP_MENU(3677, pCreature->GetObjectGuid());
629629

630630
return true;
631631
}
@@ -639,7 +639,7 @@ bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature
639639
}
640640

641641
if (uiAction == GOSSIP_ACTION_TRADE)
642-
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
642+
pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
643643

644644
return true;
645645
}

‎scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature)
5555
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
5656
}
5757
}
58-
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
58+
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
5959
return true;
6060
}
6161

@@ -65,15 +65,15 @@ bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 uiS
6565
{
6666
case GOSSIP_ACTION_INFO_DEF+1:
6767
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
68-
pPlayer->SEND_GOSSIP_MENU(2606, pCreature->GetGUID());
68+
pPlayer->SEND_GOSSIP_MENU(2606, pCreature->GetObjectGuid());
6969
break;
7070
case GOSSIP_ACTION_INFO_DEF+11:
7171
pPlayer->CLOSE_GOSSIP_MENU();
7272
pCreature->CastSpell(pPlayer, SPELL_LEARN_SMELT, false);
7373
break;
7474
case GOSSIP_ACTION_INFO_DEF+2:
7575
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
76-
pPlayer->SEND_GOSSIP_MENU(2604, pCreature->GetGUID());
76+
pPlayer->SEND_GOSSIP_MENU(2604, pCreature->GetObjectGuid());
7777
break;
7878
case GOSSIP_ACTION_INFO_DEF+22:
7979
pPlayer->CLOSE_GOSSIP_MENU();
@@ -286,7 +286,7 @@ bool GossipHello_boss_doomrel(Player* pPlayer, Creature* pCreature)
286286
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
287287
}
288288

289-
pPlayer->SEND_GOSSIP_MENU(2601, pCreature->GetGUID());
289+
pPlayer->SEND_GOSSIP_MENU(2601, pCreature->GetObjectGuid());
290290
return true;
291291
}
292292

‎scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct MANGOS_DLL_DECL boss_drakkisathAI : public ScriptedAI
7575
// Confliguration
7676
if (m_uiConfligurationTimer < uiDiff)
7777
{
78-
DoCastSpellIfCan(m_creature->getVictim(), SPELL_CONFLIGURATION, 0, m_creature->getVictim()->GetGUID());
78+
DoCastSpellIfCan(m_creature->getVictim(), SPELL_CONFLIGURATION, 0, m_creature->getVictim()->GetObjectGuid());
7979
m_uiConfligurationTimer = 18000;
8080
}
8181
else

‎scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@ bool GossipSelect_boss_vaelastrasz(Player* pPlayer, Creature* pCreature, uint32
267267
bool GossipHello_boss_vaelastrasz(Player* pPlayer, Creature* pCreature)
268268
{
269269
if (pCreature->isQuestGiver())
270-
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
270+
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
271271

272272
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
273-
pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID());
273+
pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetObjectGuid());
274274

275275
return true;
276276
}

‎scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ CreatureAI* GetAI_boss_victor_nefarius(Creature* pCreature)
270270
bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature* pCreature)
271271
{
272272
pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEFARIUS_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
273-
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_1, pCreature->GetGUID());
273+
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_1, pCreature->GetObjectGuid());
274274
return true;
275275
}
276276

@@ -280,11 +280,11 @@ bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uin
280280
{
281281
case GOSSIP_ACTION_INFO_DEF+1:
282282
pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEFARIUS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
283-
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_2, pCreature->GetGUID());
283+
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_2, pCreature->GetObjectGuid());
284284
break;
285285
case GOSSIP_ACTION_INFO_DEF+2:
286286
pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEFARIUS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
287-
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_3, pCreature->GetGUID());
287+
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_3, pCreature->GetObjectGuid());
288288
DoScriptText(SAY_GAMESBEGIN_1, pCreature);
289289
break;
290290
case GOSSIP_ACTION_INFO_DEF+3:

‎scripts/eastern_kingdoms/blasted_lands.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature* pCreature)
4343
if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1))
4444
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
4545

46-
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
46+
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
4747

4848
return true;
4949
}
@@ -74,7 +74,7 @@ bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32
7474
bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature)
7575
{
7676
if (pCreature->isQuestGiver())
77-
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
77+
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
7878

7979
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
8080
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Why are you here?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
@@ -85,7 +85,7 @@ bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature)
8585
if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE)
8686
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Why are you here?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
8787

88-
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
88+
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
8989

9090
return true;
9191
}
@@ -96,42 +96,42 @@ bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature,
9696
{
9797
case GOSSIP_ACTION_INFO_DEF+1:
9898
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
99-
pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetGUID());
99+
pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetObjectGuid());
100100
break;
101101
case GOSSIP_ACTION_INFO_DEF+11:
102-
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID());
102+
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetObjectGuid());
103103
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
104104
pPlayer->AreaExploredOrEventHappens(2784);
105105
if (pPlayer->GetTeam() == ALLIANCE)
106106
{
107107
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
108-
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID());
108+
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetObjectGuid());
109109
}
110110
break;
111111

112112
case GOSSIP_ACTION_INFO_DEF+2:
113113
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
114-
pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetGUID());
114+
pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetObjectGuid());
115115
break;
116116
case GOSSIP_ACTION_INFO_DEF+21:
117117
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
118-
pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetGUID());
118+
pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetObjectGuid());
119119
break;
120120
case GOSSIP_ACTION_INFO_DEF+22:
121121
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
122-
pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetGUID());
122+
pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetObjectGuid());
123123
break;
124124
case GOSSIP_ACTION_INFO_DEF+23:
125125
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
126-
pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetGUID());
126+
pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetObjectGuid());
127127
break;
128128
case GOSSIP_ACTION_INFO_DEF+24:
129129
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
130-
pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetGUID());
130+
pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetObjectGuid());
131131
break;
132132
case GOSSIP_ACTION_INFO_DEF+25:
133133
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
134-
pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetGUID());
134+
pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetObjectGuid());
135135
break;
136136
case GOSSIP_ACTION_INFO_DEF+26:
137137
pPlayer->CLOSE_GOSSIP_MENU();

‎scripts/eastern_kingdoms/burning_steppes.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ CreatureAI* GetAI_npc_ragged_john(Creature* pCreature)
7171
bool GossipHello_npc_ragged_john(Player* pPlayer, Creature* pCreature)
7272
{
7373
if (pCreature->isQuestGiver())
74-
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
74+
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
7575

7676
if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
7777
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Official buisness, John. I need some information about Marsha Windsor. Tell me about the last time you saw him.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
7878

79-
pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetGUID());
79+
pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetObjectGuid());
8080
return true;
8181
}
8282

@@ -86,47 +86,47 @@ bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 u
8686
{
8787
case GOSSIP_ACTION_INFO_DEF:
8888
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So what did you do?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
89-
pPlayer->SEND_GOSSIP_MENU(2714, pCreature->GetGUID());
89+
pPlayer->SEND_GOSSIP_MENU(2714, pCreature->GetObjectGuid());
9090
break;
9191
case GOSSIP_ACTION_INFO_DEF+1:
9292
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Start making sense, dwarf. I don't want to have anything to do with your cracker, your pappy, or any sort of 'discreditin'.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
93-
pPlayer->SEND_GOSSIP_MENU(2715, pCreature->GetGUID());
93+
pPlayer->SEND_GOSSIP_MENU(2715, pCreature->GetObjectGuid());
9494
break;
9595
case GOSSIP_ACTION_INFO_DEF+2:
9696
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ironfoe?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
97-
pPlayer->SEND_GOSSIP_MENU(2716, pCreature->GetGUID());
97+
pPlayer->SEND_GOSSIP_MENU(2716, pCreature->GetObjectGuid());
9898
break;
9999
case GOSSIP_ACTION_INFO_DEF+3:
100100
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Interesting... continue John.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
101-
pPlayer->SEND_GOSSIP_MENU(2717, pCreature->GetGUID());
101+
pPlayer->SEND_GOSSIP_MENU(2717, pCreature->GetObjectGuid());
102102
break;
103103
case GOSSIP_ACTION_INFO_DEF+4:
104104
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So that's how Windsor died...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
105-
pPlayer->SEND_GOSSIP_MENU(2718, pCreature->GetGUID());
105+
pPlayer->SEND_GOSSIP_MENU(2718, pCreature->GetObjectGuid());
106106
break;
107107
case GOSSIP_ACTION_INFO_DEF+5:
108108
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So how did he die?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
109-
pPlayer->SEND_GOSSIP_MENU(2719, pCreature->GetGUID());
109+
pPlayer->SEND_GOSSIP_MENU(2719, pCreature->GetObjectGuid());
110110
break;
111111
case GOSSIP_ACTION_INFO_DEF+6:
112112
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ok so where the hell is he? Wait a minute! Are you drunk?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
113-
pPlayer->SEND_GOSSIP_MENU(2720, pCreature->GetGUID());
113+
pPlayer->SEND_GOSSIP_MENU(2720, pCreature->GetObjectGuid());
114114
break;
115115
case GOSSIP_ACTION_INFO_DEF+7:
116116
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "WHY is he in Blackrock Depths?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
117-
pPlayer->SEND_GOSSIP_MENU(2721, pCreature->GetGUID());
117+
pPlayer->SEND_GOSSIP_MENU(2721, pCreature->GetObjectGuid());
118118
break;
119119
case GOSSIP_ACTION_INFO_DEF+8:
120120
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "300? So the Dark Irons killed him and dragged him into the Depths?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
121-
pPlayer->SEND_GOSSIP_MENU(2722, pCreature->GetGUID());
121+
pPlayer->SEND_GOSSIP_MENU(2722, pCreature->GetObjectGuid());
122122
break;
123123
case GOSSIP_ACTION_INFO_DEF+9:
124124
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ahh... Ironfoe", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
125-
pPlayer->SEND_GOSSIP_MENU(2723, pCreature->GetGUID());
125+
pPlayer->SEND_GOSSIP_MENU(2723, pCreature->GetObjectGuid());
126126
break;
127127
case GOSSIP_ACTION_INFO_DEF+10:
128128
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks, Ragged John. Your story was very uplifting and informative", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
129-
pPlayer->SEND_GOSSIP_MENU(2725, pCreature->GetGUID());
129+
pPlayer->SEND_GOSSIP_MENU(2725, pCreature->GetObjectGuid());
130130
break;
131131
case GOSSIP_ACTION_INFO_DEF+11:
132132
pPlayer->CLOSE_GOSSIP_MENU();

0 commit comments

Comments
 (0)