Skip to content

Commit 0e4e766

Browse files
heyitsbenchheyitsbench
committed
Cleanup/refactor.
Discovered that apparently the message send usage crashes if the invoker is console. Yay.
1 parent f805d72 commit 0e4e766

File tree

2 files changed

+47
-90
lines changed

2 files changed

+47
-90
lines changed

‎src/ptr_template.cpp

+29-90
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
#include "ptr_template_loader.h"
2-
#include "Chat.h"
3-
#include "Config.h"
4-
#include "Player.h"
5-
#include "ReputationMgr.h"
6-
#include "ScriptMgr.h"
7-
#include "TaskScheduler.h"
8-
9-
#define module_string "ptr-template"
102

113
using namespace Acore::ChatCommands;
124

13-
TaskScheduler scheduler;
14-
155
class createPTR : public WorldScript {
166

177
public:
@@ -50,10 +40,9 @@ class createTemplate : public PlayerScript {
5040
LOG_DEBUG("module", "Applying template {} for character {}.", index, player->GetGUID().ToString());
5141

5242
uint8 itemRoutine = METHOD_BOOST;
43+
5344
if (sConfigMgr->GetOption<bool>("DeleteItems", true))
54-
{
5545
itemRoutine = METHOD_DELETE;
56-
}
5746

5847
scheduler.Schedule(Milliseconds(delayMultiplier * APPLY_DELAY), [player, index, itemRoutine](TaskContext context)
5948
{
@@ -348,9 +337,7 @@ class createTemplate : public PlayerScript {
348337
QueryResult containerInfo = CharacterDatabase.Query("SELECT slot FROM character_inventory WHERE (bag = 0 AND guid = {})", (player->GetGUID().GetCounter()));
349338

350339
if (!containerInfo) // Apparently this can happen sometimes.
351-
{
352340
continue;
353-
}
354341

355342
Field* bagFields = bagInfo->Fetch();
356343
Field* containerFields = containerInfo->Fetch();
@@ -365,72 +352,63 @@ class createTemplate : public PlayerScript {
365352
continue;
366353
}
367354
if ((slotEntry < INVENTORY_SLOT_BAG_END || slotEntry >= PLAYER_SLOT_END) && bagEntry == CONTAINER_BACKPACK) // If item is either an equipped armorpiece, weapon, or container.
368-
{
369355
continue;
370-
}
356+
371357
ItemPosCountVec dest;
372358
if (bagEntry > CONTAINER_BACKPACK && bagEntry < CONTAINER_END) // If bag is an equipped container.
373359
{ // TODO: Make this whole section better.
374360
do // Also TODO: Add support for adding to bank bag contents. Damn paladins.
375361
{
376362
if (!containerFields) // Apparently this can happen sometimes.
377-
{
378363
continue;
379-
}
364+
380365
uint8 slotDBInfo = containerFields[0].Get<uint8>();
366+
381367
if (bagEntry != (slotDBInfo - 18)) // Check if equipped bag matches specified bag for module.
382-
{
383368
continue;
384-
}
369+
385370
if (slotDBInfo < INVENTORY_SLOT_BAG_START || slotDBInfo >= INVENTORY_SLOT_ITEM_START)
386-
{
387371
continue; // Ignore any non-container slots (i.e. backpack gear, equipped gear)
388-
}
372+
389373
uint8 validCheck = player->CanStoreNewItem(slotDBInfo, slotEntry, dest, itemEntry, quantityEntry);
390374
if (validCheck == EQUIP_ERR_OK)
391375
{
392376
player->StoreNewItem(dest, itemEntry, true);
393377
Item* item = player->GetUseableItemByPos(slotDBInfo, slotEntry);
394378
player->SendNewItem(item, 1, false, true); // Broadcast item detail packet.
395379
if (item && item->GetEntry() != itemEntry)
396-
{
397380
continue;
398-
}
381+
399382
TemplateHelperItemEnchants(bagInfo, player, item, 4);
400383
}
401384
} while (containerInfo->NextRow());
402385
}
403386
else if (bagEntry == CONTAINER_BACKPACK)
404387
{
405388
if (!containerFields) // Apparently this can happen sometimes.
406-
{
407389
continue;
408-
}
390+
409391
if (slotEntry < INVENTORY_SLOT_BAG_END || slotEntry >= PLAYER_SLOT_END)
410-
{
411392
continue; // Ignore any equipped items or invalid slot items.
412-
}
393+
413394
uint8 validCheck = player->CanStoreNewItem(INVENTORY_SLOT_BAG_0, slotEntry, dest, itemEntry, quantityEntry);
414395
if (validCheck == EQUIP_ERR_OK)
415396
{
416397
player->StoreNewItem(dest, itemEntry, true);
417398
Item* item = player->GetUseableItemByPos(INVENTORY_SLOT_BAG_0, slotEntry); // TODO: Make this better and cooler.
418399
player->SendNewItem(item, 1, false, true); // Broadcast item detail packet.
419400
if (item && item->GetEntry() != itemEntry)
420-
{
421401
continue;
422-
}
402+
423403
TemplateHelperItemEnchants(bagInfo, player, item, 4);
424404
}
425405
}
426406
else
427407
{
428408
uint8 validCheck = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemEntry, quantityEntry);
429409
if (validCheck == EQUIP_ERR_OK)
430-
{
431410
player->StoreNewItem(dest, itemEntry, true); // Add to next available slot in backpack/equipped bags.
432411
// TODO: Create the item and make it usable for item enchant helper. Also packet broadcast.
433-
}
434412
else if (validCheck == EQUIP_ERR_INVENTORY_FULL) // No available slots, post office's problem.
435413
{
436414
Item* itemBuffer = Item::CreateItem(itemEntry, quantityEntry, player, false);
@@ -463,9 +441,7 @@ class createTemplate : public PlayerScript {
463441
static void AddTemplateDeathKnight(Player* player) // Pretty much all of this is copied from acidmanifesto's lovely work on the skip-dk-starting-area module.
464442
{
465443
if (!(player->getClass() == CLASS_DEATH_KNIGHT))
466-
{
467444
return;
468-
}
469445

470446
int STARTER_QUESTS[33] = { 12593, 12619, 12842, 12848, 12636, 12641, 12657, 12678, 12679, 12680, 12687, 12698, 12701, 12706, 12716, 12719, 12720, 12722, 12724, 12725, 12727, 12733, -1, 12751, 12754, 12755, 12756, 12757, 12779, 12801, 13165, 13166 };
471447
// Blizz just dumped all of the special surprise quests on every DK template. Don't know yet if I want to do the same.
@@ -562,9 +538,8 @@ class createTemplate : public PlayerScript {
562538
static void AddTemplateHotbar(Player* player, uint32 index)
563539
{
564540
for (uint8 j = ACTION_BUTTON_BEGIN; j <= MAX_ACTION_BUTTONS; j++)
565-
{
566541
player->removeActionButton(j);
567-
}
542+
568543
// 0 1 2
569544
QueryResult barInfo = WorldDatabase.Query("SELECT Button, Action, Type FROM mod_ptrtemplate_action WHERE (ID = {} AND RaceMask & {} AND ClassMask & {})", index, player->getRaceMask(), player->getClassMask());
570545
if (barInfo)
@@ -574,6 +549,7 @@ class createTemplate : public PlayerScript {
574549
uint8 buttonEntry = (*barInfo)[0].Get<uint8>();
575550
uint32 actionEntry = (*barInfo)[1].Get<uint32>();
576551
uint8 typeEntry = (*barInfo)[2].Get<uint8>();
552+
577553
if (player->addActionButton(buttonEntry, actionEntry, typeEntry))
578554
LOG_DEBUG("module", "Added hotbar spell {} on button {} with type {} for template character {}.", actionEntry, buttonEntry, typeEntry, player->GetGUID().ToString());
579555
else
@@ -651,9 +627,8 @@ class createTemplate : public PlayerScript {
651627
FactionEntry const* factionId = sFactionStore.LookupEntry(factionEntry);
652628

653629
if ((player->GetReputationMgr().GetReputation(factionEntry) >= standingEntry) && sConfigMgr->GetOption<bool>("MaintainImprovedValues", true))
654-
{
655630
continue;
656-
}
631+
657632
player->GetReputationMgr().SetOneFactionReputation(factionId, float(standingEntry), false); // This was ripped from the `.modify reputation` command from base AC.
658633
player->GetReputationMgr().SendState(player->GetReputationMgr().GetState(factionId));
659634
LOG_DEBUG("module", "Added standing {} for faction {} for template character {}.", standingEntry, factionEntry, player->GetGUID().ToString());
@@ -665,13 +640,10 @@ class createTemplate : public PlayerScript {
665640
{
666641
player->SetFullHealth();
667642
if (player->getPowerType() == POWER_MANA)
668-
{
669643
player->SetPower(POWER_MANA, player->GetMaxPower(POWER_MANA));
670-
}
671644
else if (player->getPowerType() == POWER_ENERGY)
672-
{
673645
player->SetPower(POWER_ENERGY, player->GetMaxPower(POWER_ENERGY));
674-
}
646+
675647
LOG_DEBUG("module", "Template character {} has been given full health/power.", player->GetGUID().ToString());
676648
}
677649

@@ -687,9 +659,8 @@ class createTemplate : public PlayerScript {
687659
uint16 maxEntry = (*skillInfo)[2].Get<uint16>();
688660

689661
if (((player->GetSkillValue(skillEntry) >= valueEntry) && (player->GetMaxSkillValue(skillEntry) >= maxEntry)) && sConfigMgr->GetOption<bool>("MaintainImprovedValues", true))
690-
{
691662
continue;
692-
}
663+
693664
player->SetSkill(skillEntry, 0, valueEntry, maxEntry); // Don't know what step overload is used for, being zeroed here.
694665
LOG_DEBUG("module", "Added skill {} to template character {} with curvalue {} and maxvalue {}.", skillEntry, player->GetGUID().ToString(), valueEntry, maxEntry);
695666
} while (skillInfo->NextRow());
@@ -707,15 +678,13 @@ class createTemplate : public PlayerScript {
707678
uint64 spellEntry = (*spellInfo)[0].Get<uint64>();
708679

709680
if (player->HasSpell(spellEntry))
710-
{
711681
continue;
712-
}
682+
713683
player->learnSpell(spellEntry);
714684
LOG_DEBUG("module", "Added spell {} to template character {}.", spellEntry, player->GetGUID().ToString());
715685
} while (spellInfo->NextRow());
716-
WorldPacket data(SMSG_TALENTS_INVOLUNTARILY_RESET, 1); // todo: put this in header and get it out of my gosh darn face
717-
data << uint8(0);
718-
player->SendMessageToSet(&data, true);
686+
687+
SendTalentReset(player);
719688
}
720689
}
721690

@@ -749,30 +718,25 @@ class createTemplate : public PlayerScript {
749718
uint32 itemEntry = (*gearInfo)[2].Get<uint32>();
750719

751720
if ((slotEntry >= INVENTORY_SLOT_BAG_END && slotEntry < BANK_SLOT_BAG_START) || (slotEntry >= BANK_SLOT_BAG_END && slotEntry < PLAYER_SLOT_END) || bagEntry != CONTAINER_BACKPACK) // If item is not either an equipped armorpiece, weapon, or container.
752-
{
753721
continue;
754-
}
722+
755723
if (slotEntry >= PLAYER_SLOT_END)
756-
{
757724
player->SetAmmo(itemEntry);
758-
}
759725
else
760-
player->EquipNewItem(slotEntry, itemEntry, true);
726+
player->EquipNewItem(slotEntry, itemEntry, true);
727+
761728
if (slotEntry >= BANK_SLOT_BAG_START && slotEntry < BANK_SLOT_BAG_END)
762729
{
763730
uint8 slotBuffer = slotEntry - (BANK_SLOT_BAG_START - 1);
764731

765732
if (player->GetBankBagSlotCount() < slotBuffer)
766-
{
767733
player->SetBankBagSlotCount(slotBuffer);
768-
}
769734
}
770735
Item* item = player->GetUseableItemByPos(INVENTORY_SLOT_BAG_0, slotEntry);
771736
player->SendNewItem(item, 1, false, true); // Broadcast item detail packet.
772737
if (item && item->GetEntry() != itemEntry)
773-
{
774738
continue;
775-
}
739+
776740
TemplateHelperItemEnchants(gearInfo, player, item, 3);
777741
} while (gearInfo->NextRow());
778742
}
@@ -791,9 +755,7 @@ class createTemplate : public PlayerScript {
791755
{
792756
Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, b);
793757
if (!item)
794-
{
795758
continue;
796-
}
797759

798760
player->MoveItemFromInventory(INVENTORY_SLOT_BAG_0, b, true);
799761
item->DeleteFromInventoryDB(trans);
@@ -805,9 +767,7 @@ class createTemplate : public PlayerScript {
805767
{
806768
Item* item = player->GetItemByPos(c, i);
807769
if (!item)
808-
{
809770
continue;
810-
}
811771

812772
player->MoveItemFromInventory(c, i, true);
813773
item->DeleteFromInventoryDB(trans);
@@ -840,15 +800,12 @@ class createTemplate : public PlayerScript {
840800
else
841801
{
842802
for (uint8 b = INVENTORY_SLOT_ITEM_START; b < INVENTORY_SLOT_ITEM_END; b++) // Iterate each backpack slot.
843-
{
844803
player->DestroyItem(INVENTORY_SLOT_BAG_0, b, true); // Kill.
845-
}
804+
846805
for (uint8 c = INVENTORY_SLOT_BAG_START; c < INVENTORY_SLOT_BAG_END; c++) // Iterate each equipped container.
847806
{
848807
for (uint8 i = INVENTORY_SLOT_START; i < MAX_BAG_SIZE; i++) // Iterate each possible container slot.
849-
{
850808
player->DestroyItem(c, i, true); // Kill.
851-
}
852809
}
853810
}
854811
}
@@ -863,9 +820,7 @@ class createTemplate : public PlayerScript {
863820
{
864821
Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, e);
865822
if (!item)
866-
{
867823
continue;
868-
}
869824

870825
player->MoveItemFromInventory(INVENTORY_SLOT_BAG_0, e, true);
871826
item->DeleteFromInventoryDB(trans);
@@ -897,9 +852,7 @@ class createTemplate : public PlayerScript {
897852
else
898853
{
899854
for (uint8 e = EQUIPMENT_SLOT_START; e < INVENTORY_SLOT_BAG_END; e++) // Iterate through equip slots.
900-
{
901855
player->DestroyItem(INVENTORY_SLOT_BAG_0, e, true); // Kill.
902-
}
903856
}
904857
}
905858
}
@@ -980,15 +933,12 @@ class announce : public PlayerScript {
980933
static createTemplate templatevar;
981934

982935
if (sConfigMgr->GetOption<bool>("AnnounceEnable", true))
983-
{
984936
ChatHandler(player->GetSession()).PSendModuleSysMessage(module_string, templatevar.ALERT_MODULE_PRESENCE);
985-
}
986937

987938
uint32 templateIndex = sConfigMgr->GetOption<uint32>("LoginTemplateIndex", 0);
988939
if (!templateIndex || !player->HasAtLoginFlag(AT_LOGIN_FIRST))
989-
{
990940
return;
991-
}
941+
992942
uint32 oldMSTime = getMSTime();
993943
player->GetCinematicMgr()->EndCinematic();
994944
templatevar.HandleApply(player, templateIndex, 5);
@@ -1066,9 +1016,8 @@ class ptr_template_commandscript : public CommandScript
10661016
{
10671017
uint8 enable = (*check)[0].Get<uint8>();
10681018
if (!player)
1069-
{
10701019
player = PlayerIdentifier::FromTargetOrSelf(handler);
1071-
}
1020+
10721021
Player* target = player->GetConnectedPlayer();
10731022

10741023
switch(templatevar.CheckTemplateQualifier(target, index, enable))
@@ -1131,32 +1080,24 @@ class ptr_template_commandscript : public CommandScript
11311080
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST_DETAIL, indexEntry, templateName, enableText);
11321081
}
11331082
else
1134-
{
11351083
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST_SIMPLE, indexEntry, templateName);
1136-
}
11371084
}
11381085
} while (index->NextRow());
11391086
}
11401087
else
1141-
{
11421088
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST_EMPTY);
1143-
}
1089+
11441090
return true;
11451091
}
11461092

11471093
private:
11481094
static std::string GetTemplateName(ChatHandler* handler, uint8 index)
11491095
{
1150-
LocaleConstant locale;
1096+
LocaleConstant locale = LOCALE_enUS;
11511097

1152-
if (handler->IsConsole())
1153-
{
1154-
locale = LOCALE_enUS;
1155-
}
1156-
else
1157-
{
1098+
if (!handler->IsConsole())
11581099
locale = handler->GetSession()->GetSessionDbLocaleIndex();
1159-
}
1100+
11601101
// 0
11611102
QueryResult defQuery = WorldDatabase.Query("SELECT Comment FROM mod_ptrtemplate_index WHERE ID = {}", index);
11621103

@@ -1170,9 +1111,7 @@ class ptr_template_commandscript : public CommandScript
11701111
std::string locName = (*locQuery)[locale - 1].Get<std::string>();
11711112

11721113
if (!locName.empty())
1173-
{
11741114
return locName;
1175-
}
11761115
}
11771116
}
11781117

‎src/ptr_template_loader.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#include "Chat.h"
2+
#include "Config.h"
3+
#include "Player.h"
4+
#include "ReputationMgr.h"
5+
#include "ScriptMgr.h"
6+
#include "TaskScheduler.h"
7+
8+
#define module_string "ptr-template"
9+
10+
TaskScheduler scheduler;
11+
12+
void SendTalentReset(Player* player)
13+
{
14+
WorldPacket data(SMSG_TALENTS_INVOLUNTARILY_RESET, 1);
15+
data << uint8(0);
16+
player->SendMessageToSet(&data, true);
17+
}
18+
119
void Add_ptr_template();
220
void AddSC_ptr_template_commandscript();
321

0 commit comments

Comments
 (0)