aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-08 11:23:50 -0600
committermegamage <none@none>2009-03-08 11:23:50 -0600
commit8cb6894c3d6dcc6d83bc6005c920ebc75a59ec07 (patch)
tree878c53b9027f8908240ef6366045a5659fc2c877 /src
parent881377ec65015f1e0048db93b28713676781ea25 (diff)
parent7b47d509e3a78a04b58f1b272f4b780c5c5b5ad3 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Chat.cpp1
-rw-r--r--src/game/Chat.h1
-rw-r--r--src/shared/Database/DBCStructure.h10
3 files changed, 12 insertions, 0 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index e894dc3e12f..bd338c8eb28 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -331,6 +331,7 @@ ChatCommand * ChatHandler::getCommandTable()
{ "spell_target_position", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadSpellTargetPositionCommand, "", NULL },
{ "spell_threats", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadSpellThreatsCommand, "", NULL },
{ "spell_disabled", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadSpellDisabledCommand, "", NULL },
+ { "auctions", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadAuctionsCommand, "", NULL },
{ "waypoint_scripts", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadWpScriptsCommand, "", NULL },
{ "gm_tickets", SEC_ADMINISTRATOR, true, &ChatHandler::HandleGMTicketReloadCommand, "", NULL },
diff --git a/src/game/Chat.h b/src/game/Chat.h
index 21795671a35..1cc6d140025 100644
--- a/src/game/Chat.h
+++ b/src/game/Chat.h
@@ -285,6 +285,7 @@ class ChatHandler
bool HandleReloadSpellThreatsCommand(const char* args);
bool HandleReloadSpellPetAurasCommand(const char* args);
bool HandleReloadSpellDisabledCommand(const char* args);
+ bool HandleReloadAuctionsCommand(const char* args);
bool HandleInstanceListBindsCommand(const char* args);
bool HandleInstanceUnbindCommand(const char* args);
diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h
index 8f2fa87e17f..493ce32fa50 100644
--- a/src/shared/Database/DBCStructure.h
+++ b/src/shared/Database/DBCStructure.h
@@ -538,6 +538,16 @@ struct AuctionHouseEntry
// 20 string flag, unused
};
+struct AuctionHouseEntry
+{
+ uint32 houseId; // 0 index
+ uint32 faction; // 1 id of faction.dbc for player factions associated with city
+ uint32 depositPercent; // 2 1/3 from real
+ uint32 cutPercent; // 3
+ //char* name[16]; // 4-19
+ // 20 string flag, unused
+};
+
struct BankBagSlotPricesEntry
{
uint32 ID;