Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2016-01-06 16:03:39 +01:00
parent bfc9381a6b
commit 98041d381a
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/ryzom/server/src/ai_share/ai_event.h
View file

@ -65,7 +65,7 @@ public:
{ {
*this=other; *this=other;
} }
CAIEventType(const char *typeName) CAIEventType(const char *typeName)
{ {
// copy text from input string to _val variable // 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! // if type name is longer than 8 characters it won't fit in an int64!
nlassert(typeName[i]==0); nlassert(typeName[i]==0);
// pad out _val variable with 0s // pad out _val variable with 0s
while(i<8) while(i<8)
((char *)&_val)[i++]=0; ((char *)&_val)[i++]=0;
@ -134,7 +134,7 @@ private:
// base class IAIEvent // base class IAIEvent
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// This is the base class for classes of event sent from the game dev services to // 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. // unrecognised events.
class IAIEvent class IAIEvent
@ -174,7 +174,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the stunned creature id /// the stunned creature id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;
@ -200,7 +200,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the waked creature id /// the waked creature id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;
@ -228,7 +228,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the creature Id /// the creature Id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;
@ -260,7 +260,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the affected creature id /// the affected creature id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;
@ -292,7 +292,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the creature id /// the creature id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;
@ -318,7 +318,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the creature id /// the creature id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;
@ -343,7 +343,7 @@ public:
// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters> // note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
// the 'read' version of the serial should test the <sizeof> to ensure version robustness // the 'read' version of the serial should test the <sizeof> to ensure version robustness
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
public: public:
/// the affected creature id /// the affected creature id
NLMISC::CEntityId CreatureId; NLMISC::CEntityId CreatureId;

1
code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
View file

@ -1773,7 +1773,6 @@ void CScreenshotIslands::buildBackTextureHLS(const std::string & islandName, con
} }
} }
// HLS order // HLS order
list< CRGBA > sortedHLS; list< CRGBA > sortedHLS;
list< CRGBA >::iterator itCol, itHLS; list< CRGBA >::iterator itCol, itHLS;