Changed: Moved some #include

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

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;

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"
 

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"