pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-18 08:18:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
KimLS
2013-05-23 12:50:34 -07:00
parent ce63503bab 815c3dc73f
commit a3e24b6854
214 changed files with 2422 additions and 2373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/command.cpp
+14 -14
View File
@@ -50,7 +50,7 @@
#include "../common/EQPacket.h"
#include "../common/guilds.h"
#include "../common/rulesys.h"
#include "../common/MiscFunctions.h"
#include "../common/StringUtil.h"
//#include "../common/servertalk.h" // for oocmute and revoke
#include "worldserver.h"
#include "masterentity.h"
@@ -85,7 +85,7 @@ int (*command_dispatch)(Client *,char const *)=command_notavail;
void command_bestz(Client *c, const Seperator *message);
void command_pf(Client *c, const Seperator *message);
map<string, CommandRecord *> commandlist;
std::map<std::string, CommandRecord *> commandlist;
//All allocated CommandRecords get put in here so they get deleted on shutdown
LinkedList<CommandRecord *> cleanup_commandlist;
@@ -452,11 +452,11 @@ int command_init(void) {
return -1;
}
map<string, CommandRecord *>::iterator cur,end;
std::map<std::string, CommandRecord *>::iterator cur,end;
cur = commandlist.begin();
end = commandlist.end();
map<string,uint8> command_settings;
map<string,uint8>::iterator itr;
std::map<std::string,uint8> command_settings;
std::map<std::string,uint8>::iterator itr;
database.GetCommandSettings(command_settings);
for(; cur != end; cur++) {
if ((itr=command_settings.find(cur->first))!=command_settings.end())
@@ -518,7 +518,7 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun
if(function == nullptr)
return(-1);
string cstr(command_string);
std::string cstr(command_string);
if(commandlist.count(cstr) != 0) {
LogFile->write(EQEMuLog::Error, "command_add() - Command '%s' is a duplicate - check command.cpp." , command_string);
@@ -526,7 +526,7 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun
}
//look for aliases...
map<string, CommandRecord *>::iterator cur,end,del;
std::map<std::string, CommandRecord *>::iterator cur,end,del;
cur = commandlist.begin();
end = commandlist.end();
for(; cur != end; cur++) {
@@ -578,7 +578,7 @@ int command_realdispatch(Client *c, const char *message)
command_logcommand(c, message);
string cstr(sep.arg[0]+1);
std::string cstr(sep.arg[0]+1);
if(commandlist.count(cstr) != 1) {
return(-2);
@@ -844,13 +844,13 @@ void command_help(Client *c, const Seperator *sep)
c->Message(0, "Available EQEMu commands:");
map<string, CommandRecord *>::iterator cur,end;
std::map<std::string, CommandRecord *>::iterator cur,end;
cur = commandlist.begin();
end = commandlist.end();
for(; cur != end; cur++) {
if(sep->arg[1][0]) {
if(cur->first.find(sep->arg[1]) == string::npos) {
if(cur->first.find(sep->arg[1]) == std::string::npos) {
continue;
}
}
@@ -6595,7 +6595,7 @@ void command_timers(Client *c, const Seperator *sep) {
}
Client *them = c->GetTarget()->CastToClient();
vector< pair<pTimerType, PersistentTimer *> > res;
std::vector< std::pair<pTimerType, PersistentTimer *> > res;
them->GetPTimers().ToVector(res);
c->Message(0,"Timers for target:");
@@ -8118,8 +8118,8 @@ void command_mlog(Client *c, const Seperator *sep) {
return;
}
bool onoff;
string on("on");
string off("off");
std::string on("on");
std::string off("off");
if(!strcasecmp(sep->arg[1], "target")) {
if(on == sep->arg[2]) onoff = true;
@@ -11458,4 +11458,4 @@ void command_questerrors(Client *c, const Seperator *sep)
++i;
++iter;
}
}
}