diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 09:03:29 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 09:03:29 +0100 |
| commit | ccf593c6738ad1073381f1c2d404664e8d4ea187 (patch) | |
| tree | aed45faab77812b149be4cfb2384122d7d3a0055 /src | |
| parent | 35d63a97990528d5496598cc5893be141649f308 (diff) | |
Fix merge conflic and typos in worldserver config file and characters.sql
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 4 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 58bd94a3bdc..deb51bf4ac6 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1680,10 +1680,10 @@ void Guild::HandleBuyBankTab(WorldSession* session, uint8 tabId) if (!tabCost) return; - if (!player->HasEnoughMoney(tabCost)) // Should not happen, this is checked by client + if (!player->HasEnoughMoney(uint64(tabCost))) // Should not happen, this is checked by client return; - player->ModifyMoney(-int32(tabCost)); + player->ModifyMoney(-int64(tabCost)); _CreateNewBankTab(); _BroadcastEvent(GE_BANK_TAB_PURCHASED, 0); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 0cb6072c244..650695a1397 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -985,14 +985,14 @@ Guild.ResetHour = 6 Guild.BankEventLogRecordsCount = 25 # -# Guild.Guild.NewsLogRecordsCount +# Guild.NewsLogRecordsCount # Description: Number of log entries for guild news that are stored per guild. Old # entries will be overwritten if the number of log entries exceed the # configured value. High numbers prevent this behavior but may have performance # impacts. # Default: 250 -Guild.Guild.NewsLogRecordsCount = 250 +Guild.NewsLogRecordsCount = 250 # # MaxPrimaryTradeSkill |