From 834fcbe8c80bffa75cb7ffb79ab7f71df9202262 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 6 Jan 2016 16:03:39 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/ryzom/server/src/ai_share/ai_event.h | 20 +++++++++---------- .../screenshot_islands.cpp | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/code/ryzom/server/src/ai_share/ai_event.h b/code/ryzom/server/src/ai_share/ai_event.h index c62b1be81..55f179861 100644 --- a/code/ryzom/server/src/ai_share/ai_event.h +++ b/code/ryzom/server/src/ai_share/ai_event.h @@ -65,7 +65,7 @@ public: { *this=other; } - + CAIEventType(const char *typeName) { // copy text from input string to _val variable @@ -75,7 +75,7 @@ public: // if type name is longer than 8 characters it won't fit in an int64! nlassert(typeName[i]==0); - + // pad out _val variable with 0s while(i<8) ((char *)&_val)[i++]=0; @@ -134,7 +134,7 @@ private: // base class IAIEvent //----------------------------------------------------------------------------------- // This is the base class for classes of event sent from the game dev services to -// the AI. Note that the serial has a special syntax to allow for skipping of +// the AI. Note that the serial has a special syntax to allow for skipping of // unrecognised events. class IAIEvent @@ -174,7 +174,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the stunned creature id NLMISC::CEntityId CreatureId; @@ -200,7 +200,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the waked creature id NLMISC::CEntityId CreatureId; @@ -228,7 +228,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the creature Id NLMISC::CEntityId CreatureId; @@ -260,7 +260,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the affected creature id NLMISC::CEntityId CreatureId; @@ -292,7 +292,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the creature id NLMISC::CEntityId CreatureId; @@ -318,7 +318,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the creature id NLMISC::CEntityId CreatureId; @@ -343,7 +343,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the affected creature id NLMISC::CEntityId CreatureId; diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp index 0cf9686b5..cd0e4581c 100644 --- a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp +++ b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp @@ -1773,7 +1773,6 @@ void CScreenshotIslands::buildBackTextureHLS(const std::string & islandName, con } } - // HLS order list< CRGBA > sortedHLS; list< CRGBA >::iterator itCol, itHLS;