Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG-- branch : develop
This commit is contained in:
parent
53bae35fc4
commit
675f85c288
28 changed files with 79 additions and 79 deletions
|
@ -224,7 +224,7 @@ public:
|
||||||
// @{
|
// @{
|
||||||
// first param is the associated window.
|
// first param is the associated window.
|
||||||
// Must be a HWND for Windows (WIN32).
|
// Must be a HWND for Windows (WIN32).
|
||||||
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show = true, bool resizeable = true) throw(EBadDisplay) = 0;
|
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show = true, bool resizeable = true) = 0;
|
||||||
// Must be called after a setDisplay that initialize the mode
|
// Must be called after a setDisplay that initialize the mode
|
||||||
virtual bool setMode(const GfxMode &mode) = 0;
|
virtual bool setMode(const GfxMode &mode) = 0;
|
||||||
virtual bool getModes(std::vector<GfxMode> &modes) = 0;
|
virtual bool getModes(std::vector<GfxMode> &modes) = 0;
|
||||||
|
|
|
@ -134,14 +134,14 @@ class CDRU
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/// Portable Function which create a GL Driver (using gl dll...).
|
/// Portable Function which create a GL Driver (using gl dll...).
|
||||||
static IDriver *createGlDriver() throw(EDru);
|
static IDriver *createGlDriver();
|
||||||
|
|
||||||
/// Portable Function which create a GL ES Driver (using gl dll...).
|
/// Portable Function which create a GL ES Driver (using gl dll...).
|
||||||
static IDriver *createGlEsDriver() throw(EDru);
|
static IDriver *createGlEsDriver();
|
||||||
|
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
/// Windows Function which create a Direct3d Driver.
|
/// Windows Function which create a Direct3d Driver.
|
||||||
static IDriver *createD3DDriver() throw(EDru);
|
static IDriver *createD3DDriver();
|
||||||
#endif // NL_OS_WINDOWS
|
#endif // NL_OS_WINDOWS
|
||||||
|
|
||||||
/// \name 2D render.
|
/// \name 2D render.
|
||||||
|
|
|
@ -168,9 +168,9 @@ public:
|
||||||
void clear();
|
void clear();
|
||||||
|
|
||||||
/// Verify the binding of patchs of all zones. throw EBadBind if error.
|
/// Verify the binding of patchs of all zones. throw EBadBind if error.
|
||||||
void checkBinds() throw(EBadBind);
|
void checkBinds();
|
||||||
/// Verify the binding of patchs of one zone. throw EBadBind if error. nop if zone not loaded.
|
/// Verify the binding of patchs of one zone. throw EBadBind if error. nop if zone not loaded.
|
||||||
void checkBinds(uint16 zoneId) throw(EBadBind);
|
void checkBinds(uint16 zoneId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Build tileBank. Call this after loading the near and far tile banks.
|
* Build tileBank. Call this after loading the near and far tile banks.
|
||||||
|
|
|
@ -64,7 +64,7 @@ public:
|
||||||
*
|
*
|
||||||
* You can access the driver with CNELU::Driver.
|
* You can access the driver with CNELU::Driver.
|
||||||
*/
|
*/
|
||||||
static bool initDriver(uint w, uint h, uint bpp=32, bool windowed=true, nlWindow systemWindow=EmptyWindow, bool offscreen=false, bool direct3d=false) throw(EDru);
|
static bool initDriver(uint w, uint h, uint bpp=32, bool windowed=true, nlWindow systemWindow=EmptyWindow, bool offscreen=false, bool direct3d=false);
|
||||||
|
|
||||||
/** Init all that we need for a Scene.
|
/** Init all that we need for a Scene.
|
||||||
* - register scene basics models,
|
* - register scene basics models,
|
||||||
|
@ -108,7 +108,7 @@ public:
|
||||||
* - initScene();
|
* - initScene();
|
||||||
* - initEventServer();
|
* - initEventServer();
|
||||||
*/
|
*/
|
||||||
static bool init(uint w, uint h, CViewport viewport=CViewport(), uint bpp=32, bool windowed=true, nlWindow systemWindow=EmptyWindow, bool offscreen = false, bool direct3d = false) throw(EDru);
|
static bool init(uint w, uint h, CViewport viewport=CViewport(), uint bpp=32, bool windowed=true, nlWindow systemWindow=EmptyWindow, bool offscreen = false, bool direct3d = false);
|
||||||
|
|
||||||
/** Delete all:
|
/** Delete all:
|
||||||
* - releaseEventServer();
|
* - releaseEventServer();
|
||||||
|
|
|
@ -118,7 +118,7 @@ namespace NLGUI
|
||||||
/** read/write between values on a lua stack & a property exported from a 'CReflectable' derived object
|
/** read/write between values on a lua stack & a property exported from a 'CReflectable' derived object
|
||||||
* (throws on error)
|
* (throws on error)
|
||||||
*/
|
*/
|
||||||
static void luaValueToReflectedProperty(CLuaState &ls, int stackIndex, CReflectable &target, const CReflectedProperty &property) throw(ELuaIHMException);
|
static void luaValueToReflectedProperty(CLuaState &ls, int stackIndex, CReflectable &target, const CReflectedProperty &property);
|
||||||
|
|
||||||
// push a reflected property on the stack
|
// push a reflected property on the stack
|
||||||
// NB : no check is done that 'property' is part of the class info of 'reflectedObject'
|
// NB : no check is done that 'property' is part of the class info of 'reflectedObject'
|
||||||
|
|
|
@ -110,7 +110,7 @@ namespace NLGUI
|
||||||
/** create a sub table for this object, with a string as a key
|
/** create a sub table for this object, with a string as a key
|
||||||
* This object must be a table or an exception if thrown
|
* This object must be a table or an exception if thrown
|
||||||
*/
|
*/
|
||||||
CLuaObject newTable(const char *tableName) throw(ELuaNotATable);
|
CLuaObject newTable(const char *tableName);
|
||||||
|
|
||||||
|
|
||||||
/** Set a value in a table.
|
/** Set a value in a table.
|
||||||
|
@ -118,29 +118,29 @@ namespace NLGUI
|
||||||
* NB : value should came from the same lua environment
|
* NB : value should came from the same lua environment
|
||||||
* \TODO other type of keys
|
* \TODO other type of keys
|
||||||
*/
|
*/
|
||||||
void setValue(const char *key, const CLuaObject &value) throw(ELuaNotATable);
|
void setValue(const char *key, const CLuaObject &value);
|
||||||
void setValue(const std::string &key, const CLuaObject &value) throw(ELuaNotATable) { setValue(key.c_str(), value); }
|
void setValue(const std::string &key, const CLuaObject &value) { setValue(key.c_str(), value); }
|
||||||
void setValue(const char *key, const std::string &value) throw(ELuaNotATable);
|
void setValue(const char *key, const std::string &value);
|
||||||
void setValue(const char *key, const char *value) throw(ELuaNotATable);
|
void setValue(const char *key, const char *value);
|
||||||
void setValue(const char *key, bool value) throw(ELuaNotATable);
|
void setValue(const char *key, bool value);
|
||||||
void setValue(const char *key, TLuaWrappedFunction value) throw(ELuaNotATable);
|
void setValue(const char *key, TLuaWrappedFunction value);
|
||||||
void setValue(const char *key, double value) throw(ELuaNotATable);
|
void setValue(const char *key, double value);
|
||||||
void setValue(const char *key, uint32 value) throw(ELuaNotATable);
|
void setValue(const char *key, uint32 value);
|
||||||
void setValue(const char *key, sint32 value) throw(ELuaNotATable);
|
void setValue(const char *key, sint32 value);
|
||||||
void setValue(const char *key, sint64 value) throw(ELuaNotATable);
|
void setValue(const char *key, sint64 value);
|
||||||
void setValue(const std::string &key, const std::string &value) throw(ELuaNotATable) { setValue(key.c_str(), value); }
|
void setValue(const std::string &key, const std::string &value) { setValue(key.c_str(), value); }
|
||||||
void setNil(const char *key) throw(ELuaNotATable);
|
void setNil(const char *key);
|
||||||
void setNil(const std::string &key) throw(ELuaNotATable) { setNil(key.c_str()); }
|
void setNil(const std::string &key) { setNil(key.c_str()); }
|
||||||
/** Erase a value in a table by its key.
|
/** Erase a value in a table by its key.
|
||||||
* If this object is not a table then an exception is thrown.
|
* If this object is not a table then an exception is thrown.
|
||||||
* \TODO other type of keys
|
* \TODO other type of keys
|
||||||
*/
|
*/
|
||||||
void eraseValue(const char *key) throw(ELuaNotATable);
|
void eraseValue(const char *key);
|
||||||
void eraseValue(const std::string &key) throw(ELuaNotATable) { eraseValue(key.c_str()); }
|
void eraseValue(const std::string &key) { eraseValue(key.c_str()); }
|
||||||
// test is this object is enumerable
|
// test is this object is enumerable
|
||||||
bool isEnumerable() const;
|
bool isEnumerable() const;
|
||||||
// Enumeration of a table. If the object is not a table, an exception is thrown.
|
// Enumeration of a table. If the object is not a table, an exception is thrown.
|
||||||
CLuaEnumeration enumerate() throw(ELuaNotATable);
|
CLuaEnumeration enumerate();
|
||||||
// retrieve metatable of an object (or nil if object has no metatable)
|
// retrieve metatable of an object (or nil if object has no metatable)
|
||||||
CLuaObject getMetaTable() const;
|
CLuaObject getMetaTable() const;
|
||||||
// set metatable for this object
|
// set metatable for this object
|
||||||
|
@ -155,7 +155,7 @@ namespace NLGUI
|
||||||
CLuaObject operator[](const std::string &key) const { return operator[](key.c_str()); }
|
CLuaObject operator[](const std::string &key) const { return operator[](key.c_str()); }
|
||||||
/** Checked access to a sub element of a table. An exception is thrown is the element is not a table.
|
/** Checked access to a sub element of a table. An exception is thrown is the element is not a table.
|
||||||
*/
|
*/
|
||||||
CLuaObject at(const char *key) const throw (ELuaNotATable);
|
CLuaObject at(const char *key) const;
|
||||||
CLuaObject at(const std::string &key) const { return at(key.c_str()); }
|
CLuaObject at(const std::string &key) const { return at(key.c_str()); }
|
||||||
|
|
||||||
// Test is that table has the given key. The object must be a table or an exception is thrown
|
// Test is that table has the given key. The object must be a table or an exception is thrown
|
||||||
|
|
|
@ -86,10 +86,10 @@ public:
|
||||||
static void release();
|
static void release();
|
||||||
|
|
||||||
/// Register your class for future Instanciation.
|
/// Register your class for future Instanciation.
|
||||||
static void registerClass(const std::string &className, IClassable* (*creator)(), const std::string &typeidCheck) throw(ERegistry);
|
static void registerClass(const std::string &className, IClassable* (*creator)(), const std::string &typeidCheck);
|
||||||
|
|
||||||
/// Create an object from his class name.
|
/// Create an object from his class name.
|
||||||
static IClassable *create(const std::string &className) throw(ERegistry);
|
static IClassable *create(const std::string &className);
|
||||||
|
|
||||||
/// check if the object has been correctly registered. Must be used for debug only, and Must compile with RTTI.
|
/// check if the object has been correctly registered. Must be used for debug only, and Must compile with RTTI.
|
||||||
static bool checkObject(IClassable* obj);
|
static bool checkObject(IClassable* obj);
|
||||||
|
|
|
@ -108,9 +108,9 @@ public: // Advanced Usage.
|
||||||
/// flush the file.
|
/// flush the file.
|
||||||
void flush();
|
void flush();
|
||||||
/// Seek the file
|
/// Seek the file
|
||||||
bool seek (sint32 offset, IStream::TSeekOrigin origin) const throw(EStream);
|
bool seek (sint32 offset, IStream::TSeekOrigin origin) const;
|
||||||
/// Get the location of the file pointer
|
/// Get the location of the file pointer
|
||||||
sint32 getPos () const throw(EStream);
|
sint32 getPos () const;
|
||||||
|
|
||||||
// Imp the Name of the stream as the name of the file.
|
// Imp the Name of the stream as the name of the file.
|
||||||
virtual std::string getStreamName() const;
|
virtual std::string getStreamName() const;
|
||||||
|
@ -125,7 +125,7 @@ public: // Advanced Usage.
|
||||||
// return true if there's nothing more to read (same as ifstream)
|
// return true if there's nothing more to read (same as ifstream)
|
||||||
bool eof ();
|
bool eof ();
|
||||||
|
|
||||||
virtual void serialBuffer(uint8 *buf, uint len)throw(EReadError);
|
virtual void serialBuffer(uint8 *buf, uint len);
|
||||||
|
|
||||||
/// \name Statistics
|
/// \name Statistics
|
||||||
|
|
||||||
|
@ -148,7 +148,7 @@ public: // Advanced Usage.
|
||||||
static void clearDump ();
|
static void clearDump ();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void serialBit(bool &bit) throw(EReadError);
|
virtual void serialBit(bool &bit);
|
||||||
|
|
||||||
virtual uint getDbgStreamSize() const;
|
virtual uint getDbgStreamSize() const;
|
||||||
|
|
||||||
|
@ -223,20 +223,20 @@ public: // Advanced Usage.
|
||||||
/// flush the file.
|
/// flush the file.
|
||||||
void flush();
|
void flush();
|
||||||
/// Seek the file
|
/// Seek the file
|
||||||
bool seek (sint32 offset, IStream::TSeekOrigin origin) const throw(EStream);
|
bool seek (sint32 offset, IStream::TSeekOrigin origin) const;
|
||||||
/// Get the location of the file pointer
|
/// Get the location of the file pointer
|
||||||
sint32 getPos () const throw(EStream);
|
sint32 getPos () const;
|
||||||
|
|
||||||
// Imp the Name of the stream as the name of the file.
|
// Imp the Name of the stream as the name of the file.
|
||||||
virtual std::string getStreamName() const;
|
virtual std::string getStreamName() const;
|
||||||
|
|
||||||
// very useful to serialize string in text mode (without the size)
|
// very useful to serialize string in text mode (without the size)
|
||||||
virtual void serialBuffer(uint8 *buf, uint len) throw(EWriteError);
|
virtual void serialBuffer(uint8 *buf, uint len);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// Internal close.
|
/// Internal close.
|
||||||
void internalClose(bool success);
|
void internalClose(bool success);
|
||||||
virtual void serialBit(bool &bit) throw(EWriteError);
|
virtual void serialBit(bool &bit);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
FILE *_F;
|
FILE *_F;
|
||||||
|
|
|
@ -197,7 +197,7 @@ public:
|
||||||
* \return true if seek sucessfull.
|
* \return true if seek sucessfull.
|
||||||
* \see ESeekNotSupported SeekOrigin getPos
|
* \see ESeekNotSupported SeekOrigin getPos
|
||||||
*/
|
*/
|
||||||
virtual bool seek (sint32 offset, TSeekOrigin origin) const throw(EStream);
|
virtual bool seek (sint32 offset, TSeekOrigin origin) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the location of the stream pointer.
|
* Get the location of the stream pointer.
|
||||||
|
|
|
@ -177,10 +177,10 @@ public:
|
||||||
uint32 getCount() { return _IdCounter; }
|
uint32 getCount() { return _IdCounter; }
|
||||||
|
|
||||||
// helper serialize a string id as a string
|
// helper serialize a string id as a string
|
||||||
void serial(NLMISC::IStream &f, TSStringId &strId) throw(EStream);
|
void serial(NLMISC::IStream &f, TSStringId &strId);
|
||||||
|
|
||||||
// helper serialize a string id vector
|
// helper serialize a string id vector
|
||||||
void serial(NLMISC::IStream &f, std::vector<TSStringId> &strIdVect) throw(EStream);
|
void serial(NLMISC::IStream &f, std::vector<TSStringId> &strIdVect);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@ public:
|
||||||
return _LengthR;
|
return _LengthR;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual sint32 getPos () const throw(NLMISC::EStream)
|
virtual sint32 getPos() const
|
||||||
{
|
{
|
||||||
// return (_BufPos - _Buffer.getPtr()) - _SubMessagePosR;
|
// return (_BufPos - _Buffer.getPtr()) - _SubMessagePosR;
|
||||||
return _Buffer.Pos - _SubMessagePosR;
|
return _Buffer.Pos - _SubMessagePosR;
|
||||||
|
|
|
@ -779,10 +779,10 @@ namespace NLNET
|
||||||
// Init base module, init module name
|
// Init base module, init module name
|
||||||
bool initModule(const TParsedCommandLine &initInfo);
|
bool initModule(const TParsedCommandLine &initInfo);
|
||||||
|
|
||||||
void plugModule(IModuleSocket *moduleSocket) throw (EModuleAlreadyPluggedHere);
|
void plugModule(IModuleSocket *moduleSocket);
|
||||||
void unplugModule(IModuleSocket *moduleSocket) throw (EModuleNotPluggedHere);
|
void unplugModule(IModuleSocket *moduleSocket) throw (EModuleNotPluggedHere);
|
||||||
void getPluggedSocketList(std::vector<IModuleSocket*> &resultList);
|
void getPluggedSocketList(std::vector<IModuleSocket*> &resultList);
|
||||||
void invokeModuleOperation(IModuleProxy *destModule, const NLNET::CMessage &opMsg, NLNET::CMessage &resultMsg) throw (EInvokeFailed);
|
void invokeModuleOperation(IModuleProxy *destModule, const NLNET::CMessage &opMsg, NLNET::CMessage &resultMsg);
|
||||||
void _onModuleUp(IModuleProxy *removedProxy);
|
void _onModuleUp(IModuleProxy *removedProxy);
|
||||||
void _onModuleDown(IModuleProxy *removedProxy);
|
void _onModuleDown(IModuleProxy *removedProxy);
|
||||||
|
|
||||||
|
|
|
@ -346,9 +346,9 @@ namespace NLNET
|
||||||
virtual const std::string &getClassName() const =0;
|
virtual const std::string &getClassName() const =0;
|
||||||
|
|
||||||
/// The gateway send a command message to the transport
|
/// The gateway send a command message to the transport
|
||||||
virtual void onCommand(const CMessage &command) throw (EInvalidCommand) = 0;
|
virtual void onCommand(const CMessage &command) = 0;
|
||||||
/// The gateway send a textual command to the transport
|
/// The gateway send a textual command to the transport
|
||||||
virtual bool onCommand(const TParsedCommandLine &command) throw (EInvalidCommand) = 0;
|
virtual bool onCommand(const TParsedCommandLine &command) = 0;
|
||||||
|
|
||||||
/// The gateway update the transport regularly
|
/// The gateway update the transport regularly
|
||||||
virtual void update() =0;
|
virtual void update() =0;
|
||||||
|
|
|
@ -849,7 +849,7 @@ public:
|
||||||
|
|
||||||
// Mode initialisation, requests
|
// Mode initialisation, requests
|
||||||
virtual bool init (uintptr_t windowIcon = 0, emptyProc exitFunc = 0);
|
virtual bool init (uintptr_t windowIcon = 0, emptyProc exitFunc = 0);
|
||||||
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable) throw(EBadDisplay);
|
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable
|
||||||
virtual bool release();
|
virtual bool release();
|
||||||
virtual bool setMode(const GfxMode& mode);
|
virtual bool setMode(const GfxMode& mode);
|
||||||
virtual bool getModes(std::vector<GfxMode> &modes);
|
virtual bool getModes(std::vector<GfxMode> &modes);
|
||||||
|
|
|
@ -325,7 +325,7 @@ public:
|
||||||
virtual void disableHardwareVertexArrayAGP();
|
virtual void disableHardwareVertexArrayAGP();
|
||||||
virtual void disableHardwareTextureShader();
|
virtual void disableHardwareTextureShader();
|
||||||
|
|
||||||
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable) throw(EBadDisplay);
|
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable);
|
||||||
virtual bool setMode(const GfxMode& mode);
|
virtual bool setMode(const GfxMode& mode);
|
||||||
virtual bool getModes(std::vector<GfxMode> &modes);
|
virtual bool getModes(std::vector<GfxMode> &modes);
|
||||||
virtual bool getCurrentScreenMode(GfxMode &mode);
|
virtual bool getCurrentScreenMode(GfxMode &mode);
|
||||||
|
|
|
@ -271,7 +271,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
CLuaObject CLuaObject::at(const char *key) const throw(ELuaNotATable)
|
CLuaObject CLuaObject::at(const char *key) const
|
||||||
{
|
{
|
||||||
if (!isEnumerable()) throw ELuaNotATable(NLMISC::toString("Can't get key '%s' in object '%s' because type is '%s', it is not a table.", key, getId().c_str(), getTypename()).c_str());
|
if (!isEnumerable()) throw ELuaNotATable(NLMISC::toString("Can't get key '%s' in object '%s' because type is '%s', it is not a table.", key, getId().c_str(), getTypename()).c_str());
|
||||||
return operator[](key);
|
return operator[](key);
|
||||||
|
@ -286,7 +286,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
CLuaObject CLuaObject::newTable(const char *tableName) throw(ELuaNotATable)
|
CLuaObject CLuaObject::newTable(const char *tableName)
|
||||||
{
|
{
|
||||||
nlassert(tableName);
|
nlassert(tableName);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -301,7 +301,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, const CLuaObject &value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, const CLuaObject &value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -331,7 +331,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, const char *value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, const char *value)
|
||||||
{
|
{
|
||||||
nlassert(value);
|
nlassert(value);
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
|
@ -346,13 +346,13 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, const std::string &value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, const std::string &value)
|
||||||
{
|
{
|
||||||
setValue(key, value.c_str());
|
setValue(key, value.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, bool value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, bool value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -366,7 +366,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, TLuaWrappedFunction value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, TLuaWrappedFunction value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -380,7 +380,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, double value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, double value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -394,7 +394,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, uint32 value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, uint32 value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -408,7 +408,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, sint32 value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, sint32 value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -422,7 +422,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::setValue(const char *key, sint64 value) throw(ELuaNotATable)
|
void CLuaObject::setValue(const char *key, sint64 value)
|
||||||
{
|
{
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
|
@ -436,7 +436,7 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
// *************************************************
|
// *************************************************
|
||||||
void CLuaObject::eraseValue(const char *key) throw(ELuaNotATable)
|
void CLuaObject::eraseValue(const char *key)
|
||||||
{
|
{
|
||||||
nlassert(isValid());
|
nlassert(isValid());
|
||||||
nlassert(key);
|
nlassert(key);
|
||||||
|
|
|
@ -453,7 +453,7 @@ void CIFile::serialBit(bool &bit) throw(EReadError)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================================================================
|
// ======================================================================================================
|
||||||
bool CIFile::seek (sint32 offset, IStream::TSeekOrigin origin) const throw(EStream)
|
bool CIFile::seek (sint32 offset, IStream::TSeekOrigin origin) const
|
||||||
{
|
{
|
||||||
if ((_CacheFileOnOpen) && (_Cache == NULL))
|
if ((_CacheFileOnOpen) && (_Cache == NULL))
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -107,7 +107,7 @@ void CMemStream::serialBit(bool &bit)
|
||||||
* (to prevent from an "inside serial" to increment it).
|
* (to prevent from an "inside serial" to increment it).
|
||||||
* Then a seek(end) would get back to the pointer.
|
* Then a seek(end) would get back to the pointer.
|
||||||
*/
|
*/
|
||||||
bool CMemStream::seek (sint32 offset, TSeekOrigin origin) const throw(EStream)
|
bool CMemStream::seek (sint32 offset, TSeekOrigin origin) const
|
||||||
{
|
{
|
||||||
switch (origin)
|
switch (origin)
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,7 +56,7 @@ public:
|
||||||
CVector Heading;
|
CVector Heading;
|
||||||
//CVMatrix Matrix;
|
//CVMatrix Matrix;
|
||||||
public:
|
public:
|
||||||
void serial(NLMISC::IStream &f) throw(EStream)
|
void serial(NLMISC::IStream &f)
|
||||||
{
|
{
|
||||||
f.serial(Date);
|
f.serial(Date);
|
||||||
f.serial(Pos);
|
f.serial(Pos);
|
||||||
|
|
|
@ -216,13 +216,13 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void onCommand(const CMessage &/* command */) throw (IGatewayTransport::EInvalidCommand)
|
void onCommand(const CMessage &/* command */)
|
||||||
{
|
{
|
||||||
// nothing done for now
|
// nothing done for now
|
||||||
throw EInvalidCommand();
|
throw EInvalidCommand();
|
||||||
}
|
}
|
||||||
/// The gateway send a textual command to the transport
|
/// The gateway send a textual command to the transport
|
||||||
bool onCommand(const TParsedCommandLine &command) throw (IGatewayTransport::EInvalidCommand)
|
bool onCommand(const TParsedCommandLine &command)
|
||||||
{
|
{
|
||||||
if (command.SubParams.size() < 1)
|
if (command.SubParams.size() < 1)
|
||||||
throw EInvalidCommand();
|
throw EInvalidCommand();
|
||||||
|
@ -256,7 +256,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Open the connection by intercepting client gateway message
|
/// Open the connection by intercepting client gateway message
|
||||||
void open() throw (ETransportError)
|
void open()
|
||||||
{
|
{
|
||||||
if (_Open)
|
if (_Open)
|
||||||
{
|
{
|
||||||
|
|
|
@ -101,7 +101,7 @@ struct EPatchDownloadException : public Exception
|
||||||
{
|
{
|
||||||
EPatchDownloadException() : Exception( "Download Error" ) {}
|
EPatchDownloadException() : Exception( "Download Error" ) {}
|
||||||
EPatchDownloadException( const std::string& str ) : Exception( str ) {}
|
EPatchDownloadException( const std::string& str ) : Exception( str ) {}
|
||||||
virtual ~EPatchDownloadException() throw() {}
|
virtual ~EPatchDownloadException() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4370,7 +4370,7 @@ void CEditor::setCurrentTool(CTool *tool)
|
||||||
}
|
}
|
||||||
|
|
||||||
// *********************************************************************************************************
|
// *********************************************************************************************************
|
||||||
CLuaObject CEditor::getClasses() throw(ELuaError)
|
CLuaObject CEditor::getClasses()
|
||||||
{
|
{
|
||||||
//H_AUTO(R2_getClasses_throw)
|
//H_AUTO(R2_getClasses_throw)
|
||||||
CHECK_EDITOR
|
CHECK_EDITOR
|
||||||
|
|
|
@ -421,7 +421,7 @@ public:
|
||||||
// get table for registry in lua environment
|
// get table for registry in lua environment
|
||||||
CLuaObject &getRegistry() { return _Registry; }
|
CLuaObject &getRegistry() { return _Registry; }
|
||||||
// get lua classes (the r2.Classes table)
|
// get lua classes (the r2.Classes table)
|
||||||
CLuaObject getClasses() throw(ELuaError);
|
CLuaObject getClasses();
|
||||||
// get R2 environment (the 'r2' table into lua global environment)
|
// get R2 environment (the 'r2' table into lua global environment)
|
||||||
CLuaObject &getEnv();
|
CLuaObject &getEnv();
|
||||||
// get the config table (that is the 'r2.Config' table)
|
// get the config table (that is the 'r2.Config' table)
|
||||||
|
|
|
@ -54,7 +54,7 @@ public:
|
||||||
virtual CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException) = 0;
|
virtual CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException) = 0;
|
||||||
virtual std::string getName () const =0;
|
virtual std::string getName () const =0;
|
||||||
|
|
||||||
static CFightScriptCompReader *getScriptReader (const std::string &str) throw (ReadFightActionException);
|
static CFightScriptCompReader *getScriptReader (const std::string &str);
|
||||||
|
|
||||||
static CFightScriptComp *createScriptComp (const std::string &str) throw (ReadFightActionException);
|
static CFightScriptComp *createScriptComp (const std::string &str) throw (ReadFightActionException);
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -298,7 +298,7 @@ public:
|
||||||
|
|
||||||
static CToken* getToken (std::string const& tokenName);
|
static CToken* getToken (std::string const& tokenName);
|
||||||
static NLMISC::CSmartPtr<CRule> getRule (std::string const& ruleName);
|
static NLMISC::CSmartPtr<CRule> getRule (std::string const& ruleName);
|
||||||
static bool getNextToken (std::string const& text, size_t& index, std::string& tokenName, std::string& textValue) throw (EScriptError);
|
static bool getNextToken (std::string const& text, size_t& index, std::string& tokenName, std::string& textValue);
|
||||||
static std::string const& getOpcodeName (AIVM::CScriptVM::EOpcode const& op);
|
static std::string const& getOpcodeName (AIVM::CScriptVM::EOpcode const& op);
|
||||||
static AIVM::CScriptVM::EOpcode getOpcodeAndValue (std::string const& str, std::string& value);
|
static AIVM::CScriptVM::EOpcode getOpcodeAndValue (std::string const& str, std::string& value);
|
||||||
static CScriptNativeFuncParams* getNativeFunc (std::string const& funcName, std::string const& inparams, std::string const& outparams);
|
static CScriptNativeFuncParams* getNativeFunc (std::string const& funcName, std::string const& inparams, std::string const& outparams);
|
||||||
|
|
|
@ -521,36 +521,36 @@ public:
|
||||||
* \param var is the name of the variable
|
* \param var is the name of the variable
|
||||||
* \return ref on the stat value
|
* \return ref on the stat value
|
||||||
*/
|
*/
|
||||||
sint32& lookupStat( const std::string& stat ) throw (EInvalidStat);
|
sint32& lookupStat( const std::string& stat);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a reference on a characterristics value
|
* get a reference on a characterristics value
|
||||||
* \param c is enum of characteristic, st is enum of subtype of characterisitics (like max, current..)
|
* \param c is enum of characteristic, st is enum of subtype of characterisitics (like max, current..)
|
||||||
* \return ref on the stat value
|
* \return ref on the stat value
|
||||||
*/
|
*/
|
||||||
sint32& lookupStat( CHARACTERISTICS::TCharacteristics c, SCharacteristicsAndScores::TCharacteristicsAndScoreSubType st ) throw (CEntityBase::EInvalidStat);
|
sint32& lookupStat( CHARACTERISTICS::TCharacteristics c, SCharacteristicsAndScores::TCharacteristicsAndScoreSubType st);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a reference on a scores value
|
* get a reference on a scores value
|
||||||
* \param score is enum of score, st is enum of subtype of score (like max, current..)
|
* \param score is enum of score, st is enum of subtype of score (like max, current..)
|
||||||
* \return ref on the stat value
|
* \return ref on the stat value
|
||||||
*/
|
*/
|
||||||
sint32& lookupStat( SCORES::TScores score, SCharacteristicsAndScores::TCharacteristicsAndScoreSubType st ) throw (CEntityBase::EInvalidStat);
|
sint32& lookupStat( SCORES::TScores score, SCharacteristicsAndScores::TCharacteristicsAndScoreSubType st);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a reference on a skill value
|
* get a reference on a skill value
|
||||||
* \param skill is enum of Skills, st is enum of subtype of skill (like base, current..)
|
* \param skill is enum of Skills, st is enum of subtype of skill (like base, current..)
|
||||||
* \return ref on the stat value
|
* \return ref on the stat value
|
||||||
*/
|
*/
|
||||||
sint32& lookupStat( SKILLS::ESkills skill, SSkill::ESkillSubType st ) throw (CEntityBase::EInvalidStat);
|
sint32& lookupStat( SKILLS::ESkills skill, SSkill::ESkillSubType st);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a reference on a SpecialModifiers value
|
* get a reference on a SpecialModifiers value
|
||||||
* \param sm is enum of SpecialModifiers
|
* \param sm is enum of SpecialModifiers
|
||||||
* \return ref on the stat value
|
* \return ref on the stat value
|
||||||
*/
|
*/
|
||||||
sint32& lookupStat( CSpecialModifiers::ESpecialModifiers sm ) throw (CEntityBase::EInvalidStat);
|
sint32& lookupStat( CSpecialModifiers::ESpecialModifiers sm);
|
||||||
const sint32& lookupStat( CSpecialModifiers::ESpecialModifiers sm ) const throw (CEntityBase::EInvalidStat);
|
const sint32& lookupStat( CSpecialModifiers::ESpecialModifiers sm) const;
|
||||||
|
|
||||||
/// accessors on hp (read only)
|
/// accessors on hp (read only)
|
||||||
inline sint32 currentHp() const { return _PhysScores._PhysicalScores[SCORES::hit_points].Current;}
|
inline sint32 currentHp() const { return _PhysScores._PhysicalScores[SCORES::hit_points].Current;}
|
||||||
|
|
|
@ -83,7 +83,7 @@ public:
|
||||||
virtual void setContinent( CONTINENT::TContinent continent ) = 0;
|
virtual void setContinent( CONTINENT::TContinent continent ) = 0;
|
||||||
|
|
||||||
// // serial
|
// // serial
|
||||||
// virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream ) = 0;
|
// virtual void serial(NLMISC::IStream &f) = 0;
|
||||||
|
|
||||||
// set item for sale
|
// set item for sale
|
||||||
virtual void itemForSale( uint32 price, uint32 retirePrice, CGameItemPtr item, uint32 quantity, const NLMISC::CEntityId& id, CONTINENT::TContinent continent, uint32 identifier ) = 0;
|
virtual void itemForSale( uint32 price, uint32 retirePrice, CGameItemPtr item, uint32 quantity, const NLMISC::CEntityId& id, CONTINENT::TContinent continent, uint32 identifier ) = 0;
|
||||||
|
@ -190,7 +190,7 @@ public:
|
||||||
void itemForSale( uint32 price, uint32 retirePrice, CGameItemPtr item, uint32 quantity, const NLMISC::CEntityId& id, CONTINENT::TContinent continent, uint32 identifier );
|
void itemForSale( uint32 price, uint32 retirePrice, CGameItemPtr item, uint32 quantity, const NLMISC::CEntityId& id, CONTINENT::TContinent continent, uint32 identifier );
|
||||||
|
|
||||||
// serial
|
// serial
|
||||||
// void serial(NLMISC::IStream &f) throw(NLMISC::EStream );
|
// void serial(NLMISC::IStream &f);
|
||||||
|
|
||||||
// cast operator
|
// cast operator
|
||||||
// const IItemTrade * operator = ( CItemForSale * i ) const { return (IItemTrade *) i; }
|
// const IItemTrade * operator = ( CItemForSale * i ) const { return (IItemTrade *) i; }
|
||||||
|
|
|
@ -55,7 +55,7 @@ public:
|
||||||
const std::vector< TItemTradePtr >& getContent() const { return _ItemsForSale; }
|
const std::vector< TItemTradePtr >& getContent() const { return _ItemsForSale; }
|
||||||
|
|
||||||
// serial
|
// serial
|
||||||
void serial(NLMISC::IStream &f) throw(NLMISC::EStream );
|
void serial(NLMISC::IStream &f);
|
||||||
|
|
||||||
// check coherency between CDynamicItems and CItemsForSale of character, assume CItemsForSale is a reference
|
// check coherency between CDynamicItems and CItemsForSale of character, assume CItemsForSale is a reference
|
||||||
void checkSellStore( NLMISC::CEntityId charId );
|
void checkSellStore( NLMISC::CEntityId charId );
|
||||||
|
|
Loading…
Reference in a new issue