Changed: #825 Remove all warnings when compiling Ryzom
This commit is contained in:
parent
d3bb7e1062
commit
ed95d4ed79
109 changed files with 300 additions and 274 deletions
|
@ -118,7 +118,7 @@ namespace NLMISC
|
|||
_Speaker->registerListener(this);
|
||||
}
|
||||
|
||||
void unregisterListener(ISpeaker *speaker)
|
||||
void unregisterListener(ISpeaker * /* speaker */)
|
||||
{
|
||||
nlassert(_Speaker != NULL);
|
||||
_Speaker->unregisterListener(this);
|
||||
|
|
|
@ -99,15 +99,15 @@ public:
|
|||
/// \name Streaming source controls
|
||||
//@{
|
||||
/// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...)
|
||||
virtual void setFormat(uint8 channels, uint8 bitsPerSample, uint32 frequency) { nlassert(false); }
|
||||
virtual void setFormat(uint8 /* channels */, uint8 /* bitsPerSample */, uint32 /* frequency */) { nlassert(false); }
|
||||
/// Return the sample format information.
|
||||
virtual void getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { nlassert(false); }
|
||||
virtual void getFormat(uint8 &/* channels */, uint8 &/* bitsPerSample */, uint32 &/* frequency */) const { nlassert(false); }
|
||||
/// Get a writable pointer to the buffer of specified size. Use capacity to specify the required bytes. Returns NULL when all the buffer space is already filled. Call setFormat() first.
|
||||
virtual uint8 *lock(uint capacity) { nlassert(false); return NULL; }
|
||||
virtual uint8 *lock(uint /* capacity */) { nlassert(false); return NULL; }
|
||||
/// Notify that you are done writing to the locked buffer, so it can be copied over to hardware if needed. Set size to the number of bytes actually written to the buffer. Returns true if ok.
|
||||
virtual bool unlock(uint size) { nlassert(false); return false; }
|
||||
virtual bool unlock(uint /* size */) { nlassert(false); return false; }
|
||||
/// Get the recommended buffer size to use with lock()/unlock()
|
||||
virtual void getRecommendedBufferSize(uint &samples, uint &bytes) const { nlassert(false); }
|
||||
virtual void getRecommendedBufferSize(uint &/* samples */, uint &/* bytes */) const { nlassert(false); }
|
||||
/// Get the recommended sleep time based on the size of the last submitted buffer and the available buffer space
|
||||
virtual uint32 getRecommendedSleepTime() const { nlassert(false); return 0; }
|
||||
/// Return if there are still buffers available for playback.
|
||||
|
|
|
@ -46,7 +46,7 @@ public:
|
|||
virtual void importForm(const std::string& filename, NLGEORGES::UFormElm& formRoot);
|
||||
|
||||
/// Used by the george sound plugin to check sound recursion (ie sound 'toto' use sound 'titi' witch also use sound 'toto' ...).
|
||||
virtual void getSubSoundList(std::vector<std::pair<std::string, CSound*> > &subsounds) const { }
|
||||
virtual void getSubSoundList(std::vector<std::pair<std::string, CSound*> > &/* subsounds */) const { }
|
||||
|
||||
/// Serialize the sound data.
|
||||
virtual void serial(NLMISC::IStream &s);
|
||||
|
|
|
@ -74,7 +74,7 @@ public:
|
|||
* Append the header to a created bnp file
|
||||
* \param filename (consisting the whole path)
|
||||
*/
|
||||
void appendHeader (const std::string &filename) {};
|
||||
void appendHeader (const std::string &filename) {}
|
||||
|
||||
/**
|
||||
* Create a vector of all packed files inside the bnp file
|
||||
|
|
|
@ -21,17 +21,17 @@
|
|||
#include "ui_tile_widget_qt.h"
|
||||
|
||||
class CTile_ListWidgetItem : public QListWidgetItem
|
||||
{
|
||||
public:
|
||||
CTile_ListWidgetItem ( QListWidget * parent, int type = Type ):QListWidgetItem(parent,type){};
|
||||
{
|
||||
public:
|
||||
CTile_ListWidgetItem ( QListWidget * parent, int type = Type ):QListWidgetItem(parent,type){}
|
||||
|
||||
CTile_ListWidgetItem(QWidget *parent = 0);
|
||||
void initWidget(const QPixmap&, const QString&);
|
||||
|
||||
private:
|
||||
Ui::TileWidget ui;
|
||||
private:
|
||||
Ui::TileWidget ui;
|
||||
// Qpixmap tilePixmap;
|
||||
// QString tileLabel;
|
||||
};
|
||||
};
|
||||
|
||||
#endif
|
|
@ -70,7 +70,7 @@ public:
|
|||
|
||||
private:
|
||||
//we don't want user to do a copy
|
||||
CMysqlResult(const CMysqlResult &mysqlResult){};
|
||||
CMysqlResult(const CMysqlResult &mysqlResult){}
|
||||
MYSQL_RES *Result;
|
||||
};
|
||||
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
class CTabsObserver
|
||||
{
|
||||
public:
|
||||
CTabsObserver() {};
|
||||
CTabsObserver() {}
|
||||
|
||||
virtual void OnTab(int iTab) {};
|
||||
virtual void OnTab(int iTab) {}
|
||||
};
|
||||
|
||||
class CBarTabsWnd : public CWnd
|
||||
|
|
|
@ -37,7 +37,7 @@ class CChatInputFilter : public NLMISC::CRefCount, public CChatWindow::IObserver
|
|||
{
|
||||
public:
|
||||
CChatInputFilter() {FilterType= CChatGroup::say; DynamicChatDbIndex= 0;}
|
||||
~CChatInputFilter();
|
||||
virtual ~CChatInputFilter();
|
||||
/** Display a msg in the chat. The msg will be forwarded to all the listening windows
|
||||
* Listening windows will blick only if there isnt a single visible listening window, so that the player can know if there's a message
|
||||
* \param windowVisible is not NULL, points a bool that will be filled with true if one of the window on the which the msg was displayed is visible.
|
||||
|
|
|
@ -44,7 +44,7 @@ public:
|
|||
CScrollBar(uint id, float x, float y, float x_pixel, float y_pixel, float w, float h, float w_pixel, float h_pixel, bool vertical = true,CScrollableControl *ctrl = NULL);
|
||||
|
||||
/// destructor
|
||||
virtual ~CScrollBar() {};
|
||||
virtual ~CScrollBar() {}
|
||||
|
||||
/// Display the control
|
||||
virtual void display();
|
||||
|
|
|
@ -277,8 +277,8 @@ private:
|
|||
Surface(const Surface &) {}
|
||||
Surface &operator=(const Surface &) { return *this; }
|
||||
public:
|
||||
Surface() {};
|
||||
virtual ~Surface() {};
|
||||
Surface() {}
|
||||
virtual ~Surface() {}
|
||||
static Surface *Allocate();
|
||||
|
||||
virtual void Init()=0;
|
||||
|
|
|
@ -1829,9 +1829,9 @@ namespace ADMIN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -1969,9 +1969,9 @@ namespace ADMIN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -2202,9 +2202,9 @@ namespace ADMIN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -46,7 +46,7 @@ public:
|
|||
|
||||
// note that actions are NOT responsible for deleting child actions
|
||||
virtual ~IAILogicAction()
|
||||
{};
|
||||
{}
|
||||
|
||||
// this is the execute 'callback' for the action type.
|
||||
// NOTE: This code should be fast and compact as it may be called very large numbers of times
|
||||
|
|
|
@ -633,7 +633,7 @@ public CMoveProfile
|
|||
{
|
||||
public:
|
||||
CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius);
|
||||
virtual ~CGrpProfileFollowPlayer() {};
|
||||
virtual ~CGrpProfileFollowPlayer() {}
|
||||
|
||||
void setBotStandProfile(AITYPES::TProfiles botStandProfileType, IAIProfileFactory* botStandProfileFactory);
|
||||
|
||||
|
@ -641,16 +641,16 @@ public:
|
|||
//@{
|
||||
virtual void beginProfile();
|
||||
virtual void updateProfile(uint ticksSinceLastUpdate);
|
||||
virtual void endProfile() {};
|
||||
virtual void endProfile() {}
|
||||
virtual AITYPES::TProfiles getAIProfileType() const { return AITYPES::BOT_FOLLOW_POS; }
|
||||
virtual std::string getOneLineInfoString() const { return std::string("follow_player group profile"); }
|
||||
//@}
|
||||
|
||||
void stateChangeProfile() {};
|
||||
void stateChangeProfile() {}
|
||||
bool destinationReach() const;
|
||||
|
||||
void addBot (CBot* bot) {};
|
||||
void removeBot (CBot* bot) {};
|
||||
void addBot (CBot* bot) {}
|
||||
void removeBot (CBot* bot) {}
|
||||
CPathCont* getPathCont (CBot const* bot) { return NULL; };
|
||||
|
||||
|
||||
|
|
|
@ -529,6 +529,7 @@ class CLazyProcess
|
|||
: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~CLazyProcess() {}
|
||||
/// Used to update some dependencies for instance road connections when the first next update of CContinent is called.
|
||||
virtual void update() const = 0;
|
||||
/// Used to check if there's no need to add another lazyprocess.
|
||||
|
@ -1052,6 +1053,7 @@ class IGroupDesc
|
|||
: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~IGroupDesc() {}
|
||||
virtual uint32 groupEnergyValue() const = 0;
|
||||
virtual float groupEnergyCoef() const = 0;
|
||||
virtual bool getCountMultiplierFlag() const = 0;
|
||||
|
|
|
@ -87,15 +87,15 @@ public:
|
|||
virtual void update() =0;
|
||||
|
||||
/// Fill a vector of outpost id name assigned to tribe
|
||||
virtual void fillOutpostNames(std::vector<NLMISC::TStringId> outpostNames) {};
|
||||
virtual void fillOutpostNames(std::vector<NLMISC::TStringId> outpostNames) {}
|
||||
/// Add an outpost for the tribe (nb : the family must be a tribe)
|
||||
virtual void outpostAdd(NLMISC::TStringId outpostName) {};
|
||||
virtual void outpostAdd(NLMISC::TStringId outpostName) {}
|
||||
/// Remove an from the tribe
|
||||
virtual void outpostRemove(NLMISC::TStringId outpostName) {};
|
||||
virtual void outpostRemove(NLMISC::TStringId outpostName) {}
|
||||
|
||||
virtual void outpostEvent(NLMISC::TStringId outpostName, ZCSTATE::TZcState state) {};
|
||||
virtual void outpostEvent(NLMISC::TStringId outpostName, ZCSTATE::TZcState state) {}
|
||||
|
||||
virtual void spawnBoss(NLMISC::TStringId outpostName) {};
|
||||
virtual void spawnBoss(NLMISC::TStringId outpostName) {}
|
||||
|
||||
CGroupNpc *createNpcGroup(const CNpcZone *const zone, const CGroupDesc<CGroupFamily> *const groupDesc);
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ class CFxEntity
|
|||
{
|
||||
public:
|
||||
CFxEntity(CAIPos const& pos, NLMISC::CSheetId const& sheet);
|
||||
~CFxEntity();
|
||||
virtual ~CFxEntity();
|
||||
NLMISC::CEntityId const& id() const;
|
||||
bool spawn();
|
||||
void despawn();
|
||||
|
|
|
@ -644,6 +644,7 @@ class IRaceStats
|
|||
: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~IRaceStats() {}
|
||||
virtual NLMISC::CSheetId SheetId() const = 0;
|
||||
virtual std::string Race() const = 0;
|
||||
};
|
||||
|
|
|
@ -73,9 +73,9 @@ public:
|
|||
/// fill the icon param, send the description text to the user and store the resulting text id in the textId param.
|
||||
virtual void getClientDescription(uint16 roomIdx, uint16 ownerIndex, CCharacter * user, uint64 & icon, uint32 & textId )const = 0;
|
||||
/// callback called when all the appartments of a user must be removed
|
||||
virtual void onPlayerDeletion( const NLMISC::CEntityId & userId ){};
|
||||
virtual void onPlayerDeletion( const NLMISC::CEntityId & userId ){}
|
||||
/// callback called when all the appartments of a guild must be removed
|
||||
virtual void onGuildDeletion( uint32 guild ){};
|
||||
virtual void onGuildDeletion( uint32 guild ){}
|
||||
/// return true if the user is allowed to go in the building
|
||||
virtual bool isUserAllowed(CCharacter * user, uint16 ownerIdx, uint16 roomIdx) = 0;
|
||||
///return the number of owner in this building ( return 1 for common buildings )
|
||||
|
|
|
@ -121,14 +121,14 @@ public:
|
|||
/// exception thrown when creature is unknown
|
||||
struct ECreature : public NLMISC::Exception
|
||||
{
|
||||
ECreature( const NLMISC::CEntityId& id ) : Exception ("The creature "+id.toString()+" doesn't exist") {};
|
||||
ECreature( const NLMISC::CEntityId& id ) : Exception ("The creature "+id.toString()+" doesn't exist") {}
|
||||
};
|
||||
|
||||
/// structure describing an unaffected fauna group ( because the description is received before mirror update )
|
||||
struct SUnaffectedFaunaGroup
|
||||
{
|
||||
SUnaffectedFaunaGroup(const TDataSetRow& entityIndex,TAIAlias groupAlias)
|
||||
:EntityIndex( entityIndex ),GroupAlias( groupAlias ){};
|
||||
:EntityIndex( entityIndex ),GroupAlias( groupAlias ){}
|
||||
TDataSetRow EntityIndex;
|
||||
TAIAlias GroupAlias;
|
||||
};
|
||||
|
|
|
@ -31,7 +31,7 @@ class CEGSProgressCallback : public NLMISC::IProgressCallback
|
|||
{
|
||||
public:
|
||||
CEGSProgressCallback():IProgressCallback() {}
|
||||
virtual void progress (float progressValue) {};
|
||||
virtual void progress (float progressValue) {}
|
||||
virtual ~CEGSProgressCallback() {}
|
||||
|
||||
};
|
||||
|
|
|
@ -74,7 +74,7 @@ public :
|
|||
/// exception thrown when a sheet is unknown
|
||||
struct ESheet : public NLMISC::Exception
|
||||
{
|
||||
ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {};
|
||||
ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {}
|
||||
};
|
||||
|
||||
public:
|
||||
|
|
|
@ -429,7 +429,7 @@ struct SShield : public SArmor
|
|||
NL_INSTANCE_COUNTER_DECL(SShield);
|
||||
public:
|
||||
|
||||
inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){};
|
||||
inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){}
|
||||
|
||||
virtual void serial(class NLMISC::IStream &f)
|
||||
{
|
||||
|
|
|
@ -140,7 +140,7 @@ public:
|
|||
_ExceptionString = std::string("<CEntityBase> : Invalid stat name ") + var;
|
||||
return _ExceptionString.c_str();
|
||||
}
|
||||
virtual ~EInvalidStat() throw() {};
|
||||
virtual ~EInvalidStat() throw() {}
|
||||
private:
|
||||
mutable std::string _ExceptionString;
|
||||
};
|
||||
|
@ -820,7 +820,7 @@ public:
|
|||
/// Return the damage using current armor, done by an explosion (e.g. forage source explosion)
|
||||
virtual float getActualDamageFromExplosionWithArmor( float dmg ) const =0;
|
||||
|
||||
inline virtual void clearCurrentAction() {};
|
||||
inline virtual void clearCurrentAction() {}
|
||||
|
||||
inline virtual void setCurrentAction(CLIENT_ACTION_TYPE::TClientActionType,NLMISC::TGameCycle) {}
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ public:
|
|||
/// exception thrown when entity is unknown
|
||||
struct EEntity : public NLMISC::Exception
|
||||
{
|
||||
EEntity( const NLMISC::CEntityId& id ) : Exception ("The entity "+id.toString()+" doesn't exist") {};
|
||||
EEntity( const NLMISC::CEntityId& id ) : Exception ("The entity "+id.toString()+" doesn't exist") {}
|
||||
};
|
||||
|
||||
/* // Success table for calculation of success probability and associate xp-gains
|
||||
|
|
|
@ -61,7 +61,7 @@ public :
|
|||
/// exception thrown when a sheet is unknown
|
||||
struct ESheet : public NLMISC::Exception
|
||||
{
|
||||
ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {};
|
||||
ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {}
|
||||
};
|
||||
|
||||
public:
|
||||
|
|
|
@ -490,9 +490,9 @@ namespace GU
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -50,7 +50,7 @@ private:
|
|||
void adaptToVersion4(CGuild &guild) const;
|
||||
|
||||
private:
|
||||
CGuildVersionAdapter(){};
|
||||
CGuildVersionAdapter(){}
|
||||
/// unique instance
|
||||
static CGuildVersionAdapter* _Instance;
|
||||
};
|
||||
|
|
|
@ -94,7 +94,7 @@ public:
|
|||
static bool simMissionEvent(const std::vector< std::string > & script, NLMISC::CLog & log );
|
||||
|
||||
protected:
|
||||
CMissionEvent(){};
|
||||
CMissionEvent(){}
|
||||
/// build an event from a script
|
||||
virtual bool buildFromScript( const std::vector< std::string > & script,NLMISC::CLog& log ) = 0;
|
||||
|
||||
|
@ -114,7 +114,7 @@ public:
|
|||
uint32 Mission;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventMissionDone(){};
|
||||
CMissionEventMissionDone(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -130,7 +130,7 @@ public:
|
|||
std::string ScenarioTag;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventTaggedRingScenarioDone(){};
|
||||
CMissionEventTaggedRingScenarioDone(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -158,7 +158,7 @@ public:
|
|||
uint32 Amount;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventGiveMoney(){};
|
||||
CMissionEventGiveMoney(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -171,7 +171,7 @@ public:
|
|||
uint32 PlaceId;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventVisitPlace(){};
|
||||
CMissionEventVisitPlace(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -184,7 +184,7 @@ public:
|
|||
std::vector<NLMISC::CSheetId> Bricks;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventCast(){};
|
||||
CMissionEventCast(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -196,7 +196,7 @@ public:
|
|||
:CMissionEvent(Kill, targetEntity, restriction){}
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventKill(){};
|
||||
CMissionEventKill(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
|
||||
};
|
||||
|
@ -209,7 +209,7 @@ public:
|
|||
:CMissionEvent(KillPlayer, victimId){}
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventKillPlayer(){};
|
||||
CMissionEventKillPlayer(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -225,7 +225,7 @@ public:
|
|||
uint16 Quality;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventBuyItem(){};
|
||||
CMissionEventBuyItem(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -241,7 +241,7 @@ public:
|
|||
uint16 Quality;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventSellItem(){};
|
||||
CMissionEventSellItem(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -257,7 +257,7 @@ public:
|
|||
uint16 Quality;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventForage(){};
|
||||
CMissionEventForage(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -283,7 +283,7 @@ public:
|
|||
uint Level;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventSkillProgress(){};
|
||||
CMissionEventSkillProgress(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -295,7 +295,7 @@ public:
|
|||
:CMissionEvent(Target,targetEntity ){}
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventTarget(){};
|
||||
CMissionEventTarget(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script,NLMISC::CLog& log );
|
||||
};
|
||||
|
||||
|
@ -311,7 +311,7 @@ public:
|
|||
uint16 Quality;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventCraft(){};
|
||||
CMissionEventCraft(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -351,7 +351,7 @@ public:
|
|||
uint16 Quality;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventLootItem(){};
|
||||
CMissionEventLootItem(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -366,7 +366,7 @@ public:
|
|||
uint16 Quality;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventLootRm(){};
|
||||
CMissionEventLootRm(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
@ -379,7 +379,7 @@ public:
|
|||
TAIAlias Alias;
|
||||
protected:
|
||||
friend class CMissionEvent;
|
||||
CMissionEventKillGroup(){};
|
||||
CMissionEventKillGroup(){}
|
||||
bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
|
||||
};
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ public:
|
|||
///\name accessors
|
||||
//@{
|
||||
/// return the step actions
|
||||
inline const std::vector< IMissionAction* > & getActions(){ return _Actions; };
|
||||
inline const std::vector< IMissionAction* > & getActions(){ return _Actions; }
|
||||
/// set the out of order index of the step ( it is the index of the OOO/ANY bloc embedding the step ) 0xFF is invalid
|
||||
inline void setOOOStepIndex(uint32 idx){ _OOOStepIndex = idx; }
|
||||
///\return the OOO index ( see previous line )
|
||||
|
@ -120,9 +120,9 @@ public:
|
|||
///\set displayed value
|
||||
void setIconDisplayedOnStepNPC(bool displayed){ _IconDisplayedOnStepNPC = displayed;}
|
||||
/// return true if the step is in an OOO block which text wad overriden
|
||||
bool isInOverridenOOO() { return _IsInOverridenOOO; };
|
||||
bool isInOverridenOOO() { return _IsInOverridenOOO; }
|
||||
/// set the isInOverridenOOO flag ( see previous method )
|
||||
void setAsInOverridenOOO() { _IsInOverridenOOO = true; };
|
||||
void setAsInOverridenOOO() { _IsInOverridenOOO = true; }
|
||||
/// return true if there is a roleplay text in this step
|
||||
bool isThereRoleplayText() { return !_RoleplayText.empty(); }
|
||||
/// check if the current player gift is ok
|
||||
|
@ -130,7 +130,7 @@ public:
|
|||
|
||||
|
||||
/// retrieve the escort groups
|
||||
virtual void getEscortGroups( std::vector< TAIAlias > & groups ){};
|
||||
virtual void getEscortGroups( std::vector< TAIAlias > & groups ){}
|
||||
virtual bool checkEscortFailure( bool groupWiped ){return false;}
|
||||
|
||||
/// check the consistency of a text step
|
||||
|
|
|
@ -81,7 +81,7 @@ public:
|
|||
typedef std::map< TCreatureRowId, TCreatureItemRequest > TPendingRequest;
|
||||
|
||||
// constructor
|
||||
CR2GiveItem() {};
|
||||
CR2GiveItem() {}
|
||||
// destructor
|
||||
~CR2GiveItem() {}
|
||||
|
||||
|
|
|
@ -75,10 +75,10 @@ public:
|
|||
|
||||
///\unused basic methods from CSPhrase
|
||||
//@{
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {};
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {}
|
||||
//@}
|
||||
|
||||
// Craft methodes
|
||||
|
|
|
@ -60,7 +60,7 @@ public:
|
|||
/**
|
||||
* set the actor
|
||||
*/
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){};
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){}
|
||||
|
||||
/**
|
||||
* called at the end of the latency time
|
||||
|
|
|
@ -86,7 +86,7 @@ public:
|
|||
/**
|
||||
* set the actor
|
||||
*/
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){};
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){}
|
||||
|
||||
//@}
|
||||
|
||||
|
|
|
@ -62,10 +62,10 @@ public:
|
|||
|
||||
///\unused basic methods from CSPhrase
|
||||
//@{
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {};
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {}
|
||||
//@}
|
||||
|
||||
//@}
|
||||
|
|
|
@ -149,7 +149,7 @@ public:
|
|||
}
|
||||
|
||||
// callback called when the effect is actually removed. Does nothing by default
|
||||
virtual void removed(){};
|
||||
virtual void removed(){}
|
||||
|
||||
///\name read accessors
|
||||
//@{
|
||||
|
|
|
@ -113,7 +113,7 @@ public:
|
|||
* set the primary target
|
||||
* \param entityId id of the primary target
|
||||
*/
|
||||
virtual void setPrimaryTarget( const TDataSetRow &entityRowId ) {};
|
||||
virtual void setPrimaryTarget( const TDataSetRow &/* entityRowId */ ) {}
|
||||
|
||||
/**
|
||||
* evaluate phrase
|
||||
|
@ -188,9 +188,9 @@ public:
|
|||
/** Return true if the phrase if grammatically valid (otherwise, send a msg to the player actorRowId)
|
||||
* TODO: anti-hacking
|
||||
*/
|
||||
static bool validateSabrinaGrammar( const std::vector< const CStaticBrick* >& bricks, TDataSetRow actorRowId ) { return true; }
|
||||
static bool validateSabrinaGrammar( const std::vector< const CStaticBrick* >& /* bricks */, TDataSetRow /* actorRowId */ ) { return true; }
|
||||
|
||||
virtual void setBrickSheets( const std::vector<NLMISC::CSheetId> & bricks){}
|
||||
virtual void setBrickSheets( const std::vector<NLMISC::CSheetId> & /* bricks */){}
|
||||
virtual void setEnchantMode(bool){}
|
||||
|
||||
inline void cyclic(bool b) { _CyclicPhrase = b; }
|
||||
|
|
|
@ -36,7 +36,7 @@ class CToxicCloud : public CEnvironmentalEffect
|
|||
NL_INSTANCE_COUNTER_DECL(CToxicCloud);
|
||||
public:
|
||||
|
||||
CToxicCloud() {};
|
||||
CToxicCloud() {}
|
||||
|
||||
/// Init
|
||||
inline void init( const NLMISC::CVector& pos, float radius, sint32 dmgPerHit, NLMISC::TGameCycle updateFrequency, NLMISC::TGameCycle lifetime=ToxicCloudDefaultLifetime)
|
||||
|
|
|
@ -216,7 +216,7 @@ public :
|
|||
/**
|
||||
* Inform a node of its parenthood
|
||||
*/
|
||||
virtual void setParent(CCDBStructNodeBranch *parent) { nlassertex(0,("setParent() not overloaded for given node type!")); }
|
||||
virtual void setParent(CCDBStructNodeBranch * /* parent */) { nlassertex(0,("setParent() not overloaded for given node type!")); }
|
||||
|
||||
/**
|
||||
* get the parent of a node
|
||||
|
@ -248,7 +248,7 @@ public :
|
|||
* Browse the tree, and for each atom branch encountered, call the callback passing the argument
|
||||
* provided and the index of the atom branch.
|
||||
*/
|
||||
virtual void foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const {};
|
||||
virtual void foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const {}
|
||||
|
||||
/**
|
||||
* Browse the tree, building the text id, and for each leaf encountered, call the callback
|
||||
|
|
|
@ -50,12 +50,12 @@ public:
|
|||
/// exception thrown when database is not initialized
|
||||
struct EDBNotInit : public NLMISC::Exception
|
||||
{
|
||||
EDBNotInit() : Exception("CDB: Property Database not initialized") {};
|
||||
EDBNotInit() : Exception("CDB: Property Database not initialized") {}
|
||||
};
|
||||
|
||||
struct ECDBNotFound : public NLMISC::Exception
|
||||
{
|
||||
ECDBNotFound() : Exception("CDB: Property not found") {};
|
||||
ECDBNotFound() : Exception("CDB: Property not found") {}
|
||||
};
|
||||
|
||||
/*struct CPropForClientOnly
|
||||
|
|
|
@ -126,7 +126,7 @@ private:
|
|||
|
||||
private:
|
||||
// prevent copy constructor
|
||||
CMemorizationSet(const CMemorizationSet &other) {};
|
||||
CMemorizationSet(const CMemorizationSet &other) {}
|
||||
// prevent copy operator
|
||||
CMemorizationSet &operator =(const CMemorizationSet&other) { return *this;}
|
||||
};
|
||||
|
@ -183,7 +183,7 @@ private:
|
|||
|
||||
private:
|
||||
// prevent copy constructor
|
||||
CPlayerPhraseMemory(const CMemorizationSet &other) {};
|
||||
CPlayerPhraseMemory(const CMemorizationSet &other) {}
|
||||
// prevent copy operator
|
||||
CPlayerPhraseMemory &operator =(const CMemorizationSet&other) { return *this;}
|
||||
};
|
||||
|
|
|
@ -166,13 +166,13 @@ public :
|
|||
/// exception thrown when player is unknown
|
||||
struct EPlayer : public NLMISC::Exception
|
||||
{
|
||||
EPlayer( uint32 userId ) : Exception ("Player "+NLMISC::toString(userId)+" not found") {};
|
||||
EPlayer( uint32 userId ) : Exception ("Player "+NLMISC::toString(userId)+" not found") {}
|
||||
};
|
||||
|
||||
/// exception thrown when player's char is unknown
|
||||
struct EChar : public NLMISC::Exception
|
||||
{
|
||||
EChar( const NLMISC::CEntityId& id ) : Exception ("The char "+id.toString()+" doesn't exist") {};
|
||||
EChar( const NLMISC::CEntityId& id ) : Exception ("The char "+id.toString()+" doesn't exist") {}
|
||||
};
|
||||
|
||||
///init the manager
|
||||
|
|
|
@ -64,7 +64,7 @@ public:
|
|||
};
|
||||
|
||||
/// ctor
|
||||
CSkillProgress() {};
|
||||
CSkillProgress() {}
|
||||
|
||||
/// dtor
|
||||
virtual ~CSkillProgress() { _SkillsProgress.clear(); }
|
||||
|
@ -97,7 +97,7 @@ public:
|
|||
typedef std::map< TDataSetRow, CSkillProgress * > TSkillProgressPerOpponentContainer;
|
||||
|
||||
/// ctor
|
||||
CCharacterActions() {};
|
||||
CCharacterActions() {}
|
||||
|
||||
/// dtor+
|
||||
virtual ~CCharacterActions();
|
||||
|
|
|
@ -56,6 +56,8 @@ public:
|
|||
QuitTeam,
|
||||
};
|
||||
|
||||
virtual ~IPVP() {}
|
||||
|
||||
/// get PVP mode to send to the client
|
||||
virtual PVP_MODE::TPVPMode getPVPMode() const = 0;
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class IItemTrade : public NLMISC::CRefCount
|
|||
public:
|
||||
|
||||
// virtual destructor
|
||||
virtual ~IItemTrade() {};
|
||||
virtual ~IItemTrade() {}
|
||||
|
||||
// sheet id
|
||||
virtual NLMISC::CSheetId getSheetId() const = 0;
|
||||
|
|
|
@ -56,7 +56,7 @@ public:
|
|||
struct IAIInstanceReady
|
||||
{
|
||||
virtual void onAiInstanceReady(const CReportStaticAIInstanceMsg &msg) = 0;
|
||||
virtual void onAiInstanceDown(const CReportStaticAIInstanceMsg &msg) {}; // not mandatory
|
||||
virtual void onAiInstanceDown(const CReportStaticAIInstanceMsg &msg) {} // not mandatory
|
||||
};
|
||||
|
||||
/// Singleton access
|
||||
|
|
|
@ -318,7 +318,7 @@ public:
|
|||
};
|
||||
|
||||
// default constructor
|
||||
CZoneManager() : DepositSearchTime(50) {};
|
||||
CZoneManager() : DepositSearchTime(50) {}
|
||||
|
||||
~CZoneManager();
|
||||
|
||||
|
|
|
@ -42,10 +42,10 @@ public:
|
|||
typedef TSelectionLevel result_type;
|
||||
|
||||
/// Initialization of a selection cycle
|
||||
virtual void init( TSelectionLevel nblevels ) {};
|
||||
virtual void init( TSelectionLevel nblevels ) {}
|
||||
|
||||
/// Change the number of levels without restarting the cycle
|
||||
virtual void changeNbLevels( TSelectionLevel nblevels ) {};
|
||||
virtual void changeNbLevels( TSelectionLevel nblevels ) {}
|
||||
|
||||
/// Return the next level to select
|
||||
virtual TSelectionLevel getNext() = 0;
|
||||
|
|
|
@ -71,6 +71,7 @@ namespace GUS
|
|||
//-----------------------------------------------------------------------------
|
||||
// Public interface
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual ~CChatChannel() {}
|
||||
|
||||
// open the chat channel on all clients and set its name
|
||||
// If historySize is set other than 0, the the chat channel is
|
||||
|
|
|
@ -40,15 +40,15 @@ namespace GUS
|
|||
{
|
||||
public:
|
||||
// General callback
|
||||
virtual void mirrorIsReady(CGusMirror *gusMirror) {};
|
||||
virtual void serviceMirrorUp(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {};
|
||||
virtual void serviceMirrorDown(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {};
|
||||
virtual void mirrorTickUpdate(CGusMirror *gusMirror) {};
|
||||
virtual void mirrorIsReady(CGusMirror *gusMirror) {}
|
||||
virtual void serviceMirrorUp(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {}
|
||||
virtual void serviceMirrorDown(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {}
|
||||
virtual void mirrorTickUpdate(CGusMirror *gusMirror) {}
|
||||
|
||||
// mirror updates
|
||||
virtual void entityAdded(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex) {};
|
||||
virtual void entityRemoved(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, const NLMISC::CEntityId *entityId) {};
|
||||
virtual void propertyChanged(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, TPropertyIndex propIndex) {};
|
||||
virtual void entityAdded(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex) {}
|
||||
virtual void entityRemoved(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, const NLMISC::CEntityId *entityId) {}
|
||||
virtual void propertyChanged(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, TPropertyIndex propIndex) {}
|
||||
|
||||
IMirrorModuleCallback();
|
||||
virtual ~IMirrorModuleCallback();
|
||||
|
|
|
@ -41,7 +41,7 @@ namespace GUS
|
|||
class IModuleBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~IModuleBuilder() {};
|
||||
virtual ~IModuleBuilder() {}
|
||||
virtual const NLMISC::CSString& getName() const=0;
|
||||
virtual const NLMISC::CSString& getArgs() const=0;
|
||||
virtual const NLMISC::CSString& getDescription() const=0;
|
||||
|
|
|
@ -128,7 +128,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,listCharNames,"display the names of the charact
|
|||
|
||||
std::vector<std::string> files;
|
||||
NLMISC::CPath::getPathContent(STAT_GLOBALS::getInputFilePath().c_str(),false,false,true,files);
|
||||
for (uint32 i=files.size();i--;)
|
||||
for (uint32 i=(uint32)files.size();i--;)
|
||||
{
|
||||
if (!NLMISC::testWildCard(NLMISC::CFile::getFilename(files[i]),wildcard))
|
||||
{
|
||||
|
@ -227,7 +227,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,jobsPromote,"pause execution of jobs","<jobId>"
|
|||
if (args.size()!=1)
|
||||
return false;
|
||||
|
||||
uint32 idx= atoi(args[0].c_str());
|
||||
uint32 idx;
|
||||
NLMISC::fromString(args[0], idx);
|
||||
if ( (idx==0 && args[0]!="0") )
|
||||
{
|
||||
nlwarning("Argument is not a valid job id - should be a number");
|
||||
|
@ -249,7 +250,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,JobUpdatesPerUpdate,"set or display the number
|
|||
|
||||
if (args.size()==1)
|
||||
{
|
||||
uint32 count= atoi(args[0].c_str());
|
||||
uint32 count;
|
||||
NLMISC::fromString(args[0], count);
|
||||
if ( (count==0 && args[0]!="0") )
|
||||
{
|
||||
nlwarning("Argument is not a valid number");
|
||||
|
@ -311,7 +313,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,jobsDisplayDetails,"display detailed info for t
|
|||
|
||||
case 1:
|
||||
{
|
||||
uint32 idx= atoi(args[0].c_str());
|
||||
uint32 idx;
|
||||
NLMISC::fromString(args[0], idx);
|
||||
if ( (idx==0 && args[0]!="0") )
|
||||
{
|
||||
nlwarning("Argument is not a valid job id - should be a number");
|
||||
|
@ -476,8 +479,11 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptDeleteLine,"","<line_number>")
|
|||
return false;
|
||||
}
|
||||
|
||||
uint32 line;
|
||||
NLMISC::fromString(args[0], line);
|
||||
|
||||
// line numbering starts at 1 so an invalid number will be inored anyway
|
||||
return TheCharScanScriptFile->deleteLine(atoi(args[0].c_str()));
|
||||
return TheCharScanScriptFile->deleteLine(line);
|
||||
}
|
||||
|
||||
NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptAddInfoExtractor,"","<infoExtractorName> [<args>]")
|
||||
|
@ -761,7 +767,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se
|
|||
return false;
|
||||
|
||||
// generating a new file list
|
||||
if (args[0]==CSString("generate").left(args[0].size()))
|
||||
if (args[0]==CSString("generate").left((uint)args[0].size()))
|
||||
{
|
||||
if (TheCharScanScriptFile==NULL)
|
||||
{
|
||||
|
@ -796,7 +802,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se
|
|||
}
|
||||
|
||||
// displaying the last generated file list
|
||||
if (args[0]==CSString("display").left(args[0].size()))
|
||||
if (args[0]==CSString("display").left((uint)args[0].size()))
|
||||
{
|
||||
nlinfo("Filtered file list for the current job");
|
||||
fdc.display(&log);
|
||||
|
|
|
@ -63,7 +63,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log)
|
|||
{
|
||||
std::string s= _Filters[i]->getName();
|
||||
if (s.size()>longestName)
|
||||
longestName=s.size();
|
||||
longestName=(uint32)s.size();
|
||||
}
|
||||
|
||||
// iterate over the filters displaying names and description
|
||||
|
@ -75,7 +75,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log)
|
|||
|
||||
uint32 CCharFilterFactory::getFilterBuilderCount()
|
||||
{
|
||||
return _Filters.size();
|
||||
return (uint32)_Filters.size();
|
||||
}
|
||||
|
||||
ICharFilterBuilder* CCharFilterFactory::getFilterBuilder(uint32 idx)
|
||||
|
|
|
@ -52,6 +52,7 @@ public:
|
|||
class ICharFilterBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~ICharFilterBuilder() {}
|
||||
virtual const char* getName()=0;
|
||||
virtual const char* getDescription()=0;
|
||||
virtual ICharFilter* build(const std::string& rawArgs)=0;
|
||||
|
|
|
@ -63,7 +63,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log)
|
|||
{
|
||||
std::string s= _InfoExtractors[i]->getName();
|
||||
if (s.size()>longestName)
|
||||
longestName=s.size();
|
||||
longestName=(uint32)s.size();
|
||||
}
|
||||
|
||||
// iterate over the infoExtractors displaying names and description
|
||||
|
@ -75,7 +75,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log)
|
|||
|
||||
uint32 CCharInfoExtractorFactory::getInfoExtractorBuilderCount()
|
||||
{
|
||||
return _InfoExtractors.size();
|
||||
return (uint32)_InfoExtractors.size();
|
||||
}
|
||||
|
||||
ICharInfoExtractorBuilder* CCharInfoExtractorFactory::getInfoExtractorBuilder(uint32 idx)
|
||||
|
|
|
@ -56,6 +56,7 @@ public:
|
|||
class ICharInfoExtractorBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~ICharInfoExtractorBuilder() {}
|
||||
virtual const char* getName() const=0;
|
||||
virtual const char* getDescription() const=0;
|
||||
virtual const char* getFields() const=0;
|
||||
|
|
|
@ -298,7 +298,7 @@ void CCharScanScriptCommandRegistry::displayScriptCommands(NLMISC::CLog* log)
|
|||
{
|
||||
std::string s= _ScriptCommands[i]->getName();
|
||||
if (s.size()>longestName)
|
||||
longestName=s.size();
|
||||
longestName=(uint32)s.size();
|
||||
}
|
||||
|
||||
// iterate over the script commands displaying names and description
|
||||
|
|
|
@ -293,7 +293,7 @@ bool CCharacterScanJob::runForFile(const std::string& fileName)
|
|||
c.apply(pdr);
|
||||
|
||||
// iterate over the filters executing their core code
|
||||
for (uint32 i=_Filters.size();i--;)
|
||||
for (uint32 i=(uint32)_Filters.size();i--;)
|
||||
{
|
||||
if (!_Filters[i]->evaluate(&c))
|
||||
return true;
|
||||
|
|
|
@ -63,7 +63,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log)
|
|||
{
|
||||
std::string s= _FileLists[i]->getName();
|
||||
if (s.size()>longestName)
|
||||
longestName=s.size();
|
||||
longestName=(uint32)s.size();
|
||||
}
|
||||
|
||||
// iterate over the filters displaying names and description
|
||||
|
@ -75,7 +75,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log)
|
|||
|
||||
uint32 CFileListBuilderFactory::getFileListBuilderCount()
|
||||
{
|
||||
return _FileLists.size();
|
||||
return (uint32)_FileLists.size();
|
||||
}
|
||||
|
||||
IFileListBuilderBuilder* CFileListBuilderFactory::getFileListBuilder(uint32 idx)
|
||||
|
|
|
@ -54,6 +54,7 @@ public:
|
|||
class IFileListBuilderBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~IFileListBuilderBuilder() {}
|
||||
virtual const char* getName()=0;
|
||||
virtual const char* getDescription()=0;
|
||||
virtual IFileListBuilder* build(const std::string& rawArgs)=0;
|
||||
|
|
|
@ -61,19 +61,19 @@ namespace STAT_GLOBALS
|
|||
NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
|
||||
return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
}
|
||||
|
||||
NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
|
||||
return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
}
|
||||
|
||||
NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
|
||||
return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -131,7 +131,7 @@ void CJobManager::serviceUpdate()
|
|||
uint32 CJobManager::addJob(NLMISC::CSmartPtr<CJobManager::IJob> job)
|
||||
{
|
||||
nlassert(job!=NULL);
|
||||
uint32 id= _Jobs.size();
|
||||
uint32 id= (uint32)_Jobs.size();
|
||||
_UnfinishedJobs.push_back(id);
|
||||
_Jobs.push_back(job);
|
||||
return id;
|
||||
|
|
|
@ -73,7 +73,8 @@ FILE_LIST_BUILDER(MinFileSize,"<min_file_size>")
|
|||
return false;
|
||||
}
|
||||
|
||||
for (uint32 i=fdc.size();i--;)
|
||||
uint32 ttlNumFiles= fdc.size();
|
||||
for (uint32 i=ttlNumFiles;i--;)
|
||||
{
|
||||
if (fdc[i].FileSize<minSize)
|
||||
fdc.removeFile(i);
|
||||
|
@ -91,7 +92,8 @@ FILE_LIST_BUILDER(MaxFileSize,"<max_file_size>")
|
|||
return false;
|
||||
}
|
||||
|
||||
for (uint32 i=fdc.size();i--;)
|
||||
uint32 ttlNumFiles= fdc.size();
|
||||
for (uint32 i=ttlNumFiles;i--;)
|
||||
{
|
||||
if (fdc[i].FileSize>maxSize)
|
||||
fdc.removeFile(i);
|
||||
|
|
|
@ -53,7 +53,7 @@ public:
|
|||
|
||||
private:
|
||||
// private data - internal to job
|
||||
typedef enum { INIT, WORK, CLOSED, ERROR } TState;
|
||||
enum TState { INIT, WORK, CLOSED, ERROR };
|
||||
TState _State;
|
||||
uint32 _NextFile;
|
||||
CFileDescriptionContainer _Files;
|
||||
|
|
|
@ -34,7 +34,7 @@ class CCell
|
|||
{
|
||||
public:
|
||||
/// default constructor
|
||||
CCell() : _LastVisionUpdate(0) {};
|
||||
CCell() : _LastVisionUpdate(0) {}
|
||||
|
||||
/// initialisation
|
||||
void init( sint32 cellId )
|
||||
|
|
|
@ -58,13 +58,13 @@ public :
|
|||
/// exception thrown when client is unknown
|
||||
struct EChatClient : public NLMISC::Exception
|
||||
{
|
||||
EChatClient( const NLMISC::CEntityId& id ) : Exception ("Don't have chat infos for the char "+id.toString()) {};
|
||||
EChatClient( const NLMISC::CEntityId& id ) : Exception ("Don't have chat infos for the char "+id.toString()) {}
|
||||
};
|
||||
|
||||
/// exception thrown when group is unknown
|
||||
struct EChatGroup : public NLMISC::Exception
|
||||
{
|
||||
EChatGroup( const TGroupId& gId ) : Exception ("Can't find the group "+gId.toString()) {};
|
||||
EChatGroup( const TGroupId& gId ) : Exception ("Can't find the group "+gId.toString()) {}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -71,9 +71,9 @@ namespace PATCHMAN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -211,9 +211,9 @@ namespace PATCHMAN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -371,9 +371,9 @@ namespace PATCHMAN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -504,9 +504,9 @@ namespace PATCHMAN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -711,9 +711,9 @@ namespace PATCHMAN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -911,9 +911,9 @@ namespace PATCHMAN
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -52,6 +52,7 @@ public:
|
|||
class ICharFilterBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~ICharFilterBuilder() {}
|
||||
virtual const char* getName()=0;
|
||||
virtual const char* getDescription()=0;
|
||||
virtual ICharFilter* build(const std::string& rawArgs)=0;
|
||||
|
|
|
@ -56,6 +56,7 @@ public:
|
|||
class ICharInfoExtractorBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~ICharInfoExtractorBuilder() {}
|
||||
virtual const char* getName() const=0;
|
||||
virtual const char* getDescription() const=0;
|
||||
virtual const char* getFields() const=0;
|
||||
|
|
|
@ -54,6 +54,7 @@ public:
|
|||
class IFileListBuilderBuilder: public NLMISC::CRefCount
|
||||
{
|
||||
public:
|
||||
virtual ~IFileListBuilderBuilder() {}
|
||||
virtual const char* getName()=0;
|
||||
virtual const char* getDescription()=0;
|
||||
virtual IFileListBuilder* build(const std::string& rawArgs)=0;
|
||||
|
|
|
@ -64,21 +64,21 @@ public:
|
|||
/**
|
||||
* set the actor
|
||||
*/
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){};
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){}
|
||||
|
||||
/**
|
||||
* called at the end of the latency time
|
||||
*/
|
||||
virtual void end(){};
|
||||
virtual void end(){}
|
||||
//@}
|
||||
|
||||
///\unused basic methods from CSPhrase
|
||||
//@{
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {};
|
||||
virtual void addTargetEntity( const TDataSetRow& ) {};
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {}
|
||||
virtual void addTargetEntity( const TDataSetRow& ) {}
|
||||
//@}
|
||||
|
||||
inline const TDataSetRow & getActor() { return _ActorRowId;}
|
||||
|
|
|
@ -62,11 +62,11 @@ public:
|
|||
|
||||
///\unused basic methods from CSPhrase
|
||||
//@{
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){};
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {};
|
||||
virtual void addTargetEntity( const TDataSetRow& ) {};
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){}
|
||||
virtual void setPrimaryTarget( const TDataSetRow& ) {}
|
||||
virtual void addTargetEntity( const TDataSetRow& ) {}
|
||||
//@}
|
||||
|
||||
//@}
|
||||
|
@ -74,7 +74,7 @@ public:
|
|||
/**
|
||||
* set the actor
|
||||
*/
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){};
|
||||
virtual void setActor( const TDataSetRow &entityRowId ){}
|
||||
|
||||
/**
|
||||
* called at the end of the latency time
|
||||
|
|
|
@ -78,17 +78,17 @@ public:
|
|||
virtual void execute();
|
||||
virtual void apply();
|
||||
virtual void stop();
|
||||
virtual void setPrimaryTarget( const TDataSetRow &entityRowId ){ _Targets[0] = entityRowId; };
|
||||
virtual void addTargetEntity( const TDataSetRow &entityRowId ){ _Targets.push_back(entityRowId);};
|
||||
virtual void setPrimaryTarget( const TDataSetRow &entityRowId ){ _Targets[0] = entityRowId; }
|
||||
virtual void addTargetEntity( const TDataSetRow &entityRowId ){ _Targets.push_back(entityRowId);}
|
||||
//@}
|
||||
|
||||
/// \name Unused virtual methods from CSPhrase
|
||||
//@{
|
||||
virtual void setActor( const TDataSetRow & actorRowId ){ }
|
||||
virtual void end(){};
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){ };
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){ };
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){ };
|
||||
virtual void end(){}
|
||||
virtual void setPrimaryItem( CGameItemPtr itemPtr ){ }
|
||||
virtual void setSecondaryItem( CGameItemPtr itemPtr ){ }
|
||||
virtual void addConsumableItem( CGameItemPtr itemPtr ){ }
|
||||
//@}
|
||||
|
||||
private:
|
||||
|
|
|
@ -55,7 +55,7 @@ public:
|
|||
virtual bool update( uint32 & updateFlag ) = 0;
|
||||
|
||||
/// callback called when the effect is actually removed. Does nothing by default
|
||||
virtual void removed(){};
|
||||
virtual void removed(){}
|
||||
|
||||
///\name accessors
|
||||
//@{
|
||||
|
|
|
@ -63,9 +63,9 @@ namespace BS
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -185,9 +185,9 @@ namespace BS
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -217,9 +217,9 @@ namespace CNM
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -330,9 +330,9 @@ namespace CNM
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -214,9 +214,9 @@ namespace CHATUNI
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -331,9 +331,9 @@ namespace CHATUNI
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -63,9 +63,9 @@ namespace CMDEXE
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -139,9 +139,9 @@ namespace ENTITYLOC
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
@ -384,9 +384,9 @@ namespace ENTITYLOC
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -983,9 +983,9 @@ namespace LGS
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -63,9 +63,9 @@ namespace MFS
|
|||
|
||||
// unused interceptors
|
||||
std::string fwdBuildModuleManifest() const { return std::string(); }
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
|
||||
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
|
||||
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
|
||||
|
||||
// process module message interceptor
|
||||
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
|
||||
|
|
|
@ -56,7 +56,7 @@ public:
|
|||
property ("Length", PropUInt8, (uint8)0,Length);
|
||||
}
|
||||
|
||||
virtual void callback (const std::string &name, uint8 id) {};
|
||||
virtual void callback (const std::string &name, uint8 id) {}
|
||||
|
||||
};
|
||||
*/
|
||||
|
@ -115,7 +115,7 @@ public:
|
|||
property ("RewardType", PropUInt8, (uint8)MISSION_DESC::NbReward, RewardType);
|
||||
}
|
||||
|
||||
virtual void callback (const std::string &name, uint8 id) {};
|
||||
virtual void callback (const std::string &name, uint8 id) {}
|
||||
};
|
||||
*/
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ public:
|
|||
propertyCont ("Character", PropDataSetRow, Character);
|
||||
propertyCont ("Creature", PropDataSetRow, Creature);
|
||||
}
|
||||
virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {};
|
||||
virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
|
@ -73,7 +73,7 @@ public:
|
|||
property("Type", PropUInt32, (uint32)Player, Type);
|
||||
}
|
||||
|
||||
virtual void callback (const std::string &name, NLNET::TServiceId id) {};
|
||||
virtual void callback (const std::string &name, NLNET::TServiceId id) {}
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -47,8 +47,9 @@ std::string buildChatDebugString(const std::vector<uint32> &ShopCategories,
|
|||
class CNpcChatProfile
|
||||
{
|
||||
public:
|
||||
CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _Organization(0), _FilterExplicitActionTradeByPlayerRace(false),
|
||||
_ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true){}
|
||||
CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _FilterExplicitActionTradeByPlayerRace(false),
|
||||
_ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true),
|
||||
_DynamicMissionGiver(false), _Organization(0) {}
|
||||
CNpcChatProfile(const CNpcChatProfile &other0,const CNpcChatProfile &other1);
|
||||
virtual ~CNpcChatProfile() {}
|
||||
|
||||
|
@ -84,7 +85,7 @@ public:
|
|||
const std::string &getWebPageName() const { return _WebPageName; }
|
||||
|
||||
const NLMISC::CSheetId &getOutpost() const { return _Outpost; }
|
||||
const uint32 getOrganization() const { return _Organization; }
|
||||
uint32 getOrganization() const { return _Organization; }
|
||||
|
||||
protected:
|
||||
std::vector< RYMSG::TExplicitSale > _ExplicitSales;
|
||||
|
@ -146,7 +147,7 @@ struct CCharacterBotChatBeginEnd : public CMirrorTransportClass
|
|||
propertyCont ("botChatEnd", PropUInt32, BotChatEnd);
|
||||
}
|
||||
|
||||
virtual void callback (const std::string &name, NLNET::TServiceId id) { }
|
||||
virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) { }
|
||||
};
|
||||
|
||||
struct CCharacterDynChatBeginEnd : public CMirrorTransportClass
|
||||
|
@ -162,7 +163,7 @@ struct CCharacterDynChatBeginEnd : public CMirrorTransportClass
|
|||
propertyCont ("dnChatEnd", PropUInt32, DynChatEnd);
|
||||
}
|
||||
|
||||
virtual void callback (const std::string &name, NLNET::TServiceId id) { }
|
||||
virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) { }
|
||||
};
|
||||
|
||||
struct CCustomElementId
|
||||
|
|
|
@ -95,13 +95,13 @@ class CStatDBLeaf : public IStatDBNode
|
|||
public:
|
||||
virtual ~CStatDBLeaf() {}
|
||||
|
||||
bool setNode(const std::string & path, IStatDBNodePtr node) { return false; }
|
||||
IStatDBNodePtr getNode(const std::string & path) { return NULL; }
|
||||
void getNodes(const std::string & pathPattern, std::vector<CMatchingNode> & matchingNodes,
|
||||
const std::string & currentPath) {}
|
||||
IStatDBNodePtr removeNode(const std::string & path) { return NULL; }
|
||||
bool setNode(const std::string & /* path */, IStatDBNodePtr /* node */) { return false; }
|
||||
IStatDBNodePtr getNode(const std::string & /* path */) { return NULL; }
|
||||
void getNodes(const std::string & /* pathPattern */, std::vector<CMatchingNode> & /* matchingNodes */,
|
||||
const std::string & /* currentPath */) {}
|
||||
IStatDBNodePtr removeNode(const std::string & /* path */) { return NULL; }
|
||||
|
||||
virtual void acceptVisitor(CStatDBNodeVisitor & visitor, const std::string & currentPath) {}
|
||||
virtual void acceptVisitor(CStatDBNodeVisitor & /* visitor */, const std::string & /* currentPath */) {}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -34,9 +34,9 @@ class CStatDBTableLeaf;
|
|||
class CStatDBNodeVisitor
|
||||
{
|
||||
public:
|
||||
virtual void visitBranch(CStatDBBranch * branch, const std::string & path) {}
|
||||
virtual void visitValueLeaf(CStatDBValueLeaf * valueLeaf, const std::string & path) {}
|
||||
virtual void visitTableLeaf(CStatDBTableLeaf * tableLeaf, const std::string & path) {}
|
||||
virtual void visitBranch(CStatDBBranch * /* branch */, const std::string & /* path */) {}
|
||||
virtual void visitValueLeaf(CStatDBValueLeaf * /* valueLeaf */, const std::string & /* path */) {}
|
||||
virtual void visitTableLeaf(CStatDBTableLeaf * /* tableLeaf */, const std::string & /* path */) {}
|
||||
|
||||
protected:
|
||||
CStatDBNodeVisitor() {}
|
||||
|
|
|
@ -111,9 +111,9 @@ namespace RSMGR
|
|||
CKnownUserPtr()
|
||||
: _FileName(NULL),
|
||||
_LineNum(0),
|
||||
_Ptr(NULL),
|
||||
_NextPtr(NULL),
|
||||
_PrevPtr(NULL)
|
||||
_PrevPtr(NULL),
|
||||
_Ptr(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1091,9 +1091,9 @@ namespace RSMGR
|
|||
CGuildInvitePtr()
|
||||
: _FileName(NULL),
|
||||
_LineNum(0),
|
||||
_Ptr(NULL),
|
||||
_NextPtr(NULL),
|
||||
_PrevPtr(NULL)
|
||||
_PrevPtr(NULL),
|
||||
_Ptr(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1231,9 +1231,9 @@ namespace RSMGR
|
|||
CPlayerRatingPtr()
|
||||
: _FileName(NULL),
|
||||
_LineNum(0),
|
||||
_Ptr(NULL),
|
||||
_NextPtr(NULL),
|
||||
_PrevPtr(NULL)
|
||||
_PrevPtr(NULL),
|
||||
_Ptr(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1371,9 +1371,9 @@ namespace RSMGR
|
|||
CJournalEntryPtr()
|
||||
: _FileName(NULL),
|
||||
_LineNum(0),
|
||||
_Ptr(NULL),
|
||||
_NextPtr(NULL),
|
||||
_PrevPtr(NULL)
|
||||
_PrevPtr(NULL),
|
||||
_Ptr(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ class CBaseDialog : public CDialog
|
|||
public:
|
||||
|
||||
/// Constructor
|
||||
CBaseDialog (uint id, CWnd* pParent = NULL) : CDialog(id, pParent) {};
|
||||
CBaseDialog (uint id, CWnd* pParent = NULL) : CDialog(id, pParent) {}
|
||||
|
||||
/// On ok
|
||||
virtual void OnOK ();
|
||||
|
|
|
@ -26,9 +26,9 @@ class CStringEx : public std::basic_string<char, std::char_traits<char>, std::al
|
|||
{
|
||||
|
||||
public:
|
||||
CStringEx() : std::basic_string<char, std::char_traits<char>, std::allocator<char> >() {;}
|
||||
CStringEx( char* _pc ) : std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (char *)_pc ) {};
|
||||
CStringEx( std::string _s ) : std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (std::string)_s) {};
|
||||
CStringEx() : std::basic_string<char, std::char_traits<char>, std::allocator<char> >() {}
|
||||
CStringEx( char* _pc ) : std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (char *)_pc ) {}
|
||||
CStringEx( std::string _s ) : std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (std::string)_s) {}
|
||||
CStringEx( const char _c, int _i ) { append( _i, _c ); }
|
||||
|
||||
virtual ~CStringEx();
|
||||
|
|
|
@ -84,12 +84,12 @@ public:
|
|||
uint Item, SubItem, ColumnCount;
|
||||
uint DlgIndex;
|
||||
|
||||
virtual TItemEdit getItemEditMode (uint item, uint subItem) {return EditFixedCombo;};
|
||||
virtual TItemEdit getItemEditMode (uint item, uint subItem) {return EditFixedCombo;}
|
||||
virtual void getComboBoxStrings (uint item, uint subItem, std::vector<std::string> &retStrings);
|
||||
virtual void getMemComboBoxProp (uint item, uint subItem, std::string ®Adr, bool &browse) { regAdr = ""; browse = false; };
|
||||
virtual void getNewItemText (uint item, uint subItem, std::string &ret) { ret = "new"; };
|
||||
virtual void getBrowseInfo (uint item, uint subItem, std::string &defExt, std::string &defFilename, std::string &defDir, std::string &filter) { defExt=""; defFilename=""; filter=""; defDir="";};
|
||||
virtual void onItemChanged (uint item, uint subItem) {};
|
||||
virtual void getMemComboBoxProp (uint item, uint subItem, std::string ®Adr, bool &browse) { regAdr = ""; browse = false; }
|
||||
virtual void getNewItemText (uint item, uint subItem, std::string &ret) { ret = "new"; }
|
||||
virtual void getBrowseInfo (uint item, uint subItem, std::string &defExt, std::string &defFilename, std::string &defDir, std::string &filter) { defExt=""; defFilename=""; filter=""; defDir="";}
|
||||
virtual void onItemChanged (uint item, uint subItem) {}
|
||||
|
||||
void memComboBoxAsChange (bool selChange);
|
||||
void closeMemComboBox (bool update);
|
||||
|
|
|
@ -66,7 +66,7 @@ public:
|
|||
IFormWidget (CFormDialog *dialog, uint structId, const char *formName, TTypeSrc typeSrc, uint slot);
|
||||
|
||||
// Destructor
|
||||
virtual ~IFormWidget () {};
|
||||
virtual ~IFormWidget () {}
|
||||
|
||||
// Update the text of the base label
|
||||
void updateLabel ();
|
||||
|
@ -90,8 +90,8 @@ public:
|
|||
virtual bool extendableHeight () const;
|
||||
|
||||
// Ok / cancel hit
|
||||
virtual void onOk () {};
|
||||
virtual void onCancel () {};
|
||||
virtual void onOk () {}
|
||||
virtual void onCancel () {}
|
||||
|
||||
// Update widget date
|
||||
virtual void updateData (bool update = true) = 0;
|
||||
|
|
|
@ -311,7 +311,7 @@ public:
|
|||
class CGeorgesEditDocType : public CGeorgesEditDoc
|
||||
{
|
||||
protected: // create from serialization only
|
||||
CGeorgesEditDocType() {};
|
||||
CGeorgesEditDocType() {}
|
||||
DECLARE_DYNCREATE(CGeorgesEditDocType)
|
||||
|
||||
// Document is a type ?
|
||||
|
@ -341,7 +341,7 @@ protected:
|
|||
class CGeorgesEditDocDfn : public CGeorgesEditDoc
|
||||
{
|
||||
protected: // create from serialization only
|
||||
CGeorgesEditDocDfn() {};
|
||||
CGeorgesEditDocDfn() {}
|
||||
DECLARE_DYNCREATE(CGeorgesEditDocDfn)
|
||||
|
||||
// Document is a dfn ?
|
||||
|
@ -371,7 +371,7 @@ protected:
|
|||
class CGeorgesEditDocForm : public CGeorgesEditDoc
|
||||
{
|
||||
protected: // create from serialization only
|
||||
CGeorgesEditDocForm() {};
|
||||
CGeorgesEditDocForm() {}
|
||||
DECLARE_DYNCREATE(CGeorgesEditDocForm)
|
||||
|
||||
// Docuemnt is a form ?
|
||||
|
|
|
@ -61,7 +61,7 @@ enum TUI
|
|||
class IGeorges
|
||||
{
|
||||
public:
|
||||
virtual ~IGeorges() {};
|
||||
virtual ~IGeorges() {}
|
||||
|
||||
// Init the UI
|
||||
virtual void initUI (int m_nCmdShow, bool exeStandalone, HWND parent=NULL)=0;
|
||||
|
|
|
@ -36,8 +36,8 @@ public:
|
|||
void outputString (const char *message);
|
||||
|
||||
// From CDialog
|
||||
void OnOK () {};
|
||||
void OnCancel ();
|
||||
void OnOK () {}
|
||||
void OnCancel ()
|
||||
|
||||
// Dialog Data
|
||||
//{{AFX_DATA(COutputConsoleDlg)
|
||||
|
|
|
@ -65,7 +65,7 @@ public:
|
|||
/**
|
||||
* Destructor must uninitialise the plugin interface
|
||||
*/
|
||||
virtual ~IEditPlugin () {};
|
||||
virtual ~IEditPlugin () {}
|
||||
|
||||
/// Window related
|
||||
|
||||
|
@ -157,7 +157,7 @@ public:
|
|||
/**
|
||||
* Destructor must uninitialise the plugin interface
|
||||
*/
|
||||
virtual ~IEditDocumentPlugin () {};
|
||||
virtual ~IEditDocumentPlugin () {}
|
||||
|
||||
/// Event message
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ public:
|
|||
/// The master dialog call this method when the document is changed/updated
|
||||
static void docChanged();
|
||||
/// The docChanged static method call this method on each page.
|
||||
virtual void onDocChanged() {};
|
||||
virtual void onDocChanged() {}
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class CPageBgFades : public CPageBase
|
|||
|
||||
// Construction
|
||||
public:
|
||||
CPageBgFades() {};
|
||||
CPageBgFades() {}
|
||||
CPageBgFades(NLGEORGES::CSoundDialog *soundDialog);
|
||||
~CPageBgFades();
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ class CPageBgFlags : public CPageBase
|
|||
|
||||
// Construction
|
||||
public:
|
||||
CPageBgFlags() {};
|
||||
CPageBgFlags() {}
|
||||
CPageBgFlags(NLGEORGES::CSoundDialog *soundDialog);
|
||||
~CPageBgFlags();
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ class CPageComplex : public CPageBase
|
|||
|
||||
// Construction
|
||||
public:
|
||||
CPageComplex(){};
|
||||
CPageComplex(){}
|
||||
CPageComplex(NLGEORGES::CSoundDialog *soundDialog);
|
||||
~CPageComplex();
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ class CPageComtext : public CPageBase
|
|||
|
||||
// Construction
|
||||
public:
|
||||
CPageComtext(){};
|
||||
CPageComtext(){}
|
||||
CPageComtext(NLGEORGES::CSoundDialog *soundDialog);
|
||||
~CPageComtext();
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue