mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-26 23:57:17 +00:00
Merge branch 'master' into shared_mem
This commit is contained in:
+3
-3
@@ -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("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("reloadqst",NULL,0,command_reloadqst) ||
|
||||||
command_add("reloadpl",NULL,0,command_reloadqst) ||
|
command_add("reloadpl",NULL,0,command_reloadqst) ||
|
||||||
command_add("reloadworld",NULL,0,command_reloadworld) ||
|
command_add("reloadworld",NULL,255,command_reloadworld) ||
|
||||||
command_add("reloadlevelmods",NULL,0,command_reloadlevelmods) ||
|
command_add("reloadlevelmods",NULL,255,command_reloadlevelmods) ||
|
||||||
command_add("rq",NULL,0,command_reloadqst) ||
|
command_add("rq",NULL,0,command_reloadqst) ||
|
||||||
command_add("reloadzonepoints","- Reload zone points from database",150,command_reloadzps) ||
|
command_add("reloadzonepoints","- Reload zone points from database",150,command_reloadzps) ||
|
||||||
command_add("reloadzps",NULL,0,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)
|
if(c->GetTradeskillObject() != NULL)
|
||||||
Object::HandleAugmentation(c, in_augment, c->GetTradeskillObject());
|
Object::HandleAugmentation(c, in_augment, c->GetTradeskillObject());
|
||||||
safe_delete(in_augment);
|
safe_delete(in_augment);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user