From 3b835a5407b609b745864e7723a7d6a5be4a274d Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 9 Dec 2012 08:48:15 +0100 Subject: [PATCH] Fixed: PCH for client_sheets --- .../client/src/client_sheets/attack_id_sheet.h | 2 -- .../src/client_sheets/body_to_bone_sheet.cpp | 1 + .../client/src/client_sheets/body_to_bone_sheet.h | 2 ++ .../client/src/client_sheets/faction_sheet.h | 3 +-- .../client/src/client_sheets/item_fx_sheet.cpp | 4 ++-- .../src/client_sheets/outpost_building_sheet.h | 2 +- code/ryzom/client/src/client_sheets/stdpch.h | 15 +++++++++++---- .../src/client_sheets/text_emot_list_sheet.h | 2 -- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.h b/code/ryzom/client/src/client_sheets/attack_id_sheet.h index 2eaaabed8..1dfe1b790 100644 --- a/code/ryzom/client/src/client_sheets/attack_id_sheet.h +++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.h @@ -14,8 +14,6 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . - - #ifndef CL_ATTACK_ID_H #define CL_ATTACK_ID_H diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp index ea08a9747..fb065e6df 100644 --- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp @@ -19,6 +19,7 @@ #include "stdpch.h" // #include "body_to_bone_sheet.h" +#include "client_sheets.h" // #include "nel/georges/u_form_elm.h" diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h index f71356c5b..10e59ba72 100644 --- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h +++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h @@ -21,6 +21,8 @@ #include "game_share/body.h" +#include + namespace NLGEORGES { class UFormElm; diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.h b/code/ryzom/client/src/client_sheets/faction_sheet.h index babdb78e9..1b1a3f3e5 100644 --- a/code/ryzom/client/src/client_sheets/faction_sheet.h +++ b/code/ryzom/client/src/client_sheets/faction_sheet.h @@ -14,11 +14,10 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . - - #ifndef RY_FACTION_SHEET_H #define RY_FACTION_SHEET_H +#include "entity_sheet.h" /** Sheet of a faction * NB : it doesn't derives from CEntitySheet, because its instances are aggragated in a CContinentSheet diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp index ce1912897..c58bc601f 100644 --- a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp @@ -14,10 +14,10 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . - - #include "stdpch.h" #include "item_fx_sheet.h" +#include "client_sheets.h" + #include "nel/georges/u_form_elm.h" // ******************************************************************************************* diff --git a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h b/code/ryzom/client/src/client_sheets/outpost_building_sheet.h index f1bccc371..e753f3352 100644 --- a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h +++ b/code/ryzom/client/src/client_sheets/outpost_building_sheet.h @@ -18,7 +18,7 @@ #define RY_OUTPOST_BUILDING_H #include "entity_sheet.h" - +#include "client_sheets.h" /** * Outpost building definition for client side management (buy building upgrades ...) diff --git a/code/ryzom/client/src/client_sheets/stdpch.h b/code/ryzom/client/src/client_sheets/stdpch.h index 6656b4553..3421b031d 100644 --- a/code/ryzom/client/src/client_sheets/stdpch.h +++ b/code/ryzom/client/src/client_sheets/stdpch.h @@ -14,7 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#ifndef CL_STDPCH_H +#define CL_STDPCH_H #include #include @@ -33,15 +34,21 @@ #include #include +#include #include #include - #include #include #include #include #include #include +#include +#include -#include "client_sheets.h" -#include "entity_sheet.h" +#include +#include +#include +#include + +#endif diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h index ccfdb8f9e..8533e14f5 100644 --- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h @@ -14,8 +14,6 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . - - #ifndef CL_TEXT_EMOT_LIST_SHEET_H #define CL_TEXT_EMOT_LIST_SHEET_H