normalize includes: gm commands

utils/gm_commands/main.go

@@ -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 <thread>")
-				}
-				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))
-}

zone/gm_commands/acceptrules.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_acceptrules(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/aggrozone.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_aggrozone(Client *c, const Seperator *sep)
 {

zone/gm_commands/ai.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_ai(Client *c, const Seperator *sep)
 {

zone/gm_commands/appearance.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_appearance(Client *c, const Seperator *sep)
 {

zone/gm_commands/appearanceeffects.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_appearanceeffects(Client *c, const Seperator *sep)
 {

zone/gm_commands/attack.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_attack(Client *c, const Seperator *sep)
 {

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)
 {

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;
 

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)
 {

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;
 

zone/gm_commands/castspell.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_castspell(Client *c, const Seperator *sep)
 {

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;
 

zone/gm_commands/clearxtargets.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_clearxtargets(Client *c, const Seperator *sep)
 {

zone/gm_commands/copycharacter.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_copycharacter(Client *c, const Seperator *sep)
 {

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)
 {

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)
 {

zone/gm_commands/countitem.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_countitem(Client *c, const Seperator *sep)
 {

zone/gm_commands/damage.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_damage(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/dbspawn2.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_dbspawn2(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/delpetition.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_delpetition(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/depopzone.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_depopzone(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/disablerecipe.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_disablerecipe(Client *c, const Seperator *sep)
 {

zone/gm_commands/disarmtrap.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_disarmtrap(Client *c, const Seperator *sep)
 {

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)
 {

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);

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
 

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<ToolGameObjectsRepository::ToolGameObjects> game_objects
 	);
 };
-
-
-#endif //EQEMU_DOOR_MANIPULATION_H

zone/gm_commands/dye.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_dye(Client *c, const Seperator *sep)
 {

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)
 {

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)
 {

zone/gm_commands/editmassrespawn.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_editmassrespawn(Client *c, const Seperator *sep)
 {

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;
 

zone/gm_commands/emptyinventory.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_emptyinventory(Client *c, const Seperator *sep)
 {

zone/gm_commands/enablerecipe.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_enablerecipe(Client *c, const Seperator *sep)
 {

zone/gm_commands/entityvariable.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_entityvariable(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/exptoggle.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_exptoggle(Client *c, const Seperator *sep)
 {

zone/gm_commands/faction.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_faction(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/feature.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_feature(Client *c, const Seperator *sep)
 {

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);

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

zone/gm_commands/find/find_spell.cpp

@@ -1,4 +1,4 @@
-#include "../../client.h"
+#include "zone/client.h"
 
 uint8 GetCommandStatus(std::string command_name);
 

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)
 {

zone/gm_commands/find/find_task.cpp

@@ -1,4 +1,4 @@
-#include "../../client.h"
+#include "zone/client.h"
 
 uint8 GetCommandStatus(std::string command_name);
 

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)
 {

zone/gm_commands/fish.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_fish(Client *c, const Seperator *sep)
 {

zone/gm_commands/fixmob.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void SendFixMobSubCommands(Client* c)
 {

zone/gm_commands/flagedit.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_flagedit(Client *c, const Seperator *sep)
 {

zone/gm_commands/fleeinfo.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_fleeinfo(Client *c, const Seperator *sep)
 {

zone/gm_commands/forage.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_forage(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/giveitem.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_giveitem(Client *c, const Seperator *sep)
 {

zone/gm_commands/givemoney.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_givemoney(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/goto.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_goto(Client *c, const Seperator *sep)
 {

zone/gm_commands/grantaa.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_grantaa(Client *c, const Seperator *sep)
 {

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)
 {

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)
 			// }
 		}
 	}
-}
+}

zone/gm_commands/hp.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_hp(Client *c, const Seperator *sep)
 {

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)
 {

zone/gm_commands/instance.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_instance(Client *c, const Seperator *sep)
 {

zone/gm_commands/interrogateinv.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_interrogateinv(Client *c, const Seperator *sep)
 {

zone/gm_commands/interrupt.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_interrupt(Client *c, const Seperator *sep)
 {

zone/gm_commands/invsnapshot.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_invsnapshot(Client *c, const Seperator *sep)
 {

zone/gm_commands/ipban.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_ipban(Client *c, const Seperator *sep)
 {

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;
 

zone/gm_commands/kill.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_kill(Client *c, const Seperator *sep)
 {

zone/gm_commands/killallnpcs.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_killallnpcs(Client *c, const Seperator *sep)
 {

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;

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)
 {

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;
 

zone/gm_commands/lootsim.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_lootsim(Client *c, const Seperator *sep)
 {

zone/gm_commands/makepet.cpp

@@ -1,4 +1,4 @@
-#include "../client.h"
+#include "zone/client.h"
 
 void command_makepet(Client *c, const Seperator *sep)
 {