Skip to content

Commit 38ae4d1

Browse files
heyitsbenchheyitsbench
committed
Bit more refactor.
Probably a bad way to do this, but maybe not. The joys of learning.
1 parent 0e4e766 commit 38ae4d1

File tree

2 files changed

+86
-88
lines changed

2 files changed

+86
-88
lines changed

‎src/ptr_template.cpp

+23-88
Original file line numberDiff line numberDiff line change
@@ -242,72 +242,7 @@ class createTemplate : public PlayerScript {
242242
return CHECK_PASSED;
243243
}
244244
}
245-
246-
enum checkCodes
247-
{
248-
MISSING_TEMPLATE_INFO = 1,
249-
NOT_INITIAL_LEVEL = 2,
250-
TEMPLATE_DISABLED_GLOBAL = 3,
251-
INSUFFICIENT_SECURITY_LEVEL = 4,
252-
TEMPLATE_DISABLED_LOCAL = 5,
253-
CHECK_PASSED = 0
254-
};
255-
256-
enum templateStrings
257-
{
258-
FEEDBACK_TEMPLATE_ENABLE = 0,
259-
FEEDBACK_TEMPLATE_MISSING = 1,
260-
FEEDBACK_TEMPLATE_DISABLE = 2,
261-
ERROR_TEMPLATE_INFO = 3,
262-
ERROR_TEMPLATE_LEVEL = 4,
263-
ERROR_TEMPLATE_DIABLE_GLOBAL = 5,
264-
ERROR_TEMPLATE_SECURITY = 6,
265-
ERROR_TEMPLATE_DISABLE_LOCAL = 7,
266-
MESSAGE_TEMPLATE_LIST = 8,
267-
MESSAGE_TEMPLATE_LIST_DETAIL = 9,
268-
MESSAGE_TEMPLATE_LIST_SIMPLE = 10,
269-
MESSAGE_TEMPLATE_LIST_EMPTY = 11,
270-
DETAIL_ENABLE = 12,
271-
DETAIL_DISABLE = 13,
272-
ALERT_MODULE_PRESENCE = 14,
273-
MAIL_ERROR_EQUIP_BODY = 15,
274-
MAIL_BOOST_SUBJECT = 16,
275-
MAIL_BOOST_BODY = 17,
276-
MAIL_RESURRECTION_SUBJECT = 18,
277-
MAIL_RESURRECTION_BODY = 19
278-
};
279-
280-
enum templateMail
281-
{
282-
MAIL_BOOST = 403,
283-
MAIL_RESURRECTION = 344
284-
};
285-
286245
private:
287-
288-
enum TemplateEnums
289-
{
290-
APPLY_DELAY = 25,
291-
APPLY_RATE = 50,
292-
HORDE_SIMILAR = -1,
293-
ACTION_BUTTON_BEGIN = 0,
294-
CONTAINER_BACKPACK = 0,
295-
CONTAINER_END = 5,
296-
ITEM_GOLD = 8,
297-
INVENTORY_SLOT_START = 0,
298-
MAILED_ITEM_DELAY = 180
299-
};
300-
301-
enum itemCleanupCodes
302-
{
303-
METHOD_DELETE = 0,
304-
METHOD_BOOST = 1,
305-
METHOD_SCROLL = 2,
306-
SCOPE_EQUIPPED = 0,
307-
SCOPE_BAGS = 1,
308-
SCOPE_ALL = 2
309-
};
310-
311246
static void AddTemplateAchievements(Player* player, uint32 index)
312247
{ // 0
313248
QueryResult achievementInfo = WorldDatabase.Query("SELECT AchievementID FROM mod_ptrtemplate_achievements WHERE (ID = {} AND RaceMask & {} AND ClassMask & {})", index, player->getRaceMask(), player->getClassMask());
@@ -355,7 +290,7 @@ class createTemplate : public PlayerScript {
355290
continue;
356291

357292
ItemPosCountVec dest;
358-
if (bagEntry > CONTAINER_BACKPACK && bagEntry < CONTAINER_END) // If bag is an equipped container.
293+
if (bagEntry > CONTAINER_BACKPACK && bagEntry < CONTAINER_FINISH) // If bag is an equipped container.
359294
{ // TODO: Make this whole section better.
360295
do // Also TODO: Add support for adding to bank bag contents. Damn paladins.
361296
{
@@ -933,7 +868,7 @@ class announce : public PlayerScript {
933868
static createTemplate templatevar;
934869

935870
if (sConfigMgr->GetOption<bool>("AnnounceEnable", true))
936-
ChatHandler(player->GetSession()).PSendModuleSysMessage(module_string, templatevar.ALERT_MODULE_PRESENCE);
871+
ChatHandler(player->GetSession()).PSendModuleSysMessage(module_string, ALERT_MODULE_PRESENCE);
937872

938873
uint32 templateIndex = sConfigMgr->GetOption<uint32>("LoginTemplateIndex", 0);
939874
if (!templateIndex || !player->HasAtLoginFlag(AT_LOGIN_FIRST))
@@ -978,12 +913,12 @@ class ptr_template_commandscript : public CommandScript
978913

979914
std::string templateName = GetTemplateName(handler, index);
980915

981-
handler->PSendModuleSysMessage(module_string, createTemplate::FEEDBACK_TEMPLATE_ENABLE, index, templateName);
916+
handler->PSendModuleSysMessage(module_string, FEEDBACK_TEMPLATE_ENABLE, index, templateName);
982917
return true;
983918
}
984919
else
985920
{
986-
handler->PSendModuleSysMessage(module_string, createTemplate::FEEDBACK_TEMPLATE_MISSING);
921+
handler->PSendModuleSysMessage(module_string, FEEDBACK_TEMPLATE_MISSING);
987922
return false;
988923
}
989924
}
@@ -997,12 +932,12 @@ class ptr_template_commandscript : public CommandScript
997932

998933
std::string templateName = GetTemplateName(handler, index);
999934

1000-
handler->PSendModuleSysMessage(module_string, createTemplate::FEEDBACK_TEMPLATE_DISABLE, index, templateName);
935+
handler->PSendModuleSysMessage(module_string, FEEDBACK_TEMPLATE_DISABLE, index, templateName);
1001936
return true;
1002937
}
1003938
else
1004939
{
1005-
handler->PSendModuleSysMessage(module_string, createTemplate::FEEDBACK_TEMPLATE_MISSING);
940+
handler->PSendModuleSysMessage(module_string, FEEDBACK_TEMPLATE_MISSING);
1006941
return false;
1007942
}
1008943
}
@@ -1022,20 +957,20 @@ class ptr_template_commandscript : public CommandScript
1022957

1023958
switch(templatevar.CheckTemplateQualifier(target, index, enable))
1024959
{
1025-
case templatevar.MISSING_TEMPLATE_INFO:
1026-
handler->PSendModuleSysMessage(module_string, templatevar.ERROR_TEMPLATE_INFO);
960+
case MISSING_TEMPLATE_INFO:
961+
handler->PSendModuleSysMessage(module_string, ERROR_TEMPLATE_INFO);
1027962
return true;
1028-
case templatevar.NOT_INITIAL_LEVEL:
1029-
handler->PSendModuleSysMessage(module_string, templatevar.ERROR_TEMPLATE_LEVEL);
963+
case NOT_INITIAL_LEVEL:
964+
handler->PSendModuleSysMessage(module_string, ERROR_TEMPLATE_LEVEL);
1030965
return true;
1031-
case templatevar.TEMPLATE_DISABLED_GLOBAL:
1032-
handler->PSendModuleSysMessage(module_string, templatevar.ERROR_TEMPLATE_DIABLE_GLOBAL);
966+
case TEMPLATE_DISABLED_GLOBAL:
967+
handler->PSendModuleSysMessage(module_string, ERROR_TEMPLATE_DIABLE_GLOBAL);
1033968
return true;
1034-
case templatevar.INSUFFICIENT_SECURITY_LEVEL:
1035-
handler->PSendModuleSysMessage(module_string, templatevar.ERROR_TEMPLATE_SECURITY);
969+
case INSUFFICIENT_SECURITY_LEVEL:
970+
handler->PSendModuleSysMessage(module_string, ERROR_TEMPLATE_SECURITY);
1036971
return true;
1037-
case templatevar.TEMPLATE_DISABLED_LOCAL:
1038-
handler->PSendModuleSysMessage(module_string, templatevar.ERROR_TEMPLATE_DISABLE_LOCAL);
972+
case TEMPLATE_DISABLED_LOCAL:
973+
handler->PSendModuleSysMessage(module_string, ERROR_TEMPLATE_DISABLE_LOCAL);
1039974
return true;
1040975
default:
1041976
break;
@@ -1047,7 +982,7 @@ class ptr_template_commandscript : public CommandScript
1047982
}
1048983
else
1049984
{
1050-
handler->PSendModuleSysMessage(module_string, templatevar.FEEDBACK_TEMPLATE_MISSING);
985+
handler->PSendModuleSysMessage(module_string, FEEDBACK_TEMPLATE_MISSING);
1051986
return true;
1052987
}
1053988
}
@@ -1057,7 +992,7 @@ class ptr_template_commandscript : public CommandScript
1057992
QueryResult index = WorldDatabase.Query("SELECT ID, Enable FROM mod_ptrtemplate_index ORDER BY ID");
1058993
if (index)
1059994
{
1060-
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST);
995+
handler->PSendModuleSysMessage(module_string, MESSAGE_TEMPLATE_LIST);
1061996

1062997
int8 playerSecurity = handler->IsConsole()
1063998
? SEC_CONSOLE
@@ -1074,18 +1009,18 @@ class ptr_template_commandscript : public CommandScript
10741009
if (playerSecurity >= sConfigMgr->GetOption<int8>("StatusSecurityText", true))
10751010
{
10761011
std::string enableText = enableEntry
1077-
? handler->GetModuleString(module_string, createTemplate::DETAIL_ENABLE)[0]
1078-
: handler->GetModuleString(module_string, createTemplate::DETAIL_DISABLE)[0];
1012+
? handler->GetModuleString(module_string, DETAIL_ENABLE)[0]
1013+
: handler->GetModuleString(module_string, DETAIL_DISABLE)[0];
10791014

1080-
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST_DETAIL, indexEntry, templateName, enableText);
1015+
handler->PSendModuleSysMessage(module_string, MESSAGE_TEMPLATE_LIST_DETAIL, indexEntry, templateName, enableText);
10811016
}
10821017
else
1083-
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST_SIMPLE, indexEntry, templateName);
1018+
handler->PSendModuleSysMessage(module_string, MESSAGE_TEMPLATE_LIST_SIMPLE, indexEntry, templateName);
10841019
}
10851020
} while (index->NextRow());
10861021
}
10871022
else
1088-
handler->PSendModuleSysMessage(module_string, createTemplate::MESSAGE_TEMPLATE_LIST_EMPTY);
1023+
handler->PSendModuleSysMessage(module_string, MESSAGE_TEMPLATE_LIST_EMPTY);
10891024

10901025
return true;
10911026
}

‎src/ptr_template_loader.h

+63
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,69 @@
99

1010
TaskScheduler scheduler;
1111

12+
enum checkCodes
13+
{
14+
MISSING_TEMPLATE_INFO = 1,
15+
NOT_INITIAL_LEVEL = 2,
16+
TEMPLATE_DISABLED_GLOBAL = 3,
17+
INSUFFICIENT_SECURITY_LEVEL = 4,
18+
TEMPLATE_DISABLED_LOCAL = 5,
19+
CHECK_PASSED = 0
20+
};
21+
22+
enum templateStrings
23+
{
24+
FEEDBACK_TEMPLATE_ENABLE = 0,
25+
FEEDBACK_TEMPLATE_MISSING = 1,
26+
FEEDBACK_TEMPLATE_DISABLE = 2,
27+
ERROR_TEMPLATE_INFO = 3,
28+
ERROR_TEMPLATE_LEVEL = 4,
29+
ERROR_TEMPLATE_DIABLE_GLOBAL = 5,
30+
ERROR_TEMPLATE_SECURITY = 6,
31+
ERROR_TEMPLATE_DISABLE_LOCAL = 7,
32+
MESSAGE_TEMPLATE_LIST = 8,
33+
MESSAGE_TEMPLATE_LIST_DETAIL = 9,
34+
MESSAGE_TEMPLATE_LIST_SIMPLE = 10,
35+
MESSAGE_TEMPLATE_LIST_EMPTY = 11,
36+
DETAIL_ENABLE = 12,
37+
DETAIL_DISABLE = 13,
38+
ALERT_MODULE_PRESENCE = 14,
39+
MAIL_ERROR_EQUIP_BODY = 15,
40+
MAIL_BOOST_SUBJECT = 16,
41+
MAIL_BOOST_BODY = 17,
42+
MAIL_RESURRECTION_SUBJECT = 18,
43+
MAIL_RESURRECTION_BODY = 19
44+
};
45+
46+
enum templateMail
47+
{
48+
MAIL_BOOST = 403,
49+
MAIL_RESURRECTION = 344
50+
};
51+
52+
enum itemCleanupCodes
53+
{
54+
METHOD_DELETE = 0,
55+
METHOD_BOOST = 1,
56+
METHOD_SCROLL = 2,
57+
SCOPE_EQUIPPED = 0,
58+
SCOPE_BAGS = 1,
59+
SCOPE_ALL = 2
60+
};
61+
62+
enum TemplateEnums
63+
{
64+
APPLY_DELAY = 25,
65+
APPLY_RATE = 50,
66+
HORDE_SIMILAR = -1,
67+
ACTION_BUTTON_BEGIN = 0,
68+
CONTAINER_BACKPACK = 0,
69+
CONTAINER_FINISH = 5,
70+
ITEM_GOLD = 8,
71+
INVENTORY_SLOT_START = 0,
72+
MAILED_ITEM_DELAY = 180
73+
};
74+
1275
void SendTalentReset(Player* player)
1376
{
1477
WorldPacket data(SMSG_TALENTS_INVOLUNTARILY_RESET, 1);

0 commit comments

Comments
 (0)