diff --git a/utils/gm_commands/main.go b/utils/gm_commands/main.go deleted file mode 100644 index 4ef678d97..000000000 --- a/utils/gm_commands/main.go +++ /dev/null @@ -1,183 +0,0 @@ -package main - -import ( - "fmt" - "io/ioutil" - "log" - "os" - "sort" - "strings" -) - -func main() { - // zone/command.cpp - commands, err := os.ReadFile("./zone/command.cpp") - if err != nil { - log.Fatal(err) - } - commandsString := string(commands) - - s := strings.Split(commandsString, "void command_") - commandFiles := []string{} - if len(s) > 1 { - startListing := false - for i, chunk := range s { - if strings.Contains(chunk, "logcommand(Client *c") { - startListing = true - } - - // get function name - functionName := "" - nameSplit := strings.Split(chunk, "(Client") - if len(nameSplit) > 0 { - functionName = strings.TrimSpace(nameSplit[0]) - } - - if startListing && - len(s[i-1]) > 0 && - !strings.Contains(s[i-1], "#ifdef") && - !strings.Contains(chunk, "#ifdef") && - !strings.Contains(chunk, "#ifdef BOTS") && - !strings.Contains(chunk, "#ifdef EQPROFILE") && - !strings.Contains(functionName, "bot") && - !strings.Contains(functionName, "help") && - !strings.Contains(functionName, "findaliases") { - - fmt.Println(functionName) - - // build command file name - commandFile := fmt.Sprintf("zone/gm_commands/%v.cpp", functionName) - - // append command file nam eto list - commandFiles = append(commandFiles, commandFile) - - includes := "" - if strings.Contains(chunk, "Client") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../client.h\"") - } - if strings.Contains(chunk, "parse->") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../quest_parser_collection.h\"") - } - if strings.Contains(chunk, "worldserver.") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../worldserver.h\"") - includes = fmt.Sprintf("%v%v\n", includes, "extern WorldServer worldserver;") - } - if strings.Contains(chunk, "RegionType") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../water_map.h\"") - } - if strings.Contains(chunk, "Corpse") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../corpse.h\"") - } - if strings.Contains(chunk, "Object") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../object.h\"") - } - if strings.Contains(chunk, "DoorManipulation") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"door_manipulation.h\"") - } - if strings.Contains(chunk, "Group") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../groups.h\"") - } - if strings.Contains(chunk, "httplib") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/http/httplib.h\"") - } - if strings.Contains(chunk, "guild_mgr") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../guild_mgr.h\"") - } - if strings.Contains(chunk, "expedition") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../expedition.h\"") - } - if strings.Contains(chunk, "DataBucket::") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../data_bucket.h\"") - } - if strings.Contains(chunk, "file_exists") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/file_util.h\"") - } - if strings.Contains(chunk, "std::thread") { - includes = fmt.Sprintf("%v%v\n", includes, "#include ") - } - if strings.Contains(chunk, "Door") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../doors.h\"") - } - if strings.Contains(chunk, "NOW_INVISIBLE") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../string_ids.h\"") - } - if strings.Contains(chunk, "Expansion::") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/content/world_content_service.h\"") - } - if strings.Contains(chunk, "MobMovementManager::") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../mob_movement_manager.h\"") - } - if strings.Contains(chunk, "MobStuckBehavior::") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../mob_movement_manager.h\"") - } - if strings.Contains(chunk, "ReloadAllPatches") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/patches/patches.h\"") - } - if strings.Contains(chunk, "ProfanityManager") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/profanity_manager.h\"") - } - if strings.Contains(chunk, "npc_scale_manager") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../npc_scale_manager.h\"") - } - if strings.Contains(chunk, "g_Math") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../fastmath.h\"") - includes = fmt.Sprintf("%v%v\n", includes, "extern FastMath g_Math;") - } - if strings.Contains(chunk, "raid") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../raids.h\"") - } - if strings.Contains(chunk, "Raid") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../raids.h\"") - } - if strings.Contains(chunk, "GetOS") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/serverinfo.h\"") - } - if strings.Contains(chunk, "LANG_") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/languages.h\"") - } - if strings.Contains(chunk, "ServerOP_Shared") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../common/shared_tasks.h\"") - } - if strings.Contains(chunk, "title_manager") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../titles.h\"") - } - if strings.Contains(chunk, "CatchSignal") { - includes = fmt.Sprintf("%v%v\n", includes, "#include \"../../world/main.h\"") - } - - // build the contents of the command file - commandString := fmt.Sprintf("%v\nvoid command_%v", includes, chunk) - - //write file contents - err := ioutil.WriteFile(commandFile, []byte(commandString), 0777) - if err != nil { - fmt.Println(err) - } - - commandOnly := fmt.Sprintf("void command_%v", chunk) - commandsString = strings.ReplaceAll(commandsString, commandOnly, "") - - } - } - - // rewrite commands.cpp with functions removed - err := ioutil.WriteFile("zone/command.cpp", []byte(commandsString), 0777) - if err != nil { - fmt.Println(err) - } - - fmt.Println("# CmakeLists") - - // sort a-z - sort.Slice(commandFiles, func(i, j int) bool { - return commandFiles[i] < commandFiles[j] - }) - - for _, file := range commandFiles { - file = strings.ReplaceAll(file, "zone/", "") - fmt.Println(file) - } - } - - //fmt.Print(string(commands)) -} diff --git a/zone/gm_commands/acceptrules.cpp b/zone/gm_commands/acceptrules.cpp index c675eee8b..6886cf21b 100755 --- a/zone/gm_commands/acceptrules.cpp +++ b/zone/gm_commands/acceptrules.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_acceptrules(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/advnpcspawn.cpp b/zone/gm_commands/advnpcspawn.cpp index 235362f3f..24f7d6b06 100755 --- a/zone/gm_commands/advnpcspawn.cpp +++ b/zone/gm_commands/advnpcspawn.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../groups.h" +#include "zone/client.h" +#include "zone/groups.h" void command_advnpcspawn(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/aggrozone.cpp b/zone/gm_commands/aggrozone.cpp index 6b80c85d3..5503acac5 100755 --- a/zone/gm_commands/aggrozone.cpp +++ b/zone/gm_commands/aggrozone.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_aggrozone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/ai.cpp b/zone/gm_commands/ai.cpp index b746ac0b4..84705a3e6 100755 --- a/zone/gm_commands/ai.cpp +++ b/zone/gm_commands/ai.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_ai(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/appearance.cpp b/zone/gm_commands/appearance.cpp index 65ac7792f..c4f52b132 100755 --- a/zone/gm_commands/appearance.cpp +++ b/zone/gm_commands/appearance.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_appearance(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/appearanceeffects.cpp b/zone/gm_commands/appearanceeffects.cpp index d094a4f0a..09ba6cb4a 100644 --- a/zone/gm_commands/appearanceeffects.cpp +++ b/zone/gm_commands/appearanceeffects.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_appearanceeffects(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/attack.cpp b/zone/gm_commands/attack.cpp index 4623a85ca..e62743c43 100755 --- a/zone/gm_commands/attack.cpp +++ b/zone/gm_commands/attack.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_attack(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/augmentitem.cpp b/zone/gm_commands/augmentitem.cpp index 81b5523aa..ddf0559e9 100755 --- a/zone/gm_commands/augmentitem.cpp +++ b/zone/gm_commands/augmentitem.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../object.h" +#include "zone/client.h" +#include "zone/object.h" void command_augmentitem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/ban.cpp b/zone/gm_commands/ban.cpp index 3d2530ab9..6050978f8 100755 --- a/zone/gm_commands/ban.cpp +++ b/zone/gm_commands/ban.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/bugs.cpp b/zone/gm_commands/bugs.cpp index 8263c2c11..2aeea0507 100755 --- a/zone/gm_commands/bugs.cpp +++ b/zone/gm_commands/bugs.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/repositories/bug_reports_repository.h" +#include "common/repositories/bug_reports_repository.h" +#include "zone/client.h" void command_bugs(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/camerashake.cpp b/zone/gm_commands/camerashake.cpp index dc6adf799..13a26d988 100755 --- a/zone/gm_commands/camerashake.cpp +++ b/zone/gm_commands/camerashake.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/castspell.cpp b/zone/gm_commands/castspell.cpp index 47597c19a..9fc940947 100755 --- a/zone/gm_commands/castspell.cpp +++ b/zone/gm_commands/castspell.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_castspell(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/chat.cpp b/zone/gm_commands/chat.cpp index 56c8e1cc6..eedcb81ff 100755 --- a/zone/gm_commands/chat.cpp +++ b/zone/gm_commands/chat.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/clearxtargets.cpp b/zone/gm_commands/clearxtargets.cpp index 58700675b..337d1de0e 100644 --- a/zone/gm_commands/clearxtargets.cpp +++ b/zone/gm_commands/clearxtargets.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_clearxtargets(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/copycharacter.cpp b/zone/gm_commands/copycharacter.cpp index 84af27677..cfd8de48a 100755 --- a/zone/gm_commands/copycharacter.cpp +++ b/zone/gm_commands/copycharacter.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_copycharacter(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/corpse.cpp b/zone/gm_commands/corpse.cpp index 14f914c7d..560e99319 100755 --- a/zone/gm_commands/corpse.cpp +++ b/zone/gm_commands/corpse.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../corpse.h" +#include "zone/client.h" +#include "zone/corpse.h" void command_corpse(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/corpsefix.cpp b/zone/gm_commands/corpsefix.cpp index 0de35a8d3..3370e827b 100755 --- a/zone/gm_commands/corpsefix.cpp +++ b/zone/gm_commands/corpsefix.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../corpse.h" +#include "zone/client.h" +#include "zone/corpse.h" void command_corpsefix(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/countitem.cpp b/zone/gm_commands/countitem.cpp index 306f48942..69aaa2832 100644 --- a/zone/gm_commands/countitem.cpp +++ b/zone/gm_commands/countitem.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_countitem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/damage.cpp b/zone/gm_commands/damage.cpp index 2044cc483..8ddd81138 100755 --- a/zone/gm_commands/damage.cpp +++ b/zone/gm_commands/damage.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_damage(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/databuckets.cpp b/zone/gm_commands/databuckets.cpp index ca2b17808..bf9c1b84f 100755 --- a/zone/gm_commands/databuckets.cpp +++ b/zone/gm_commands/databuckets.cpp @@ -1,7 +1,7 @@ -#include "../client.h" -#include "../../common/data_bucket.h" -#include "../dialogue_window.h" -#include "../../common/repositories/data_buckets_repository.h" +#include "common/data_bucket.h" +#include "common/repositories/data_buckets_repository.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void SendDataBucketsSubCommands(Client *c) { diff --git a/zone/gm_commands/dbspawn2.cpp b/zone/gm_commands/dbspawn2.cpp index e52419f28..2db344948 100755 --- a/zone/gm_commands/dbspawn2.cpp +++ b/zone/gm_commands/dbspawn2.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_dbspawn2(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/delacct.cpp b/zone/gm_commands/delacct.cpp index a4602a9a3..198e736b4 100755 --- a/zone/gm_commands/delacct.cpp +++ b/zone/gm_commands/delacct.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" void command_delacct(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/delpetition.cpp b/zone/gm_commands/delpetition.cpp index 3630a9b3b..f42cf2772 100755 --- a/zone/gm_commands/delpetition.cpp +++ b/zone/gm_commands/delpetition.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_delpetition(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/depop.cpp b/zone/gm_commands/depop.cpp index 1b69fb8f8..0c10fc8f4 100755 --- a/zone/gm_commands/depop.cpp +++ b/zone/gm_commands/depop.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../corpse.h" +#include "zone/client.h" +#include "zone/corpse.h" void command_depop(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/depopzone.cpp b/zone/gm_commands/depopzone.cpp index ef90d7c04..0d483cbd1 100755 --- a/zone/gm_commands/depopzone.cpp +++ b/zone/gm_commands/depopzone.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_depopzone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/devtools.cpp b/zone/gm_commands/devtools.cpp index c362a6d05..2326c4129 100755 --- a/zone/gm_commands/devtools.cpp +++ b/zone/gm_commands/devtools.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/data_bucket.h" +#include "common/data_bucket.h" +#include "zone/client.h" void command_devtools(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/disablerecipe.cpp b/zone/gm_commands/disablerecipe.cpp index f57fa97d0..b9936f316 100755 --- a/zone/gm_commands/disablerecipe.cpp +++ b/zone/gm_commands/disablerecipe.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_disablerecipe(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/disarmtrap.cpp b/zone/gm_commands/disarmtrap.cpp index 44837c053..2f21efd59 100755 --- a/zone/gm_commands/disarmtrap.cpp +++ b/zone/gm_commands/disarmtrap.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_disarmtrap(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/doanim.cpp b/zone/gm_commands/doanim.cpp index 1f777a604..2e050194a 100755 --- a/zone/gm_commands/doanim.cpp +++ b/zone/gm_commands/doanim.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void command_doanim(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/door.cpp b/zone/gm_commands/door.cpp index 33764af5b..46ea56a93 100755 --- a/zone/gm_commands/door.cpp +++ b/zone/gm_commands/door.cpp @@ -1,6 +1,7 @@ -#include "../client.h" #include "door_manipulation.h" +#include "zone/client.h" + void command_door(Client *c, const Seperator *sep) { DoorManipulation::CommandHandler(c, sep); diff --git a/zone/gm_commands/door_manipulation.cpp b/zone/gm_commands/door_manipulation.cpp index 614cc4484..28af983dd 100644 --- a/zone/gm_commands/door_manipulation.cpp +++ b/zone/gm_commands/door_manipulation.cpp @@ -1,7 +1,8 @@ #include "door_manipulation.h" -#include "../doors.h" -#include "../../common/misc_functions.h" -#include "../../common/strings.h" + +#include "common/misc_functions.h" +#include "common/strings.h" +#include "zone/doors.h" #define MAX_CLIENT_MESSAGE_LENGTH 2000 diff --git a/zone/gm_commands/door_manipulation.h b/zone/gm_commands/door_manipulation.h index d448c3bc7..4a80ebeca 100644 --- a/zone/gm_commands/door_manipulation.h +++ b/zone/gm_commands/door_manipulation.h @@ -1,8 +1,7 @@ -#ifndef EQEMU_DOOR_MANIPULATION_H -#define EQEMU_DOOR_MANIPULATION_H +#pragma once -#include "../client.h" -#include "../../common/repositories/tool_game_objects_repository.h" +#include "common/repositories/tool_game_objects_repository.h" +#include "zone/client.h" class DoorManipulation { @@ -18,6 +17,3 @@ public: std::vector game_objects ); }; - - -#endif //EQEMU_DOOR_MANIPULATION_H diff --git a/zone/gm_commands/dye.cpp b/zone/gm_commands/dye.cpp index 7fa4c73a2..efd210418 100755 --- a/zone/gm_commands/dye.cpp +++ b/zone/gm_commands/dye.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_dye(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/dz.cpp b/zone/gm_commands/dz.cpp index fe2ce1252..8df3a434e 100755 --- a/zone/gm_commands/dz.cpp +++ b/zone/gm_commands/dz.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../dynamic_zone.h" +#include "zone/client.h" +#include "zone/dynamic_zone.h" void command_dz(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/dzkickplayers.cpp b/zone/gm_commands/dzkickplayers.cpp index 1f56aee44..4a0ff340b 100755 --- a/zone/gm_commands/dzkickplayers.cpp +++ b/zone/gm_commands/dzkickplayers.cpp @@ -1,4 +1,5 @@ -#include "../client.h" +#include "zone/client.h" +#include "zone/dynamic_zone.h" void command_dzkickplayers(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/editmassrespawn.cpp b/zone/gm_commands/editmassrespawn.cpp index a520ed6cc..a48475c92 100755 --- a/zone/gm_commands/editmassrespawn.cpp +++ b/zone/gm_commands/editmassrespawn.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_editmassrespawn(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/emote.cpp b/zone/gm_commands/emote.cpp index 761f1fd12..6fc0c6a72 100755 --- a/zone/gm_commands/emote.cpp +++ b/zone/gm_commands/emote.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/emptyinventory.cpp b/zone/gm_commands/emptyinventory.cpp index e37167db6..869fea3d5 100644 --- a/zone/gm_commands/emptyinventory.cpp +++ b/zone/gm_commands/emptyinventory.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_emptyinventory(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/enablerecipe.cpp b/zone/gm_commands/enablerecipe.cpp index 60c8fefbe..28f4cff1c 100755 --- a/zone/gm_commands/enablerecipe.cpp +++ b/zone/gm_commands/enablerecipe.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_enablerecipe(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/entityvariable.cpp b/zone/gm_commands/entityvariable.cpp index d6e10d204..fc64a6796 100644 --- a/zone/gm_commands/entityvariable.cpp +++ b/zone/gm_commands/entityvariable.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_entityvariable(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/evolving_items.cpp b/zone/gm_commands/evolving_items.cpp index 241a79a50..cb58d6733 100644 --- a/zone/gm_commands/evolving_items.cpp +++ b/zone/gm_commands/evolving_items.cpp @@ -1,6 +1,6 @@ -#include "../client.h" -#include "../command.h" -#include "../../common/evolving_items.h" +#include "common/evolving_items.h" +#include "zone/client.h" +#include "zone/command.h" void command_evolvingitems(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/exptoggle.cpp b/zone/gm_commands/exptoggle.cpp index abc1d2b92..8aba5b627 100644 --- a/zone/gm_commands/exptoggle.cpp +++ b/zone/gm_commands/exptoggle.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_exptoggle(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/faction.cpp b/zone/gm_commands/faction.cpp index 2e1dd726e..c703d51c3 100644 --- a/zone/gm_commands/faction.cpp +++ b/zone/gm_commands/faction.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_faction(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/faction_association.cpp b/zone/gm_commands/faction_association.cpp index a39f25dbc..8d900d3a9 100644 --- a/zone/gm_commands/faction_association.cpp +++ b/zone/gm_commands/faction_association.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_faction_association(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/feature.cpp b/zone/gm_commands/feature.cpp index f43f279fa..a0670686b 100644 --- a/zone/gm_commands/feature.cpp +++ b/zone/gm_commands/feature.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_feature(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find.cpp b/zone/gm_commands/find.cpp index a5e2bad3d..cf25624b2 100644 --- a/zone/gm_commands/find.cpp +++ b/zone/gm_commands/find.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void FindAA(Client* c, const Seperator* sep); void FindAccount(Client* c, const Seperator* sep); diff --git a/zone/gm_commands/find/find_aa.cpp b/zone/gm_commands/find/find_aa.cpp index 82e311bee..e7155014e 100644 --- a/zone/gm_commands/find/find_aa.cpp +++ b/zone/gm_commands/find/find_aa.cpp @@ -1,4 +1,5 @@ -#include "../../client.h" +#include "common/seperator.h" +#include "zone/client.h" void FindAA(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_account.cpp b/zone/gm_commands/find/find_account.cpp index 17512b2a8..828daecb2 100644 --- a/zone/gm_commands/find/find_account.cpp +++ b/zone/gm_commands/find/find_account.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" void FindAccount(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_body_type.cpp b/zone/gm_commands/find/find_body_type.cpp index bcf57f400..3e1bbed16 100644 --- a/zone/gm_commands/find/find_body_type.cpp +++ b/zone/gm_commands/find/find_body_type.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindBodyType(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_bot.cpp b/zone/gm_commands/find/find_bot.cpp index fd403d670..f36ec7eac 100644 --- a/zone/gm_commands/find/find_bot.cpp +++ b/zone/gm_commands/find/find_bot.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/bot_data_repository.h" +#include "common/repositories/bot_data_repository.h" +#include "zone/client.h" void FindBot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_bug_category.cpp b/zone/gm_commands/find/find_bug_category.cpp index 5dc51f0d1..cba0369fc 100644 --- a/zone/gm_commands/find/find_bug_category.cpp +++ b/zone/gm_commands/find/find_bug_category.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindBugCategory(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_character.cpp b/zone/gm_commands/find/find_character.cpp index 0c1842eff..d822e3ed5 100644 --- a/zone/gm_commands/find/find_character.cpp +++ b/zone/gm_commands/find/find_character.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/character_data_repository.h" +#include "common/repositories/character_data_repository.h" +#include "zone/client.h" void FindCharacter(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_class.cpp b/zone/gm_commands/find/find_class.cpp index a89211e77..cff72b201 100644 --- a/zone/gm_commands/find/find_class.cpp +++ b/zone/gm_commands/find/find_class.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindClass(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_comparison_type.cpp b/zone/gm_commands/find/find_comparison_type.cpp index 52a9dea6e..9ee2ef49a 100644 --- a/zone/gm_commands/find/find_comparison_type.cpp +++ b/zone/gm_commands/find/find_comparison_type.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindComparisonType(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_currency.cpp b/zone/gm_commands/find/find_currency.cpp index fbf640d85..41928b71a 100644 --- a/zone/gm_commands/find/find_currency.cpp +++ b/zone/gm_commands/find/find_currency.cpp @@ -1,4 +1,5 @@ -#include "../../client.h" +#include "zone/client.h" +#include "zone/command.h" void FindCurrency(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_deity.cpp b/zone/gm_commands/find/find_deity.cpp index be295bfed..a9b298a2a 100644 --- a/zone/gm_commands/find/find_deity.cpp +++ b/zone/gm_commands/find/find_deity.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindDeity(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_emote.cpp b/zone/gm_commands/find/find_emote.cpp index a8f1c433c..af95c0832 100644 --- a/zone/gm_commands/find/find_emote.cpp +++ b/zone/gm_commands/find/find_emote.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindEmote(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_faction.cpp b/zone/gm_commands/find/find_faction.cpp index 376140928..8bd933b53 100644 --- a/zone/gm_commands/find/find_faction.cpp +++ b/zone/gm_commands/find/find_faction.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindFaction(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_item.cpp b/zone/gm_commands/find/find_item.cpp index 0f4870701..537c441a3 100644 --- a/zone/gm_commands/find/find_item.cpp +++ b/zone/gm_commands/find/find_item.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/items_repository.h" +#include "zone/client.h" +#include "common/repositories/items_repository.h" void FindItem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_language.cpp b/zone/gm_commands/find/find_language.cpp index 0df7f4a4d..699c50446 100644 --- a/zone/gm_commands/find/find_language.cpp +++ b/zone/gm_commands/find/find_language.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindLanguage(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_ldon_theme.cpp b/zone/gm_commands/find/find_ldon_theme.cpp index aa7231297..1310364de 100644 --- a/zone/gm_commands/find/find_ldon_theme.cpp +++ b/zone/gm_commands/find/find_ldon_theme.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindLDoNTheme(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_npctype.cpp b/zone/gm_commands/find/find_npctype.cpp index c83be99ba..7cb177d79 100644 --- a/zone/gm_commands/find/find_npctype.cpp +++ b/zone/gm_commands/find/find_npctype.cpp @@ -1,4 +1,5 @@ -#include "../../client.h" +#include "zone/client.h" +#include "zone/command.h" void FindNPCType(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_object_type.cpp b/zone/gm_commands/find/find_object_type.cpp index 1e7dc69aa..c0768cc1f 100644 --- a/zone/gm_commands/find/find_object_type.cpp +++ b/zone/gm_commands/find/find_object_type.cpp @@ -1,5 +1,5 @@ -#include "../../object.h" -#include "../../client.h" +#include "zone/client.h" +#include "zone/object.h" void FindObjectType(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_race.cpp b/zone/gm_commands/find/find_race.cpp index 4b15f1228..644ffce73 100644 --- a/zone/gm_commands/find/find_race.cpp +++ b/zone/gm_commands/find/find_race.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindRace(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_recipe.cpp b/zone/gm_commands/find/find_recipe.cpp index 260c6dccf..7003c801a 100644 --- a/zone/gm_commands/find/find_recipe.cpp +++ b/zone/gm_commands/find/find_recipe.cpp @@ -1,6 +1,6 @@ -#include "../../client.h" -#include "../../command.h" -#include "../../../common/repositories/tradeskill_recipe_repository.h" +#include "common/repositories/tradeskill_recipe_repository.h" +#include "zone/client.h" +#include "zone/command.h" void FindRecipe(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_skill.cpp b/zone/gm_commands/find/find_skill.cpp index 7c92f4359..12ceabb8a 100644 --- a/zone/gm_commands/find/find_skill.cpp +++ b/zone/gm_commands/find/find_skill.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindSkill(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_special_ability.cpp b/zone/gm_commands/find/find_special_ability.cpp index ad29813df..24cdce447 100644 --- a/zone/gm_commands/find/find_special_ability.cpp +++ b/zone/gm_commands/find/find_special_ability.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindSpecialAbility(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_spell.cpp b/zone/gm_commands/find/find_spell.cpp index b5f1a88e8..2c2afae69 100644 --- a/zone/gm_commands/find/find_spell.cpp +++ b/zone/gm_commands/find/find_spell.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" uint8 GetCommandStatus(std::string command_name); diff --git a/zone/gm_commands/find/find_stance.cpp b/zone/gm_commands/find/find_stance.cpp index daebebc15..7fb2ceecb 100644 --- a/zone/gm_commands/find/find_stance.cpp +++ b/zone/gm_commands/find/find_stance.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void FindStance(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/find/find_task.cpp b/zone/gm_commands/find/find_task.cpp index 0873ebe30..21ffe5b0d 100644 --- a/zone/gm_commands/find/find_task.cpp +++ b/zone/gm_commands/find/find_task.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" uint8 GetCommandStatus(std::string command_name); diff --git a/zone/gm_commands/find/find_zone.cpp b/zone/gm_commands/find/find_zone.cpp index 6715649d9..eb7a47ff6 100644 --- a/zone/gm_commands/find/find_zone.cpp +++ b/zone/gm_commands/find/find_zone.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/content/world_content_service.h" +#include "common/content/world_content_service.h" +#include "zone/client.h" void FindZone(Client* c, const Seperator* sep) { diff --git a/zone/gm_commands/fish.cpp b/zone/gm_commands/fish.cpp index 47af56009..07632d3a0 100644 --- a/zone/gm_commands/fish.cpp +++ b/zone/gm_commands/fish.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_fish(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/fixmob.cpp b/zone/gm_commands/fixmob.cpp index d691b0f2e..e91cefd17 100755 --- a/zone/gm_commands/fixmob.cpp +++ b/zone/gm_commands/fixmob.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void SendFixMobSubCommands(Client* c) { diff --git a/zone/gm_commands/flagedit.cpp b/zone/gm_commands/flagedit.cpp index bb29620f1..cb260e09e 100755 --- a/zone/gm_commands/flagedit.cpp +++ b/zone/gm_commands/flagedit.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_flagedit(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/fleeinfo.cpp b/zone/gm_commands/fleeinfo.cpp index 1461bfd3c..3c5f6ca73 100644 --- a/zone/gm_commands/fleeinfo.cpp +++ b/zone/gm_commands/fleeinfo.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_fleeinfo(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/forage.cpp b/zone/gm_commands/forage.cpp index b4717aac7..943de1691 100644 --- a/zone/gm_commands/forage.cpp +++ b/zone/gm_commands/forage.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_forage(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/gearup.cpp b/zone/gm_commands/gearup.cpp index 2d9cbc1c5..13c05da63 100755 --- a/zone/gm_commands/gearup.cpp +++ b/zone/gm_commands/gearup.cpp @@ -1,8 +1,8 @@ -#include "../client.h" -#include "../../common/http/httplib.h" -#include "../../common/content/world_content_service.h" +#include "common/content/world_content_service.h" +#include "common/http/httplib.h" +#include "zone/client.h" -#include "../bot.h" +#include "zone/bot.h" void command_gearup(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/giveitem.cpp b/zone/gm_commands/giveitem.cpp index 66a05554e..b0fc7f131 100755 --- a/zone/gm_commands/giveitem.cpp +++ b/zone/gm_commands/giveitem.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_giveitem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/givemoney.cpp b/zone/gm_commands/givemoney.cpp index 4cfd20389..2965b755a 100755 --- a/zone/gm_commands/givemoney.cpp +++ b/zone/gm_commands/givemoney.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_givemoney(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/gmzone.cpp b/zone/gm_commands/gmzone.cpp index 9aefd58bc..25351f7cb 100755 --- a/zone/gm_commands/gmzone.cpp +++ b/zone/gm_commands/gmzone.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/data_bucket.h" +#include "common/data_bucket.h" +#include "zone/client.h" void command_gmzone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/goto.cpp b/zone/gm_commands/goto.cpp index 9ab3ad4d1..b9b177ab0 100755 --- a/zone/gm_commands/goto.cpp +++ b/zone/gm_commands/goto.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_goto(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/grantaa.cpp b/zone/gm_commands/grantaa.cpp index b3afe7cde..0d12fb717 100644 --- a/zone/gm_commands/grantaa.cpp +++ b/zone/gm_commands/grantaa.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_grantaa(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/grid.cpp b/zone/gm_commands/grid.cpp index b8a7e7d3d..62a0eba95 100755 --- a/zone/gm_commands/grid.cpp +++ b/zone/gm_commands/grid.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/repositories/grid_entries_repository.h" +#include "common/repositories/grid_entries_repository.h" +#include "zone/client.h" void command_grid(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/guild.cpp b/zone/gm_commands/guild.cpp index 97d280e80..330fe793b 100755 --- a/zone/gm_commands/guild.cpp +++ b/zone/gm_commands/guild.cpp @@ -1,13 +1,12 @@ -#include "../client.h" -#include "../worldserver.h" -#include "../queryserv.h" +#include "zone/client.h" +#include "zone/doors.h" +#include "zone/guild_mgr.h" +#include "zone/queryserv.h" +#include "zone/worldserver.h" extern WorldServer worldserver; extern QueryServ *QServ; -#include "../guild_mgr.h" -#include "../doors.h" - void SendGuildSubCommands(Client* c) { c->Message(Chat::White, "#guild create [Character ID|Character Name] [Guild Name]"); @@ -691,4 +690,4 @@ void command_guild(Client* c, const Seperator* sep) // } } } -} \ No newline at end of file +} diff --git a/zone/gm_commands/hp.cpp b/zone/gm_commands/hp.cpp index 178ef9890..983704c41 100755 --- a/zone/gm_commands/hp.cpp +++ b/zone/gm_commands/hp.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_hp(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/illusion_block.cpp b/zone/gm_commands/illusion_block.cpp index 8aa274b4a..822abf78c 100644 --- a/zone/gm_commands/illusion_block.cpp +++ b/zone/gm_commands/illusion_block.cpp @@ -1,5 +1,5 @@ -#include "../dialogue_window.h" -#include "../client.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void command_illusion_block(Client* c, const Seperator* sep) { diff --git a/zone/gm_commands/instance.cpp b/zone/gm_commands/instance.cpp index 060bbcb81..ef43c5cd6 100755 --- a/zone/gm_commands/instance.cpp +++ b/zone/gm_commands/instance.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_instance(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/interrogateinv.cpp b/zone/gm_commands/interrogateinv.cpp index cf6a4fb75..6cbfa74e9 100755 --- a/zone/gm_commands/interrogateinv.cpp +++ b/zone/gm_commands/interrogateinv.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_interrogateinv(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/interrupt.cpp b/zone/gm_commands/interrupt.cpp index 1a1200c1e..7365a3b0d 100755 --- a/zone/gm_commands/interrupt.cpp +++ b/zone/gm_commands/interrupt.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_interrupt(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/invsnapshot.cpp b/zone/gm_commands/invsnapshot.cpp index 425c04f58..4a2fbec9e 100755 --- a/zone/gm_commands/invsnapshot.cpp +++ b/zone/gm_commands/invsnapshot.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_invsnapshot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/ipban.cpp b/zone/gm_commands/ipban.cpp index 40c9ed500..cff87628c 100755 --- a/zone/gm_commands/ipban.cpp +++ b/zone/gm_commands/ipban.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_ipban(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/kick.cpp b/zone/gm_commands/kick.cpp index a0dd45b18..2825312d8 100755 --- a/zone/gm_commands/kick.cpp +++ b/zone/gm_commands/kick.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/kill.cpp b/zone/gm_commands/kill.cpp index 5a56838e1..56c272fc8 100755 --- a/zone/gm_commands/kill.cpp +++ b/zone/gm_commands/kill.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_kill(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/killallnpcs.cpp b/zone/gm_commands/killallnpcs.cpp index 146ee1e2d..94565845b 100755 --- a/zone/gm_commands/killallnpcs.cpp +++ b/zone/gm_commands/killallnpcs.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_killallnpcs(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/list.cpp b/zone/gm_commands/list.cpp index d39b424ba..74c1eb7b0 100755 --- a/zone/gm_commands/list.cpp +++ b/zone/gm_commands/list.cpp @@ -1,8 +1,8 @@ -#include "../client.h" -#include "../corpse.h" -#include "../object.h" -#include "../doors.h" -#include "../command.h" +#include "zone/client.h" +#include "zone/command.h" +#include "zone/corpse.h" +#include "zone/doors.h" +#include "zone/object.h" struct UniqueEntity { uint16 entity_id; diff --git a/zone/gm_commands/loc.cpp b/zone/gm_commands/loc.cpp index b7b627fcb..6579a8d95 100755 --- a/zone/gm_commands/loc.cpp +++ b/zone/gm_commands/loc.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../water_map.h" +#include "zone/client.h" +#include "zone/water_map.h" void command_loc(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/logs.cpp b/zone/gm_commands/logs.cpp index 366a56c79..33ace54e4 100755 --- a/zone/gm_commands/logs.cpp +++ b/zone/gm_commands/logs.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/lootsim.cpp b/zone/gm_commands/lootsim.cpp index 783206219..55a7dc9d9 100755 --- a/zone/gm_commands/lootsim.cpp +++ b/zone/gm_commands/lootsim.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_lootsim(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/makepet.cpp b/zone/gm_commands/makepet.cpp index 30dd086f6..d23e552c9 100755 --- a/zone/gm_commands/makepet.cpp +++ b/zone/gm_commands/makepet.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_makepet(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/memspell.cpp b/zone/gm_commands/memspell.cpp index c48e986a7..148a19273 100755 --- a/zone/gm_commands/memspell.cpp +++ b/zone/gm_commands/memspell.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_memspell(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/merchantshop.cpp b/zone/gm_commands/merchantshop.cpp index 686fe2c27..4e950ac98 100755 --- a/zone/gm_commands/merchantshop.cpp +++ b/zone/gm_commands/merchantshop.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_merchantshop(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/modifynpcstat.cpp b/zone/gm_commands/modifynpcstat.cpp index 124f8ceca..00ff3d9b3 100755 --- a/zone/gm_commands/modifynpcstat.cpp +++ b/zone/gm_commands/modifynpcstat.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" std::map GetModifyNPCStatMap() { diff --git a/zone/gm_commands/movechar.cpp b/zone/gm_commands/movechar.cpp index c20d6f229..7dc31424b 100755 --- a/zone/gm_commands/movechar.cpp +++ b/zone/gm_commands/movechar.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_movechar(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/movement.cpp b/zone/gm_commands/movement.cpp index b690f4209..992de368d 100755 --- a/zone/gm_commands/movement.cpp +++ b/zone/gm_commands/movement.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../mob_movement_manager.h" +#include "zone/client.h" +#include "zone/mob_movement_manager.h" void command_movement(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/myskills.cpp b/zone/gm_commands/myskills.cpp index d781f50ca..423783ff3 100755 --- a/zone/gm_commands/myskills.cpp +++ b/zone/gm_commands/myskills.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_myskills(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/mysql.cpp b/zone/gm_commands/mysql.cpp index 1b915f471..fc6dadedf 100755 --- a/zone/gm_commands/mysql.cpp +++ b/zone/gm_commands/mysql.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_mysql(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/mystats.cpp b/zone/gm_commands/mystats.cpp index fc16929d4..428c8ed52 100755 --- a/zone/gm_commands/mystats.cpp +++ b/zone/gm_commands/mystats.cpp @@ -1,5 +1,5 @@ -#include "../bot.h" -#include "../client.h" +#include "zone/bot.h" +#include "zone/client.h" void command_mystats(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npccast.cpp b/zone/gm_commands/npccast.cpp index 14cdb8395..2d3b5f521 100755 --- a/zone/gm_commands/npccast.cpp +++ b/zone/gm_commands/npccast.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npccast(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npcedit.cpp b/zone/gm_commands/npcedit.cpp index ff0080e67..a1b60ca7a 100755 --- a/zone/gm_commands/npcedit.cpp +++ b/zone/gm_commands/npcedit.cpp @@ -1,7 +1,7 @@ -#include "../client.h" -#include "../groups.h" -#include "../raids.h" -#include "../../common/repositories/npc_types_repository.h" +#include "common/repositories/npc_types_repository.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/raids.h" void SendNPCEditSubCommands(Client *c) { diff --git a/zone/gm_commands/npceditmass.cpp b/zone/gm_commands/npceditmass.cpp index a8542c9e4..4e32e24e3 100755 --- a/zone/gm_commands/npceditmass.cpp +++ b/zone/gm_commands/npceditmass.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npceditmass(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npcemote.cpp b/zone/gm_commands/npcemote.cpp index 52697c6d6..81552ce80 100755 --- a/zone/gm_commands/npcemote.cpp +++ b/zone/gm_commands/npcemote.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npcemote(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npcloot.cpp b/zone/gm_commands/npcloot.cpp index 55ae48faf..c33cac9bb 100755 --- a/zone/gm_commands/npcloot.cpp +++ b/zone/gm_commands/npcloot.cpp @@ -1,6 +1,6 @@ -#include "../client.h" -#include "../corpse.h" -#include "../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" +#include "zone/corpse.h" void command_npcloot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npcsay.cpp b/zone/gm_commands/npcsay.cpp index ff13bd3d7..6ffb6cf41 100755 --- a/zone/gm_commands/npcsay.cpp +++ b/zone/gm_commands/npcsay.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npcsay(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npcshout.cpp b/zone/gm_commands/npcshout.cpp index baadc3d07..d3865fa70 100755 --- a/zone/gm_commands/npcshout.cpp +++ b/zone/gm_commands/npcshout.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npcshout(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npcspawn.cpp b/zone/gm_commands/npcspawn.cpp index 4e97bdf38..f3c274db1 100755 --- a/zone/gm_commands/npcspawn.cpp +++ b/zone/gm_commands/npcspawn.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npcspawn(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/npctypespawn.cpp b/zone/gm_commands/npctypespawn.cpp index 9bbc77ba7..4c0647e52 100755 --- a/zone/gm_commands/npctypespawn.cpp +++ b/zone/gm_commands/npctypespawn.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_npctypespawn(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/nudge.cpp b/zone/gm_commands/nudge.cpp index d1219261e..2544f1574 100755 --- a/zone/gm_commands/nudge.cpp +++ b/zone/gm_commands/nudge.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_nudge(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/nukebuffs.cpp b/zone/gm_commands/nukebuffs.cpp index 27db600fb..b4d27b1a2 100755 --- a/zone/gm_commands/nukebuffs.cpp +++ b/zone/gm_commands/nukebuffs.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_nukebuffs(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/nukeitem.cpp b/zone/gm_commands/nukeitem.cpp index 0918ce1e0..b7198e5c9 100755 --- a/zone/gm_commands/nukeitem.cpp +++ b/zone/gm_commands/nukeitem.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_nukeitem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/object.cpp b/zone/gm_commands/object.cpp index 19a5d8db5..9dbca5656 100755 --- a/zone/gm_commands/object.cpp +++ b/zone/gm_commands/object.cpp @@ -1,6 +1,7 @@ -#include "../client.h" #include "object_manipulation.h" +#include "zone/client.h" + void command_object(Client *c, const Seperator *sep) { ObjectManipulation::CommandHandler(c, sep); diff --git a/zone/gm_commands/object_manipulation.cpp b/zone/gm_commands/object_manipulation.cpp index 9edce5f0e..a5ae7f555 100644 --- a/zone/gm_commands/object_manipulation.cpp +++ b/zone/gm_commands/object_manipulation.cpp @@ -1,9 +1,9 @@ +#include "common/misc_functions.h" +#include "common/repositories/object_repository.h" +#include "common/strings.h" #include "object_manipulation.h" -#include "../doors.h" -#include "../object.h" -#include "../../common/misc_functions.h" -#include "../../common/strings.h" -#include "../../common/repositories/object_repository.h" +#include "zone/doors.h" +#include "zone/object.h" #define MAX_CLIENT_MESSAGE_LENGTH 2000 diff --git a/zone/gm_commands/object_manipulation.h b/zone/gm_commands/object_manipulation.h index 57503b014..b8ffe2b2f 100644 --- a/zone/gm_commands/object_manipulation.h +++ b/zone/gm_commands/object_manipulation.h @@ -1,7 +1,6 @@ -#ifndef EQEMU_OBJECT_MANIPULATION_H -#define EQEMU_OBJECT_MANIPULATION_H +#pragma once -#include "../client.h" +#include "zone/client.h" class ObjectManipulation { @@ -10,6 +9,3 @@ public: static void CommandHeader(Client *c); static void SendSubcommands(Client *c); }; - - -#endif //EQEMU_OBJECT_MANIPULATION_H diff --git a/zone/gm_commands/parcels.cpp b/zone/gm_commands/parcels.cpp index 264b4b670..da7e843ab 100644 --- a/zone/gm_commands/parcels.cpp +++ b/zone/gm_commands/parcels.cpp @@ -1,8 +1,8 @@ -#include "../client.h" -#include "../queryserv.h" -#include "../worldserver.h" -#include "../../common/events/player_event_logs.h" -#include "../string_ids.h" +#include "common/events/player_event_logs.h" +#include "zone/client.h" +#include "zone/queryserv.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern QueryServ *QServ; extern WorldServer worldserver; @@ -319,4 +319,4 @@ void command_parcels(Client *c, const Seperator *sep) c->SendParcelDeliveryToWorld(ps); } } -} \ No newline at end of file +} diff --git a/zone/gm_commands/path.cpp b/zone/gm_commands/path.cpp index 79d33c3cd..a4393a55a 100755 --- a/zone/gm_commands/path.cpp +++ b/zone/gm_commands/path.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_path(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/peqzone.cpp b/zone/gm_commands/peqzone.cpp index 15b4109af..052379bf1 100755 --- a/zone/gm_commands/peqzone.cpp +++ b/zone/gm_commands/peqzone.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_peqzone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/petitems.cpp b/zone/gm_commands/petitems.cpp index 6dd6462e5..c9f7e9481 100644 --- a/zone/gm_commands/petitems.cpp +++ b/zone/gm_commands/petitems.cpp @@ -1,5 +1,5 @@ -#include "../bot.h" -#include "../client.h" +#include "zone/bot.h" +#include "zone/client.h" void command_petitems(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/petname.cpp b/zone/gm_commands/petname.cpp index 44e8c7363..04cc71e5a 100755 --- a/zone/gm_commands/petname.cpp +++ b/zone/gm_commands/petname.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_petname(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/picklock.cpp b/zone/gm_commands/picklock.cpp index 7d6efc607..4ee368828 100755 --- a/zone/gm_commands/picklock.cpp +++ b/zone/gm_commands/picklock.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_picklock(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/profanity.cpp b/zone/gm_commands/profanity.cpp index bea088690..daf3309bd 100755 --- a/zone/gm_commands/profanity.cpp +++ b/zone/gm_commands/profanity.cpp @@ -1,9 +1,9 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; -#include "../../common/profanity_manager.h" +#include "common/profanity_manager.h" void command_profanity(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/push.cpp b/zone/gm_commands/push.cpp index 05042fb74..9bc4da240 100755 --- a/zone/gm_commands/push.cpp +++ b/zone/gm_commands/push.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../fastmath.h" +#include "zone/client.h" +#include "zone/fastmath.h" extern FastMath g_Math; diff --git a/zone/gm_commands/raidloot.cpp b/zone/gm_commands/raidloot.cpp index 5bd3f3c8c..745282c86 100755 --- a/zone/gm_commands/raidloot.cpp +++ b/zone/gm_commands/raidloot.cpp @@ -1,7 +1,6 @@ -#include "../client.h" -#include "../groups.h" -#include "../raids.h" -#include "../raids.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/raids.h" void command_raidloot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/randomfeatures.cpp b/zone/gm_commands/randomfeatures.cpp index 4a771ba13..a28b13065 100755 --- a/zone/gm_commands/randomfeatures.cpp +++ b/zone/gm_commands/randomfeatures.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_randomfeatures(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/refreshgroup.cpp b/zone/gm_commands/refreshgroup.cpp index e78a2d2cd..4b1500b4b 100755 --- a/zone/gm_commands/refreshgroup.cpp +++ b/zone/gm_commands/refreshgroup.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../groups.h" +#include "zone/client.h" +#include "zone/groups.h" void command_refreshgroup(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/reload.cpp b/zone/gm_commands/reload.cpp index d0081e34a..6991a37be 100644 --- a/zone/gm_commands/reload.cpp +++ b/zone/gm_commands/reload.cpp @@ -1,8 +1,9 @@ +#include "common/server_reload_types.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/worldserver.h" + #include -#include "../client.h" -#include "../../common/strings.h" -#include "../../common/server_reload_types.h" -#include "../worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/removeitem.cpp b/zone/gm_commands/removeitem.cpp index 0ed69eb45..05cfb26af 100644 --- a/zone/gm_commands/removeitem.cpp +++ b/zone/gm_commands/removeitem.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_removeitem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/repop.cpp b/zone/gm_commands/repop.cpp index 8527d9260..cd600b3d9 100755 --- a/zone/gm_commands/repop.cpp +++ b/zone/gm_commands/repop.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_repop(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/resetaa.cpp b/zone/gm_commands/resetaa.cpp index 3e50b627b..40236ef4e 100755 --- a/zone/gm_commands/resetaa.cpp +++ b/zone/gm_commands/resetaa.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_resetaa(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/resetaa_timer.cpp b/zone/gm_commands/resetaa_timer.cpp index 766c76b06..4107e2a9d 100755 --- a/zone/gm_commands/resetaa_timer.cpp +++ b/zone/gm_commands/resetaa_timer.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_resetaa_timer(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/resetdisc_timer.cpp b/zone/gm_commands/resetdisc_timer.cpp index 4223aab62..86c98ebba 100755 --- a/zone/gm_commands/resetdisc_timer.cpp +++ b/zone/gm_commands/resetdisc_timer.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_resetdisc_timer(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/revoke.cpp b/zone/gm_commands/revoke.cpp index abad1655b..24d6e8933 100755 --- a/zone/gm_commands/revoke.cpp +++ b/zone/gm_commands/revoke.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/roambox.cpp b/zone/gm_commands/roambox.cpp index 410928f9d..fd762373b 100755 --- a/zone/gm_commands/roambox.cpp +++ b/zone/gm_commands/roambox.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../groups.h" +#include "zone/client.h" +#include "zone/groups.h" void command_roambox(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/rules.cpp b/zone/gm_commands/rules.cpp index 22d923709..526f24861 100755 --- a/zone/gm_commands/rules.cpp +++ b/zone/gm_commands/rules.cpp @@ -1,8 +1,7 @@ -#include "../client.h" -#include "../command.h" - -#include "../../common/repositories/rule_sets_repository.h" -#include "../../common/repositories/rule_values_repository.h" +#include "common/repositories/rule_sets_repository.h" +#include "common/repositories/rule_values_repository.h" +#include "zone/client.h" +#include "zone/command.h" void command_rules(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/save.cpp b/zone/gm_commands/save.cpp index 54d248dfc..8d7df60c0 100755 --- a/zone/gm_commands/save.cpp +++ b/zone/gm_commands/save.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../corpse.h" +#include "zone/client.h" +#include "zone/corpse.h" void command_save(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/scale.cpp b/zone/gm_commands/scale.cpp index 792d12066..8169ccd37 100755 --- a/zone/gm_commands/scale.cpp +++ b/zone/gm_commands/scale.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../npc_scale_manager.h" +#include "zone/client.h" +#include "zone/npc_scale_manager.h" void command_scale(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/scribespell.cpp b/zone/gm_commands/scribespell.cpp index b3c5b3902..7b5d40605 100755 --- a/zone/gm_commands/scribespell.cpp +++ b/zone/gm_commands/scribespell.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_scribespell(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/scribespells.cpp b/zone/gm_commands/scribespells.cpp index 93ce21538..f9a016594 100755 --- a/zone/gm_commands/scribespells.cpp +++ b/zone/gm_commands/scribespells.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_scribespells(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/sendzonespawns.cpp b/zone/gm_commands/sendzonespawns.cpp index caca8f6d0..3834ad7fb 100755 --- a/zone/gm_commands/sendzonespawns.cpp +++ b/zone/gm_commands/sendzonespawns.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_sendzonespawns(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/sensetrap.cpp b/zone/gm_commands/sensetrap.cpp index 0bfaa441f..89b6e6829 100755 --- a/zone/gm_commands/sensetrap.cpp +++ b/zone/gm_commands/sensetrap.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_sensetrap(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/serverrules.cpp b/zone/gm_commands/serverrules.cpp index e555e4b71..aaf9768de 100755 --- a/zone/gm_commands/serverrules.cpp +++ b/zone/gm_commands/serverrules.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_serverrules(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set.cpp b/zone/gm_commands/set.cpp index 1460ea029..439881fee 100644 --- a/zone/gm_commands/set.cpp +++ b/zone/gm_commands/set.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void SetAAEXP(Client *c, const Seperator *sep); void SetAAPoints(Client *c, const Seperator *sep); diff --git a/zone/gm_commands/set/set_aa_exp.cpp b/zone/gm_commands/set/set_aa_exp.cpp index d4fd23e4a..2f3d17704 100644 --- a/zone/gm_commands/set/set_aa_exp.cpp +++ b/zone/gm_commands/set/set_aa_exp.cpp @@ -1,7 +1,6 @@ -#include "../../client.h" -#include "../../groups.h" -#include "../../raids.h" -#include "../../raids.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/raids.h" void SetAAEXP(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_aa_points.cpp b/zone/gm_commands/set/set_aa_points.cpp index ab1bb8bfd..823944109 100644 --- a/zone/gm_commands/set/set_aa_points.cpp +++ b/zone/gm_commands/set/set_aa_points.cpp @@ -1,7 +1,6 @@ -#include "../../client.h" -#include "../../groups.h" -#include "../../raids.h" -#include "../../raids.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/raids.h" void SetAAPoints(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_adventure_points.cpp b/zone/gm_commands/set/set_adventure_points.cpp index 55465039a..c904ea6ac 100644 --- a/zone/gm_commands/set/set_adventure_points.cpp +++ b/zone/gm_commands/set/set_adventure_points.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void SetAdventurePoints(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_alternate_currency.cpp b/zone/gm_commands/set/set_alternate_currency.cpp index 3718076fe..47d7e81d4 100644 --- a/zone/gm_commands/set/set_alternate_currency.cpp +++ b/zone/gm_commands/set/set_alternate_currency.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetAlternateCurrency(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_animation.cpp b/zone/gm_commands/set/set_animation.cpp index 416235067..8cc7b8303 100644 --- a/zone/gm_commands/set/set_animation.cpp +++ b/zone/gm_commands/set/set_animation.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetAnimation(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_anon.cpp b/zone/gm_commands/set/set_anon.cpp index e0b84f7fb..7a90c0019 100644 --- a/zone/gm_commands/set/set_anon.cpp +++ b/zone/gm_commands/set/set_anon.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/character_data_repository.h" +#include "common/repositories/character_data_repository.h" +#include "zone/client.h" void SetAnon(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_auto_login.cpp b/zone/gm_commands/set/set_auto_login.cpp index 829c739e3..92f4b2283 100644 --- a/zone/gm_commands/set/set_auto_login.cpp +++ b/zone/gm_commands/set/set_auto_login.cpp @@ -1,8 +1,7 @@ -#include "../../client.h" -#include "../../groups.h" -#include "../../raids.h" -#include "../../raids.h" -#include "../../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/raids.h" void SetAutoLogin(Client* c, const Seperator* sep) { diff --git a/zone/gm_commands/set/set_bind_point.cpp b/zone/gm_commands/set/set_bind_point.cpp index 8d5bbb626..9741c15e7 100644 --- a/zone/gm_commands/set/set_bind_point.cpp +++ b/zone/gm_commands/set/set_bind_point.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetBindPoint(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_checksum.cpp b/zone/gm_commands/set/set_checksum.cpp index 02032fe01..f19c16294 100644 --- a/zone/gm_commands/set/set_checksum.cpp +++ b/zone/gm_commands/set/set_checksum.cpp @@ -1,6 +1,6 @@ -#include "../../client.h" -#include "../../worldserver.h" -#include "../../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/set/set_class_permanent.cpp b/zone/gm_commands/set/set_class_permanent.cpp index abce4979f..26f8fcd06 100644 --- a/zone/gm_commands/set/set_class_permanent.cpp +++ b/zone/gm_commands/set/set_class_permanent.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetClassPermanent(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_crystals.cpp b/zone/gm_commands/set/set_crystals.cpp index 84bfc3525..ee6eebd92 100644 --- a/zone/gm_commands/set/set_crystals.cpp +++ b/zone/gm_commands/set/set_crystals.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetCrystals(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_date.cpp b/zone/gm_commands/set/set_date.cpp index 5531db20d..cc10cfeac 100644 --- a/zone/gm_commands/set/set_date.cpp +++ b/zone/gm_commands/set/set_date.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetDate(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_endurance.cpp b/zone/gm_commands/set/set_endurance.cpp index f4a8c375b..92e987722 100644 --- a/zone/gm_commands/set/set_endurance.cpp +++ b/zone/gm_commands/set/set_endurance.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetEndurance(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_endurance_full.cpp b/zone/gm_commands/set/set_endurance_full.cpp index 8b493e41e..c0571c59a 100644 --- a/zone/gm_commands/set/set_endurance_full.cpp +++ b/zone/gm_commands/set/set_endurance_full.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetEnduranceFull(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_exp.cpp b/zone/gm_commands/set/set_exp.cpp index 20832aba5..c661bd06f 100644 --- a/zone/gm_commands/set/set_exp.cpp +++ b/zone/gm_commands/set/set_exp.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetEXP(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_flymode.cpp b/zone/gm_commands/set/set_flymode.cpp index 34edf88e9..63cf5f8f6 100644 --- a/zone/gm_commands/set/set_flymode.cpp +++ b/zone/gm_commands/set/set_flymode.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void SetFlymode(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_frozen.cpp b/zone/gm_commands/set/set_frozen.cpp index 223f59214..737c257ce 100644 --- a/zone/gm_commands/set/set_frozen.cpp +++ b/zone/gm_commands/set/set_frozen.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetFrozen(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_gender.cpp b/zone/gm_commands/set/set_gender.cpp index bc91f1074..549aefa15 100644 --- a/zone/gm_commands/set/set_gender.cpp +++ b/zone/gm_commands/set/set_gender.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetGender(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_gender_permanent.cpp b/zone/gm_commands/set/set_gender_permanent.cpp index 9a2855cb3..9fa70fc7f 100644 --- a/zone/gm_commands/set/set_gender_permanent.cpp +++ b/zone/gm_commands/set/set_gender_permanent.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetGenderPermanent(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_gm.cpp b/zone/gm_commands/set/set_gm.cpp index 19aca7826..984098823 100644 --- a/zone/gm_commands/set/set_gm.cpp +++ b/zone/gm_commands/set/set_gm.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetGM(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_gm_speed.cpp b/zone/gm_commands/set/set_gm_speed.cpp index ffcef33b3..f6c4c2d5a 100644 --- a/zone/gm_commands/set/set_gm_speed.cpp +++ b/zone/gm_commands/set/set_gm_speed.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetGMSpeed(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_gm_status.cpp b/zone/gm_commands/set/set_gm_status.cpp index aae8dcff3..42684c955 100644 --- a/zone/gm_commands/set/set_gm_status.cpp +++ b/zone/gm_commands/set/set_gm_status.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/set/set_god_mode.cpp b/zone/gm_commands/set/set_god_mode.cpp index 41f517cfa..377a0fec1 100644 --- a/zone/gm_commands/set/set_god_mode.cpp +++ b/zone/gm_commands/set/set_god_mode.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" void SetGodMode(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_haste.cpp b/zone/gm_commands/set/set_haste.cpp index 96647c970..a295b6434 100644 --- a/zone/gm_commands/set/set_haste.cpp +++ b/zone/gm_commands/set/set_haste.cpp @@ -1,5 +1,5 @@ -#include "../../bot.h" -#include "../../client.h" +#include "zone/bot.h" +#include "zone/client.h" void SetHaste(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_hero_model.cpp b/zone/gm_commands/set/set_hero_model.cpp index f98b5d5e2..485ec31f1 100644 --- a/zone/gm_commands/set/set_hero_model.cpp +++ b/zone/gm_commands/set/set_hero_model.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetHeroModel(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_hide_me.cpp b/zone/gm_commands/set/set_hide_me.cpp index 8b2e580f1..a0063e488 100644 --- a/zone/gm_commands/set/set_hide_me.cpp +++ b/zone/gm_commands/set/set_hide_me.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetHideMe(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_hp.cpp b/zone/gm_commands/set/set_hp.cpp index 3078cc98c..cd71c0e34 100644 --- a/zone/gm_commands/set/set_hp.cpp +++ b/zone/gm_commands/set/set_hp.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetHP(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_hp_full.cpp b/zone/gm_commands/set/set_hp_full.cpp index 738bb5db8..22a7936d8 100644 --- a/zone/gm_commands/set/set_hp_full.cpp +++ b/zone/gm_commands/set/set_hp_full.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetHPFull(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_invulnerable.cpp b/zone/gm_commands/set/set_invulnerable.cpp index f8efcb2d7..59f66d10b 100644 --- a/zone/gm_commands/set/set_invulnerable.cpp +++ b/zone/gm_commands/set/set_invulnerable.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetInvulnerable(Client *c, const Seperator *sep) { const auto arguments = sep->argnum; diff --git a/zone/gm_commands/set/set_language.cpp b/zone/gm_commands/set/set_language.cpp index e82af80a5..2593c21ae 100644 --- a/zone/gm_commands/set/set_language.cpp +++ b/zone/gm_commands/set/set_language.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void SetLanguage(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_last_name.cpp b/zone/gm_commands/set/set_last_name.cpp index 8fd23789e..981b3e11f 100644 --- a/zone/gm_commands/set/set_last_name.cpp +++ b/zone/gm_commands/set/set_last_name.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetLastName(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_level.cpp b/zone/gm_commands/set/set_level.cpp index 6e88705c4..dd0153f69 100644 --- a/zone/gm_commands/set/set_level.cpp +++ b/zone/gm_commands/set/set_level.cpp @@ -1,5 +1,5 @@ -#include "../../bot.h" -#include "../../client.h" +#include "zone/bot.h" +#include "zone/client.h" void SetLevel(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_loginserver_info.cpp b/zone/gm_commands/set/set_loginserver_info.cpp index 5155bb284..020ac3fad 100644 --- a/zone/gm_commands/set/set_loginserver_info.cpp +++ b/zone/gm_commands/set/set_loginserver_info.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/set/set_mana.cpp b/zone/gm_commands/set/set_mana.cpp index 68779dc47..1813ec875 100644 --- a/zone/gm_commands/set/set_mana.cpp +++ b/zone/gm_commands/set/set_mana.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetMana(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_mana_full.cpp b/zone/gm_commands/set/set_mana_full.cpp index 5b9ad77bb..9bfd3718d 100644 --- a/zone/gm_commands/set/set_mana_full.cpp +++ b/zone/gm_commands/set/set_mana_full.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetManaFull(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_motd.cpp b/zone/gm_commands/set/set_motd.cpp index 8d188ab48..11f572ea5 100644 --- a/zone/gm_commands/set/set_motd.cpp +++ b/zone/gm_commands/set/set_motd.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/set/set_name.cpp b/zone/gm_commands/set/set_name.cpp index c700060b9..bbf1e8ca1 100644 --- a/zone/gm_commands/set/set_name.cpp +++ b/zone/gm_commands/set/set_name.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetName(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_ooc_mute.cpp b/zone/gm_commands/set/set_ooc_mute.cpp index 4f2db4e87..ecd9c07ce 100644 --- a/zone/gm_commands/set/set_ooc_mute.cpp +++ b/zone/gm_commands/set/set_ooc_mute.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/set/set_password.cpp b/zone/gm_commands/set/set_password.cpp index d057daa4b..2974424f0 100644 --- a/zone/gm_commands/set/set_password.cpp +++ b/zone/gm_commands/set/set_password.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetPassword(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_pvp.cpp b/zone/gm_commands/set/set_pvp.cpp index f851ddea1..6a9d7092d 100644 --- a/zone/gm_commands/set/set_pvp.cpp +++ b/zone/gm_commands/set/set_pvp.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetPVP(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_pvp_points.cpp b/zone/gm_commands/set/set_pvp_points.cpp index 1562eaf12..f8661e84b 100644 --- a/zone/gm_commands/set/set_pvp_points.cpp +++ b/zone/gm_commands/set/set_pvp_points.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetPVPPoints(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_race.cpp b/zone/gm_commands/set/set_race.cpp index 4a5f86c31..9d18a8ff9 100644 --- a/zone/gm_commands/set/set_race.cpp +++ b/zone/gm_commands/set/set_race.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetRace(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_race_permanent.cpp b/zone/gm_commands/set/set_race_permanent.cpp index 9c0a2d6da..917539e2c 100644 --- a/zone/gm_commands/set/set_race_permanent.cpp +++ b/zone/gm_commands/set/set_race_permanent.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetRacePermanent(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_server_locked.cpp b/zone/gm_commands/set/set_server_locked.cpp index 73e92dad3..b81805b70 100644 --- a/zone/gm_commands/set/set_server_locked.cpp +++ b/zone/gm_commands/set/set_server_locked.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/set/set_skill.cpp b/zone/gm_commands/set/set_skill.cpp index b6071a9f6..b470272f6 100644 --- a/zone/gm_commands/set/set_skill.cpp +++ b/zone/gm_commands/set/set_skill.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetSkill(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_skill_all.cpp b/zone/gm_commands/set/set_skill_all.cpp index 1094b4bea..7a7f12864 100644 --- a/zone/gm_commands/set/set_skill_all.cpp +++ b/zone/gm_commands/set/set_skill_all.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetSkillAll(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_skill_all_max.cpp b/zone/gm_commands/set/set_skill_all_max.cpp index 0565721f8..19e7168fb 100644 --- a/zone/gm_commands/set/set_skill_all_max.cpp +++ b/zone/gm_commands/set/set_skill_all_max.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetSkillAllMax(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_start_zone.cpp b/zone/gm_commands/set/set_start_zone.cpp index 71748ccb9..843da575c 100644 --- a/zone/gm_commands/set/set_start_zone.cpp +++ b/zone/gm_commands/set/set_start_zone.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetStartZone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_temporary_name.cpp b/zone/gm_commands/set/set_temporary_name.cpp index f04577c5b..11fcdec83 100644 --- a/zone/gm_commands/set/set_temporary_name.cpp +++ b/zone/gm_commands/set/set_temporary_name.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetTemporaryName(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_texture.cpp b/zone/gm_commands/set/set_texture.cpp index 60e1cc76c..279e52209 100644 --- a/zone/gm_commands/set/set_texture.cpp +++ b/zone/gm_commands/set/set_texture.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetTexture(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_time.cpp b/zone/gm_commands/set/set_time.cpp index a0c0fea7a..e3ee56132 100644 --- a/zone/gm_commands/set/set_time.cpp +++ b/zone/gm_commands/set/set_time.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetTime(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_time_zone.cpp b/zone/gm_commands/set/set_time_zone.cpp index 91c48bb48..4a68bd7f4 100644 --- a/zone/gm_commands/set/set_time_zone.cpp +++ b/zone/gm_commands/set/set_time_zone.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetTimeZone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_title.cpp b/zone/gm_commands/set/set_title.cpp index a6fc8a6e2..45b3c3524 100644 --- a/zone/gm_commands/set/set_title.cpp +++ b/zone/gm_commands/set/set_title.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../titles.h" +#include "zone/client.h" +#include "zone/titles.h" void SetTitle(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_title_suffix.cpp b/zone/gm_commands/set/set_title_suffix.cpp index f6c6e6677..cf14a4f7d 100644 --- a/zone/gm_commands/set/set_title_suffix.cpp +++ b/zone/gm_commands/set/set_title_suffix.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../titles.h" +#include "zone/client.h" +#include "zone/titles.h" void SetTitleSuffix(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_weather.cpp b/zone/gm_commands/set/set_weather.cpp index 028ba2387..73969a65e 100644 --- a/zone/gm_commands/set/set_weather.cpp +++ b/zone/gm_commands/set/set_weather.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void SetWeather(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/set/set_zone.cpp b/zone/gm_commands/set/set_zone.cpp index d2bfecaed..ecb9e3cc6 100644 --- a/zone/gm_commands/set/set_zone.cpp +++ b/zone/gm_commands/set/set_zone.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/show.cpp b/zone/gm_commands/show.cpp index 651cde537..027ee164c 100755 --- a/zone/gm_commands/show.cpp +++ b/zone/gm_commands/show.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void ShowAAs(Client* c, const Seperator* sep); void ShowAAPoints(Client* c, const Seperator* sep); diff --git a/zone/gm_commands/show/show_aa_points.cpp b/zone/gm_commands/show/show_aa_points.cpp index b8f556301..d199a740c 100644 --- a/zone/gm_commands/show/show_aa_points.cpp +++ b/zone/gm_commands/show/show_aa_points.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowAAPoints(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_aas.cpp b/zone/gm_commands/show/show_aas.cpp index f631ac474..cb14fdd5a 100644 --- a/zone/gm_commands/show/show_aas.cpp +++ b/zone/gm_commands/show/show_aas.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowAAs(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_aggro.cpp b/zone/gm_commands/show/show_aggro.cpp index c579dc4c3..681200b3d 100644 --- a/zone/gm_commands/show/show_aggro.cpp +++ b/zone/gm_commands/show/show_aggro.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowAggro(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_auto_login.cpp b/zone/gm_commands/show/show_auto_login.cpp index 2a82e5b0b..2cbe81411 100644 --- a/zone/gm_commands/show/show_auto_login.cpp +++ b/zone/gm_commands/show/show_auto_login.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" void ShowAutoLogin(Client* c, const Seperator* sep) { diff --git a/zone/gm_commands/show/show_buffs.cpp b/zone/gm_commands/show/show_buffs.cpp index eec2451d6..2b4f59993 100644 --- a/zone/gm_commands/show/show_buffs.cpp +++ b/zone/gm_commands/show/show_buffs.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowBuffs(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_buried_corpse_count.cpp b/zone/gm_commands/show/show_buried_corpse_count.cpp index 55cec83dd..99f6140c3 100644 --- a/zone/gm_commands/show/show_buried_corpse_count.cpp +++ b/zone/gm_commands/show/show_buried_corpse_count.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../corpse.h" +#include "zone/client.h" +#include "zone/corpse.h" void ShowBuriedCorpseCount(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_client_version_summary.cpp b/zone/gm_commands/show/show_client_version_summary.cpp index 98b5d4f52..b3c022c4a 100644 --- a/zone/gm_commands/show/show_client_version_summary.cpp +++ b/zone/gm_commands/show/show_client_version_summary.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/show/show_content_flags.cpp b/zone/gm_commands/show/show_content_flags.cpp index bba89ce18..8861c8fcc 100644 --- a/zone/gm_commands/show/show_content_flags.cpp +++ b/zone/gm_commands/show/show_content_flags.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowContentFlags(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_currencies.cpp b/zone/gm_commands/show/show_currencies.cpp index 4f4d3cfda..6d501a5a3 100644 --- a/zone/gm_commands/show/show_currencies.cpp +++ b/zone/gm_commands/show/show_currencies.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowCurrencies(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_distance.cpp b/zone/gm_commands/show/show_distance.cpp index aece8494e..5ae62477d 100644 --- a/zone/gm_commands/show/show_distance.cpp +++ b/zone/gm_commands/show/show_distance.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowDistance(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_emotes.cpp b/zone/gm_commands/show/show_emotes.cpp index 38d9c16ce..9f76da70e 100644 --- a/zone/gm_commands/show/show_emotes.cpp +++ b/zone/gm_commands/show/show_emotes.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowEmotes(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_field_of_view.cpp b/zone/gm_commands/show/show_field_of_view.cpp index dfa617a35..a93e56469 100644 --- a/zone/gm_commands/show/show_field_of_view.cpp +++ b/zone/gm_commands/show/show_field_of_view.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowFieldOfView(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_flags.cpp b/zone/gm_commands/show/show_flags.cpp index 50b5e183c..14a4592f1 100644 --- a/zone/gm_commands/show/show_flags.cpp +++ b/zone/gm_commands/show/show_flags.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowFlags(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_group_info.cpp b/zone/gm_commands/show/show_group_info.cpp index 8524240aa..4b56c420a 100644 --- a/zone/gm_commands/show/show_group_info.cpp +++ b/zone/gm_commands/show/show_group_info.cpp @@ -1,6 +1,6 @@ -#include "../../client.h" -#include "../../dialogue_window.h" -#include "../../groups.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" +#include "zone/groups.h" void ShowGroupInfo(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_hatelist.cpp b/zone/gm_commands/show/show_hatelist.cpp index 225ad16f4..bb50f9eb5 100644 --- a/zone/gm_commands/show/show_hatelist.cpp +++ b/zone/gm_commands/show/show_hatelist.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowHateList(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_inventory.cpp b/zone/gm_commands/show/show_inventory.cpp index 2a3e2a377..4abfd6a68 100644 --- a/zone/gm_commands/show/show_inventory.cpp +++ b/zone/gm_commands/show/show_inventory.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../object.h" +#include "zone/client.h" +#include "zone/object.h" void SendShowInventorySubCommands(Client* c) { c->Message(Chat::White, "Usage: #show inventory equip - Shows items in Equipment slots"); @@ -448,4 +448,4 @@ void ShowInventory(Client *c, const Seperator *sep) if (!found_items) { c->Message(Chat::White, "No items found."); } -} \ No newline at end of file +} diff --git a/zone/gm_commands/show/show_ip_lookup.cpp b/zone/gm_commands/show/show_ip_lookup.cpp index aefcaeaf3..74bd449cb 100644 --- a/zone/gm_commands/show/show_ip_lookup.cpp +++ b/zone/gm_commands/show/show_ip_lookup.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/show/show_keyring.cpp b/zone/gm_commands/show/show_keyring.cpp index 39552f8cc..c97057047 100644 --- a/zone/gm_commands/show/show_keyring.cpp +++ b/zone/gm_commands/show/show_keyring.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowKeyring(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_line_of_sight.cpp b/zone/gm_commands/show/show_line_of_sight.cpp index bf56c8866..07db29e73 100644 --- a/zone/gm_commands/show/show_line_of_sight.cpp +++ b/zone/gm_commands/show/show_line_of_sight.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowLineOfSight(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_network.cpp b/zone/gm_commands/show/show_network.cpp index 46d32a69c..292eab6ce 100644 --- a/zone/gm_commands/show/show_network.cpp +++ b/zone/gm_commands/show/show_network.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowNetwork(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_network_stats.cpp b/zone/gm_commands/show/show_network_stats.cpp index 75bf2b25f..964185ef4 100644 --- a/zone/gm_commands/show/show_network_stats.cpp +++ b/zone/gm_commands/show/show_network_stats.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowNetworkStats(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_npc_global_loot.cpp b/zone/gm_commands/show/show_npc_global_loot.cpp index 6167550c2..f0013c6f9 100644 --- a/zone/gm_commands/show/show_npc_global_loot.cpp +++ b/zone/gm_commands/show/show_npc_global_loot.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowNPCGlobalLoot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_npc_stats.cpp b/zone/gm_commands/show/show_npc_stats.cpp index 65254e3bb..e4dac7a21 100644 --- a/zone/gm_commands/show/show_npc_stats.cpp +++ b/zone/gm_commands/show/show_npc_stats.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowNPCStats(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_npc_type.cpp b/zone/gm_commands/show/show_npc_type.cpp index f70b19e88..4f4af2429 100644 --- a/zone/gm_commands/show/show_npc_type.cpp +++ b/zone/gm_commands/show/show_npc_type.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowNPCType(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_peqzone_flags.cpp b/zone/gm_commands/show/show_peqzone_flags.cpp index e8112436e..dbc60b5e5 100644 --- a/zone/gm_commands/show/show_peqzone_flags.cpp +++ b/zone/gm_commands/show/show_peqzone_flags.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowPEQZoneFlags(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_petition.cpp b/zone/gm_commands/show/show_petition.cpp index 1c15036a9..bfccf6a3f 100644 --- a/zone/gm_commands/show/show_petition.cpp +++ b/zone/gm_commands/show/show_petition.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/petitions_repository.h" +#include "common/repositories/petitions_repository.h" +#include "zone/client.h" void ShowPetition(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_petition_info.cpp b/zone/gm_commands/show/show_petition_info.cpp index d4a45599b..426ef5aca 100644 --- a/zone/gm_commands/show/show_petition_info.cpp +++ b/zone/gm_commands/show/show_petition_info.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/repositories/petitions_repository.h" +#include "zone/client.h" +#include "common/repositories/petitions_repository.h" void ShowPetitionInfo(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_proximity.cpp b/zone/gm_commands/show/show_proximity.cpp index 3b8076d29..22fbf8e02 100644 --- a/zone/gm_commands/show/show_proximity.cpp +++ b/zone/gm_commands/show/show_proximity.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowProximity(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_quest_errors.cpp b/zone/gm_commands/show/show_quest_errors.cpp index 7a1bf4d9b..59faf6605 100644 --- a/zone/gm_commands/show/show_quest_errors.cpp +++ b/zone/gm_commands/show/show_quest_errors.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../quest_parser_collection.h" +#include "zone/client.h" +#include "zone/quest_parser_collection.h" void ShowQuestErrors(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_quest_globals.cpp b/zone/gm_commands/show/show_quest_globals.cpp index 63396352b..263763ae8 100644 --- a/zone/gm_commands/show/show_quest_globals.cpp +++ b/zone/gm_commands/show/show_quest_globals.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowQuestGlobals(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_recipe.cpp b/zone/gm_commands/show/show_recipe.cpp index c66e25218..e9357b1dc 100644 --- a/zone/gm_commands/show/show_recipe.cpp +++ b/zone/gm_commands/show/show_recipe.cpp @@ -1,7 +1,7 @@ -#include "../../client.h" -#include "../../command.h" -#include "../../../common/repositories/tradeskill_recipe_repository.h" -#include "../../../common/repositories/tradeskill_recipe_entries_repository.h" +#include "common/repositories/tradeskill_recipe_entries_repository.h" +#include "common/repositories/tradeskill_recipe_repository.h" +#include "zone/client.h" +#include "zone/command.h" void ShowRecipe(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_server_info.cpp b/zone/gm_commands/show/show_server_info.cpp index 6a8d8b717..1b23b9d24 100644 --- a/zone/gm_commands/show/show_server_info.cpp +++ b/zone/gm_commands/show/show_server_info.cpp @@ -1,6 +1,6 @@ -#include "../../client.h" -#include "../../dialogue_window.h" -#include "../../../common/serverinfo.h" +#include "common/serverinfo.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowServerInfo(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_skills.cpp b/zone/gm_commands/show/show_skills.cpp index 20705ac16..99d335631 100644 --- a/zone/gm_commands/show/show_skills.cpp +++ b/zone/gm_commands/show/show_skills.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowSkills(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_spawn_status.cpp b/zone/gm_commands/show/show_spawn_status.cpp index 1fd59a20f..46c9c2b33 100644 --- a/zone/gm_commands/show/show_spawn_status.cpp +++ b/zone/gm_commands/show/show_spawn_status.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowSpawnStatus(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_special_abilities.cpp b/zone/gm_commands/show/show_special_abilities.cpp index 3e8f198ba..f5713eb1b 100644 --- a/zone/gm_commands/show/show_special_abilities.cpp +++ b/zone/gm_commands/show/show_special_abilities.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowSpecialAbilities(Client* c, const Seperator* sep) { diff --git a/zone/gm_commands/show/show_spells.cpp b/zone/gm_commands/show/show_spells.cpp index 7d522be95..48cf0f0fe 100644 --- a/zone/gm_commands/show/show_spells.cpp +++ b/zone/gm_commands/show/show_spells.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowSpells(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_spells_list.cpp b/zone/gm_commands/show/show_spells_list.cpp index fb94306c1..8fa107f0f 100644 --- a/zone/gm_commands/show/show_spells_list.cpp +++ b/zone/gm_commands/show/show_spells_list.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowSpellsList(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_stats.cpp b/zone/gm_commands/show/show_stats.cpp index be1f4d40d..f75ac9ed2 100644 --- a/zone/gm_commands/show/show_stats.cpp +++ b/zone/gm_commands/show/show_stats.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowStats(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_timers.cpp b/zone/gm_commands/show/show_timers.cpp index 78768fb5c..4b8ad870b 100644 --- a/zone/gm_commands/show/show_timers.cpp +++ b/zone/gm_commands/show/show_timers.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowTimers(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_traps.cpp b/zone/gm_commands/show/show_traps.cpp index 28a6215d7..e3e674005 100644 --- a/zone/gm_commands/show/show_traps.cpp +++ b/zone/gm_commands/show/show_traps.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowTraps(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_uptime.cpp b/zone/gm_commands/show/show_uptime.cpp index c95bcff2a..20eca7094 100644 --- a/zone/gm_commands/show/show_uptime.cpp +++ b/zone/gm_commands/show/show_uptime.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/show/show_variable.cpp b/zone/gm_commands/show/show_variable.cpp index 98418c14b..0a83f68a6 100644 --- a/zone/gm_commands/show/show_variable.cpp +++ b/zone/gm_commands/show/show_variable.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowVariable(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_version.cpp b/zone/gm_commands/show/show_version.cpp index e9b55d549..415c240f9 100644 --- a/zone/gm_commands/show/show_version.cpp +++ b/zone/gm_commands/show/show_version.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowVersion(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_waypoints.cpp b/zone/gm_commands/show/show_waypoints.cpp index 262489fca..afc4c8055 100644 --- a/zone/gm_commands/show/show_waypoints.cpp +++ b/zone/gm_commands/show/show_waypoints.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowWaypoints(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_who.cpp b/zone/gm_commands/show/show_who.cpp index 6ffccdddf..d3d3ed152 100644 --- a/zone/gm_commands/show/show_who.cpp +++ b/zone/gm_commands/show/show_who.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowWho(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_xtargets.cpp b/zone/gm_commands/show/show_xtargets.cpp index f9d07387e..d1b626f09 100644 --- a/zone/gm_commands/show/show_xtargets.cpp +++ b/zone/gm_commands/show/show_xtargets.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void ShowXTargets(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_zone_data.cpp b/zone/gm_commands/show/show_zone_data.cpp index 881f7d4da..d9875437d 100644 --- a/zone/gm_commands/show/show_zone_data.cpp +++ b/zone/gm_commands/show/show_zone_data.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" void ShowZoneData(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_zone_global_loot.cpp b/zone/gm_commands/show/show_zone_global_loot.cpp index 6a05fdc19..838aafb9f 100644 --- a/zone/gm_commands/show/show_zone_global_loot.cpp +++ b/zone/gm_commands/show/show_zone_global_loot.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowZoneGlobalLoot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_zone_loot.cpp b/zone/gm_commands/show/show_zone_loot.cpp index 6a4beb063..22317f9b3 100644 --- a/zone/gm_commands/show/show_zone_loot.cpp +++ b/zone/gm_commands/show/show_zone_loot.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowZoneLoot(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_zone_points.cpp b/zone/gm_commands/show/show_zone_points.cpp index b5adc4602..778771b5e 100644 --- a/zone/gm_commands/show/show_zone_points.cpp +++ b/zone/gm_commands/show/show_zone_points.cpp @@ -1,4 +1,4 @@ -#include "../../client.h" +#include "zone/client.h" void ShowZonePoints(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/show/show_zone_status.cpp b/zone/gm_commands/show/show_zone_status.cpp index 4ad2ea0ef..f517956fc 100644 --- a/zone/gm_commands/show/show_zone_status.cpp +++ b/zone/gm_commands/show/show_zone_status.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/show/show_zone_variables.cpp b/zone/gm_commands/show/show_zone_variables.cpp index 4af24fa0b..b914fd8c6 100644 --- a/zone/gm_commands/show/show_zone_variables.cpp +++ b/zone/gm_commands/show/show_zone_variables.cpp @@ -1,5 +1,5 @@ -#include "../../client.h" -#include "../../zone.h" +#include "zone/client.h" +#include "zone/zone.h" extern Zone* zone; diff --git a/zone/gm_commands/shutdown.cpp b/zone/gm_commands/shutdown.cpp index 75d77c9eb..d7fe561ce 100755 --- a/zone/gm_commands/shutdown.cpp +++ b/zone/gm_commands/shutdown.cpp @@ -1,5 +1,6 @@ -#include "../client.h" -#include "../../world/main.h" +#include "zone/client.h" + +void CatchSignal(int sig_num); void command_shutdown(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/spawn.cpp b/zone/gm_commands/spawn.cpp index 78ab443af..66783c50f 100755 --- a/zone/gm_commands/spawn.cpp +++ b/zone/gm_commands/spawn.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_spawn(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/spawneditmass.cpp b/zone/gm_commands/spawneditmass.cpp index 8c85e2fbc..2e7028c49 100644 --- a/zone/gm_commands/spawneditmass.cpp +++ b/zone/gm_commands/spawneditmass.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_spawneditmass(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/spawnfix.cpp b/zone/gm_commands/spawnfix.cpp index 7cfe33e7b..cce0c882e 100755 --- a/zone/gm_commands/spawnfix.cpp +++ b/zone/gm_commands/spawnfix.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_spawnfix(Client* c, const Seperator* sep) { diff --git a/zone/gm_commands/stun.cpp b/zone/gm_commands/stun.cpp index 32da4593c..62ca26c52 100755 --- a/zone/gm_commands/stun.cpp +++ b/zone/gm_commands/stun.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_stun(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/summon.cpp b/zone/gm_commands/summon.cpp index 710aea67c..501f06345 100755 --- a/zone/gm_commands/summon.cpp +++ b/zone/gm_commands/summon.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/summonburiedplayercorpse.cpp b/zone/gm_commands/summonburiedplayercorpse.cpp index 6ed7b4a25..3b6c859dd 100755 --- a/zone/gm_commands/summonburiedplayercorpse.cpp +++ b/zone/gm_commands/summonburiedplayercorpse.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../corpse.h" +#include "zone/client.h" +#include "zone/corpse.h" void command_summonburiedplayercorpse(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/summonitem.cpp b/zone/gm_commands/summonitem.cpp index b72292a97..057c4b0f7 100755 --- a/zone/gm_commands/summonitem.cpp +++ b/zone/gm_commands/summonitem.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_summonitem(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/suspend.cpp b/zone/gm_commands/suspend.cpp index 1bd5f4ae2..fc9e67e2e 100755 --- a/zone/gm_commands/suspend.cpp +++ b/zone/gm_commands/suspend.cpp @@ -1,6 +1,6 @@ -#include "../client.h" -#include "../worldserver.h" -#include "../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/suspendmulti.cpp b/zone/gm_commands/suspendmulti.cpp index 1d087b486..4ebfa8a4f 100755 --- a/zone/gm_commands/suspendmulti.cpp +++ b/zone/gm_commands/suspendmulti.cpp @@ -1,6 +1,6 @@ -#include "../client.h" -#include "../worldserver.h" -#include "../../common/repositories/account_repository.h" +#include "common/repositories/account_repository.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/takeplatinum.cpp b/zone/gm_commands/takeplatinum.cpp index a5c0a8f3a..fe9af3c7b 100644 --- a/zone/gm_commands/takeplatinum.cpp +++ b/zone/gm_commands/takeplatinum.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_takeplatinum(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/task.cpp b/zone/gm_commands/task.cpp index 407184f59..591726584 100755 --- a/zone/gm_commands/task.cpp +++ b/zone/gm_commands/task.cpp @@ -1,11 +1,10 @@ -#include "../client.h" -#include "../worldserver.h" +#include "common/repositories/completed_tasks_repository.h" +#include "common/shared_tasks.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; -#include "../../common/shared_tasks.h" -#include "../../common/repositories/completed_tasks_repository.h" - void command_task(Client *c, const Seperator *sep) { if (!RuleB(TaskSystem, EnableTaskSystem)) { diff --git a/zone/gm_commands/traindisc.cpp b/zone/gm_commands/traindisc.cpp index aeb4e8d9f..4243b8bc4 100755 --- a/zone/gm_commands/traindisc.cpp +++ b/zone/gm_commands/traindisc.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_traindisc(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/tune.cpp b/zone/gm_commands/tune.cpp index 7174039e9..98f94117d 100755 --- a/zone/gm_commands/tune.cpp +++ b/zone/gm_commands/tune.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_tune(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/undye.cpp b/zone/gm_commands/undye.cpp index f66cc9185..fdc6e39ab 100755 --- a/zone/gm_commands/undye.cpp +++ b/zone/gm_commands/undye.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_undye(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/unmemspell.cpp b/zone/gm_commands/unmemspell.cpp index b5450035f..b6985bd66 100644 --- a/zone/gm_commands/unmemspell.cpp +++ b/zone/gm_commands/unmemspell.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_unmemspell(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/unmemspells.cpp b/zone/gm_commands/unmemspells.cpp index a39d329c8..94568c74b 100644 --- a/zone/gm_commands/unmemspells.cpp +++ b/zone/gm_commands/unmemspells.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_unmemspells(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/unscribespell.cpp b/zone/gm_commands/unscribespell.cpp index 6965538c4..6f432dddb 100755 --- a/zone/gm_commands/unscribespell.cpp +++ b/zone/gm_commands/unscribespell.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void command_unscribespell(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/unscribespells.cpp b/zone/gm_commands/unscribespells.cpp index 7b4b93211..ed2572f9e 100755 --- a/zone/gm_commands/unscribespells.cpp +++ b/zone/gm_commands/unscribespells.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_unscribespells(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/untraindisc.cpp b/zone/gm_commands/untraindisc.cpp index 2337d7ae9..ac0237f72 100755 --- a/zone/gm_commands/untraindisc.cpp +++ b/zone/gm_commands/untraindisc.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void command_untraindisc(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/untraindiscs.cpp b/zone/gm_commands/untraindiscs.cpp index 8058c6e76..85229c60a 100755 --- a/zone/gm_commands/untraindiscs.cpp +++ b/zone/gm_commands/untraindiscs.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_untraindiscs(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/wc.cpp b/zone/gm_commands/wc.cpp index 4fc60e9be..b23de72fd 100755 --- a/zone/gm_commands/wc.cpp +++ b/zone/gm_commands/wc.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/client.h" void command_wc(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/worldshutdown.cpp b/zone/gm_commands/worldshutdown.cpp index 37940d1a7..c17ce1848 100755 --- a/zone/gm_commands/worldshutdown.cpp +++ b/zone/gm_commands/worldshutdown.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/worldwide.cpp b/zone/gm_commands/worldwide.cpp index a61be457b..8f2e7a183 100755 --- a/zone/gm_commands/worldwide.cpp +++ b/zone/gm_commands/worldwide.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_worldwide(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/wp.cpp b/zone/gm_commands/wp.cpp index 8307ebaa7..54f2bd849 100755 --- a/zone/gm_commands/wp.cpp +++ b/zone/gm_commands/wp.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_wp(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/wpadd.cpp b/zone/gm_commands/wpadd.cpp index b8f114c7b..b6b04d119 100755 --- a/zone/gm_commands/wpadd.cpp +++ b/zone/gm_commands/wpadd.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_wpadd(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/zone.cpp b/zone/gm_commands/zone.cpp index 46caf373f..d13a9449f 100644 --- a/zone/gm_commands/zone.cpp +++ b/zone/gm_commands/zone.cpp @@ -1,5 +1,5 @@ -#include "../bot.h" -#include "../client.h" +#include "zone/bot.h" +#include "zone/client.h" void command_zone(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/zone_instance.cpp b/zone/gm_commands/zone_instance.cpp index 5101468ba..8efc7f9fc 100644 --- a/zone/gm_commands/zone_instance.cpp +++ b/zone/gm_commands/zone_instance.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_zone_instance(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/zone_shard.cpp b/zone/gm_commands/zone_shard.cpp index 9e468ba7d..f5273dbfc 100644 --- a/zone/gm_commands/zone_shard.cpp +++ b/zone/gm_commands/zone_shard.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_zone_shard(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/zonebootup.cpp b/zone/gm_commands/zonebootup.cpp index 1a1a91f5d..155cbc2be 100755 --- a/zone/gm_commands/zonebootup.cpp +++ b/zone/gm_commands/zonebootup.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/zoneshutdown.cpp b/zone/gm_commands/zoneshutdown.cpp index c62e5a0b9..555bd54de 100755 --- a/zone/gm_commands/zoneshutdown.cpp +++ b/zone/gm_commands/zoneshutdown.cpp @@ -1,5 +1,5 @@ -#include "../client.h" -#include "../worldserver.h" +#include "zone/client.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/gm_commands/zonevariable.cpp b/zone/gm_commands/zonevariable.cpp index 54c4ae65f..af4d2de6d 100644 --- a/zone/gm_commands/zonevariable.cpp +++ b/zone/gm_commands/zonevariable.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_zonevariable(Client *c, const Seperator *sep) { diff --git a/zone/gm_commands/zsave.cpp b/zone/gm_commands/zsave.cpp index acfa4536d..a73394f45 100755 --- a/zone/gm_commands/zsave.cpp +++ b/zone/gm_commands/zsave.cpp @@ -1,4 +1,4 @@ -#include "../client.h" +#include "zone/client.h" void command_zsave(Client *c, const Seperator *sep) {