Merge branch 'master' into shared_mem

This commit is contained in:
KimLS 2013-02-23 15:04:16 -08:00
commit 9c1159837a

View File

@ -267,8 +267,8 @@ int command_init(void) {
command_add("reloadquest"," - Clear quest cache (any argument causes it to also stop all timers)",150,command_reloadqst) ||
command_add("reloadqst",NULL,0,command_reloadqst) ||
command_add("reloadpl",NULL,0,command_reloadqst) ||
command_add("reloadworld",NULL,0,command_reloadworld) ||
command_add("reloadlevelmods",NULL,0,command_reloadlevelmods) ||
command_add("reloadworld",NULL,255,command_reloadworld) ||
command_add("reloadlevelmods",NULL,255,command_reloadlevelmods) ||
command_add("rq",NULL,0,command_reloadqst) ||
command_add("reloadzonepoints","- Reload zone points from database",150,command_reloadzps) ||
command_add("reloadzps",NULL,0,command_reloadzps) ||
@ -11611,4 +11611,4 @@ void command_augmentitem(Client *c, const Seperator *sep)
if(c->GetTradeskillObject() != NULL)
Object::HandleAugmentation(c, in_augment, c->GetTradeskillObject());
safe_delete(in_augment);
}
}