server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor styling tidy up

Browse Source
This commit is contained in:
Antz 2020-05-24 21:01:04 +01:00
parent b6dda4df13
commit 2d32788121
7 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/ChatCommands/MailCommands.cpp
View File

@ -30,7 +30,7 @@
/********************************************************************** /**********************************************************************
CommandTable : mailCommandTable CommandTable : mailCommandTable
/***********************************************************************/ /***********************************************************************/
// Send mail by command // Send mail by command
bool ChatHandler::HandleSendMailCommand(char* args) bool ChatHandler::HandleSendMailCommand(char* args)
{ {
if (!*args) if (!*args)

3
src/game/Tools/Language.h
View File

@ -1013,8 +1013,7 @@ enum MangosStrings
LANG_HONOR_LAST_WEEK = 1438, LANG_HONOR_LAST_WEEK = 1438,
LANG_HONOR_LIFE = 1439, LANG_HONOR_LIFE = 1439,
LANG_COMMAND_TICKETUPDATED = 1440, LANG_COMMAND_TICKETUPDATED = 1440,
// Room for old clients 1.x 1441499 not used // Room for old clients 1.x 1441-1499 not used
// Level 2 (continue) // Level 2 (continue)
LANG_POOL_CHANCE_POOL_LIST_CONSOLE = 1500, LANG_POOL_CHANCE_POOL_LIST_CONSOLE = 1500,

24
src/game/WorldHandlers/Chat.h
View File

@ -51,32 +51,32 @@ class Unit;
class ChatCommand class ChatCommand
{ {
public: public:
uint32 Id; uint32 Id;
const char* Name; const char* Name;
uint32 SecurityLevel; // function pointer required correct align (use uint32) uint32 SecurityLevel; // function pointer required correct align (use uint32)
bool AllowConsole; bool AllowConsole;
bool (ChatHandler::* Handler)(char* args); bool (ChatHandler::* Handler)(char* args);
std::string Help; std::string Help;
ChatCommand* ChildCommands; ChatCommand* ChildCommands;
ChatCommand( ChatCommand(
const char* pName, const char* pName,
uint32 pSecurityLevel, uint32 pSecurityLevel,
bool pAllowConsole, bool pAllowConsole,
bool (ChatHandler::* pHandler)(char* args), bool (ChatHandler::* pHandler)(char* args),
std::string pHelp, std::string pHelp,
ChatCommand* pChildCommands ChatCommand* pChildCommands
) )
: Id(-1) : Id(-1)
{ {
Name = pName; Name = pName;
SecurityLevel = pSecurityLevel; SecurityLevel = pSecurityLevel;
AllowConsole = pAllowConsole; AllowConsole = pAllowConsole;
Handler = pHandler; Handler = pHandler;
Help = pHelp; Help = pHelp;
ChildCommands = pChildCommands; ChildCommands = pChildCommands;
} }
}; };
enum ChatCommandSearchResult enum ChatCommandSearchResult

5
src/game/WorldHandlers/Mail.cpp
View File

@ -327,7 +327,7 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
// Normal Mail Expire Timer // Normal Mail Expire Timer
expire_delay = 30 * DAY; expire_delay = 30 * DAY;
// auction mail without any items and money // auction mail without any items and money (auction sale note) pending 1 hour
if (sender.GetMailMessageType() == MAIL_AUCTION && m_items.empty() && !m_money) if (sender.GetMailMessageType() == MAIL_AUCTION && m_items.empty() && !m_money)
{ {
expire_delay = HOUR; expire_delay = HOUR;
@ -348,9 +348,6 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
expire_delay = 90 * DAY; expire_delay = 90 * DAY;
} }
time_t expire_time = deliver_time + expire_delay; time_t expire_time = deliver_time + expire_delay;
// Add to DB // Add to DB