From 13f3a96c60029233c4af738703085d5fbd0083f7 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 27 Sep 2010 14:36:03 +0200
Subject: [PATCH] Changed: Moved some #include

---
 code/ryzom/server/src/entities_game_service/admin.cpp     | 5 ++---
 .../mission_manager/ai_alias_translator.cpp               | 4 ++--
 .../src/entities_game_service/player_manager/character.h  | 8 +++-----
 .../src/entities_game_service/weather_everywhere.cpp      | 6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp
index 24e77f1b4..e83bce37f 100644
--- a/code/ryzom/server/src/entities_game_service/admin.cpp
+++ b/code/ryzom/server/src/entities_game_service/admin.cpp
@@ -51,6 +51,8 @@
 #include "game_share/shard_names.h"
 #include "server_share/log_command_gen.h"
 #include "server_share/r2_vision.h"
+#include "server_share/log_item_gen.h"
+#include "server_share/log_character_gen.h"
 
 #include "egs_sheets/egs_sheets.h"
 #include "egs_sheets/egs_static_rolemaster_phrase.h"
@@ -100,9 +102,6 @@
 #include "modules/shard_unifier_client.h"
 #include "modules/client_command_forwarder.h"
 #include "modules/guild_unifier.h"
-#include "server_share/log_command_gen.h"
-#include "server_share/log_item_gen.h"
-#include "server_share/log_character_gen.h"
 
 //
 // Externs
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp
index f59982315..64739f48a 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp
@@ -19,10 +19,10 @@
 #include "mission_manager/ai_alias_translator.h"
 #include "nel/net/service.h"
 #include "nel/ligo/primitive_utils.h"
-#include "mission_log.h"
-#include "primitives_parser.h"
 #include "nel/misc/command.h"
 #include "nel/net/message.h"
+#include "mission_log.h"
+#include "primitives_parser.h"
 
 using namespace NLMISC;
 using namespace NLNET;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h
index 850fa72ed..e1c190513 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h
@@ -21,7 +21,6 @@
 // Game Share
 #include "game_share/bot_chat_types.h"
 #include "game_share/brick_flags.h"
-#include "server_share/pet_interface_msg.h"
 #include "game_share/power_types.h"
 #include "game_share/roles.h"
 #include "game_share/temp_inventory_mode.h"
@@ -31,7 +30,10 @@
 #include "game_share/people.h"
 #include "game_share/pvp_clan.h"
 #include "game_share/string_manager_sender.h"
+#include "game_share/r2_types.h"
 
+#include "server_share/pet_interface_msg.h"
+#include "server_share/r2_vision.h"
 
 // Misc
 #include "nel/misc/string_conversion.h"
@@ -55,10 +57,6 @@
 #include "mission_manager/ai_alias_translator.h"
 #include "ring_reward_points.h"
 #include "persistent_effect.h"
-
-#include "game_share/r2_types.h"
-#include "server_share/r2_vision.h"
-
 #include "character_interface.h"
 #include "database_plr.h"
 
diff --git a/code/ryzom/server/src/entities_game_service/weather_everywhere.cpp b/code/ryzom/server/src/entities_game_service/weather_everywhere.cpp
index 58cfe4483..05fc3a573 100644
--- a/code/ryzom/server/src/entities_game_service/weather_everywhere.cpp
+++ b/code/ryzom/server/src/entities_game_service/weather_everywhere.cpp
@@ -18,9 +18,9 @@
 
 #include "stdpch.h"
 #include "weather_everywhere.h"
-#include <nel/misc/sheet_id.h>
-#include <nel/georges/load_form.h>
-#include <nel/georges/u_form_elm.h>
+#include "nel/misc/sheet_id.h"
+#include "nel/georges/load_form.h"
+#include "nel/georges/u_form_elm.h"
 #include "zone_manager.h"
 #include "egs_sheets/egs_sheets.h"
 #include "game_share/time_weather_season/weather_manager.h"