aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/DataStores/DB2Structure.h4
-rwxr-xr-xsrc/server/game/DataStores/DBCStructure.h2
-rwxr-xr-xsrc/server/game/DataStores/DBCfmt.h2
-rwxr-xr-xsrc/server/game/Entities/Item/ItemPrototype.h4
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp2
-rwxr-xr-xsrc/server/game/Globals/ObjectMgr.cpp32
-rwxr-xr-xsrc/server/game/Handlers/ItemHandler.cpp4
-rwxr-xr-xsrc/server/game/Server/Protocol/Opcodes.h2
8 files changed, 27 insertions, 25 deletions
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 7f6eee0206c..a7b4fe4c07f 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -125,8 +125,8 @@ struct ItemSparseEntry
uint32 ItemLimitCategory; // 126
uint32 HolidayId; // 127
float StatScalingFactor; // 128
- int32 Field130; // 129
- int32 Field131; // 130
+ int32 CurrencySubstitutionId; // 129
+ int32 CurrencySubstitutionCount; // 130
};
#define MAX_ITEM_EXT_COST_ITEMS 5
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 1bf09ea4036..cde1aa51e0d 100755
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -852,7 +852,7 @@ struct CurrencyTypesEntry
//char* iconName; // 3
//uint32 unk4; // 4 all 0
//uint32 unk5; // 5 archaeology-related (?)
- //uint32 unk6; // 6 archaeology-related (?)
+ uint32 SubstitutionId; // 6
uint32 TotalCap; // 7
uint32 WeekCap; // 8
uint32 Flags; // 9
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 5ed2568e0d0..780a33685d6 100755
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -46,7 +46,7 @@ const char CreatureModelDatafmt[]="nxxxxxxxxxxxxxffxxxxxxxxxxxxxxx";
const char CreatureFamilyfmt[]="nfifiiiiixsx";
const char CreatureSpellDatafmt[]="niiiixxxx";
const char CreatureTypefmt[]="nxx";
-const char CurrencyTypesfmt[]="nxxxxxxiiix";
+const char CurrencyTypesfmt[]="nxxxxxiiiix";
const char DestructibleModelDatafmt[]="ixxixxxixxxixxxixxxxxxxx";
const char DungeonEncounterfmt[]="iiixisxx";
diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 49695659868..9e14dcb7733 100755
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -652,8 +652,8 @@ struct ItemTemplate
uint32 ItemLimitCategory; // id from ItemLimitCategory.dbc
uint32 HolidayId; // id from Holidays.dbc
float StatScalingFactor;
- int32 Field130;
- int32 Field131;
+ uint32 CurrencySubstitutionId; // May be used instead of a currency
+ uint32 CurrencySubstitutionCount;
// extra fields, not part of db2 files
float DamageMin;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 3ca3f0fe153..79318ba6e4d 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -25477,7 +25477,7 @@ void Player::SendRefundInfo(Item *item)
data.FlushBits();
data.WriteByteSeq(guid[7]);
data << uint32(GetTotalPlayedTime() - item->GetPlayedTime());
- for (uint8 i = 0; i < MAX_ITEM_EXT_COST_CURRENCIES; ++i) // item cost data
+ for (uint8 i = 0; i < MAX_ITEM_EXT_COST_ITEMS; ++i) // item cost data
{
data << uint32(iece->RequiredItemCount[i]);
data << uint32(iece->RequiredItem[i]);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 44be40401fd..e2ca53487e7 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2355,8 +2355,8 @@ void ObjectMgr::LoadItemTemplates()
itemTemplate.ItemLimitCategory = sparse->ItemLimitCategory;
itemTemplate.HolidayId = sparse->HolidayId;
itemTemplate.StatScalingFactor = sparse->StatScalingFactor;
- itemTemplate.Field130 = sparse->Field130;
- itemTemplate.Field131 = sparse->Field131;
+ itemTemplate.CurrencySubstitutionId = sparse->CurrencySubstitutionId;
+ itemTemplate.CurrencySubstitutionCount = sparse->CurrencySubstitutionCount;
itemTemplate.ScriptId = 0;
itemTemplate.FoodType = 0;
itemTemplate.MinMoneyLoot = 0;
@@ -2399,8 +2399,10 @@ void ObjectMgr::LoadItemTemplates()
"Sheath, RandomProperty, RandomSuffix, ItemSet, Area, Map, BagFamily, TotemCategory, "
// 119 120 121 122 123 124 125
"SocketColor_1, SocketContent_1, SocketColor_2, SocketContent_2, SocketColor_3, SocketContent_3, SocketBonus, "
- // 126 127 128 129 130 131 132 133
- "GemProperties, ArmorDamageModifier, Duration, ItemLimitCategory, HolidayId, StatScalingFactor, Field130, Field131 "
+ // 126 127 128 129 130 131
+ "GemProperties, ArmorDamageModifier, Duration, ItemLimitCategory, HolidayId, StatScalingFactor, "
+ // 132 133
+ "CurrencySubstitutionId, CurrencySubstitutionCount "
"FROM item_template");
if (result)
@@ -2506,17 +2508,17 @@ void ObjectMgr::LoadItemTemplates()
itemTemplate.GemProperties = fields[126].GetUInt32();
FillDisenchantFields(&itemTemplate.DisenchantID, &itemTemplate.RequiredDisenchantSkill, itemTemplate);
- itemTemplate.ArmorDamageModifier = fields[127].GetFloat();
- itemTemplate.Duration = fields[128].GetUInt32();
- itemTemplate.ItemLimitCategory = uint32(fields[129].GetInt16());
- itemTemplate.HolidayId = fields[130].GetUInt32();
- itemTemplate.StatScalingFactor = fields[131].GetFloat();
- itemTemplate.Field130 = fields[132].GetInt32();
- itemTemplate.Field131 = fields[133].GetInt32();
- itemTemplate.ScriptId = 0;
- itemTemplate.FoodType = 0;
- itemTemplate.MinMoneyLoot = 0;
- itemTemplate.MaxMoneyLoot = 0;
+ itemTemplate.ArmorDamageModifier = fields[127].GetFloat();
+ itemTemplate.Duration = fields[128].GetUInt32();
+ itemTemplate.ItemLimitCategory = uint32(fields[129].GetInt16());
+ itemTemplate.HolidayId = fields[130].GetUInt32();
+ itemTemplate.StatScalingFactor = fields[131].GetFloat();
+ itemTemplate.CurrencySubstitutionId = fields[132].GetInt32();
+ itemTemplate.CurrencySubstitutionCount = fields[133].GetInt32();
+ itemTemplate.ScriptId = 0;
+ itemTemplate.FoodType = 0;
+ itemTemplate.MinMoneyLoot = 0;
+ itemTemplate.MaxMoneyLoot = 0;
++dbCount;
} while (result->NextRow());
}
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index 8128cf72e4a..edd0d396e2f 100755
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -433,8 +433,8 @@ void WorldSession::SendItemSparseDb2Reply(uint32 entry)
buff << uint32(proto->ItemLimitCategory);
buff << uint32(proto->HolidayId);
buff << float(proto->StatScalingFactor); // StatScalingFactor
- buff << uint32(proto->Field130); // archaeology unk
- buff << uint32(proto->Field131); // archaeology findinds count
+ buff << uint32(proto->CurrencySubstitutionId);
+ buff << uint32(proto->CurrencySubstitutionCount);
data << uint32(buff.size());
data.append(buff);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 7f6b9f6ca5d..de8830ac6e7 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -255,7 +255,7 @@ enum Opcodes
CMSG_LFG_PROPOSAL_RESULT = 0x0000,
CMSG_LFG_SET_ROLES = 0x25B1,
CMSG_LFG_TELEPORT = 0x2482,
- CMSG_LF_GUILD_JOIN, = 0x68C5,
+ CMSG_LF_GUILD_JOIN = 0x68C5,
CMSG_LIST_INVENTORY = 0x2806,
CMSG_LOAD_SCREEN = 0x2422,
CMSG_LOGOUT_CANCEL = 0x2324,