From c31426e103c0f371eafb778e8d6ca35f7d259944 Mon Sep 17 00:00:00 2001 From: tamlin Date: Wed, 20 Jul 2016 19:54:15 +0200 Subject: [PATCH] Added a bunch of nothrow declaration in an attempt to reduce the large number of exception handlers generated. --- src/xrCore/_flags.h | 36 ++-- src/xrGame/alife_anomalous_zone.cpp | 2 +- src/xrGame/alife_object.cpp | 2 +- src/xrGame/alife_online_offline_group.cpp | 9 +- src/xrScriptEngine/ScriptExportMacros.hpp | 2 +- src/xrServerEntities/xrServer_Object_Base.h | 2 +- src/xrServerEntities/xrServer_Objects.h | 2 +- .../xrServer_Objects_ALife.cpp | 58 +++--- src/xrServerEntities/xrServer_Objects_ALife.h | 56 +++--- .../xrServer_Objects_ALife_Items.cpp | 11 +- .../xrServer_Objects_ALife_Items.h | 8 +- .../xrServer_Objects_ALife_Monsters.cpp | 18 +- .../xrServer_Objects_ALife_Monsters.h | 22 +-- .../xrServer_Objects_Alife_Smartcovers.cpp | 12 +- .../xrServer_Objects_Alife_Smartcovers.h | 10 +- .../xrServer_script_macroses.h | 176 +++++++++--------- 16 files changed, 215 insertions(+), 211 deletions(-) diff --git a/src/xrCore/_flags.h b/src/xrCore/_flags.h index 99f6f10df6f..0357fe0aa5c 100644 --- a/src/xrCore/_flags.h +++ b/src/xrCore/_flags.h @@ -15,43 +15,43 @@ struct _flags public: T flags; - TYPE get() const { return flags; } - SelfRef zero() + TYPE get() const throw() { return flags; } + SelfRef zero() throw() { flags = T(0); return *this; } - SelfRef one() + SelfRef one() throw() { flags = T(-1); return *this; } - SelfRef invert() + SelfRef invert() throw() { flags = ~flags; return *this; } - SelfRef invert(const Self& f) + SelfRef invert(const Self& f) throw() { flags = ~f.flags; return *this; } - SelfRef invert(const T mask) + SelfRef invert(const T mask) throw() { flags ^= mask; return *this; } - SelfRef assign(const Self& f) + SelfRef assign(const Self& f) throw() { flags = f.flags; return *this; } - SelfRef assign(const T mask) + SelfRef assign(const T mask) throw() { flags = mask; return *this; } - SelfRef set(const T mask, BOOL value) + SelfRef set(const T mask, BOOL value) throw() { if (value) flags |= mask; @@ -59,31 +59,31 @@ struct _flags flags &= ~mask; return *this; } - BOOL is(const T mask) const { return mask == (flags & mask); } - BOOL is_any(const T mask) const { return BOOL(!!(flags & mask)); } - BOOL test(const T mask) const { return BOOL(!!(flags & mask)); } - SelfRef or (const T mask) + BOOL is(const T mask) const throw() { return mask == (flags & mask); } + BOOL is_any(const T mask) const throw() { return BOOL(!!(flags & mask)); } + BOOL test(const T mask) const throw() { return BOOL(!!(flags & mask)); } + SelfRef or (const T mask) throw() { flags |= mask; return *this; } - SelfRef or (const Self& f, const T mask) + SelfRef or (const Self& f, const T mask) throw() { flags = f.flags | mask; return *this; } - SelfRef and (const T mask) + SelfRef and (const T mask) throw() { flags &= mask; return *this; } - SelfRef and (const Self& f, const T mask) + SelfRef and (const Self& f, const T mask) throw() { flags = f.flags & mask; return *this; } - BOOL equal(const Self& f) const { return flags == f.flags; } - BOOL equal(const Self& f, const T mask) const { return (flags & mask) == (f.flags & mask); } + BOOL equal(const Self& f) const throw() { return flags == f.flags; } + BOOL equal(const Self& f, const T mask) const throw() { return (flags & mask) == (f.flags & mask); } }; typedef _flags Flags8; diff --git a/src/xrGame/alife_anomalous_zone.cpp b/src/xrGame/alife_anomalous_zone.cpp index 330fd3f9fdb..72e9908be9e 100644 --- a/src/xrGame/alife_anomalous_zone.cpp +++ b/src/xrGame/alife_anomalous_zone.cpp @@ -131,4 +131,4 @@ void CSE_ALifeAnomalousZone::on_spawn() // spawn_artefacts (); } -bool CSE_ALifeAnomalousZone::keep_saved_data_anyway() const { return (true); } +bool CSE_ALifeAnomalousZone::keep_saved_data_anyway() const throw() { return true; } diff --git a/src/xrGame/alife_object.cpp b/src/xrGame/alife_object.cpp index a50155b7b14..768b8f9302a 100644 --- a/src/xrGame/alife_object.cpp +++ b/src/xrGame/alife_object.cpp @@ -84,4 +84,4 @@ void CSE_ALifeObject::spawn_supplies(LPCSTR ini_string) } } -bool CSE_ALifeObject::keep_saved_data_anyway() const { return (false); } +bool CSE_ALifeObject::keep_saved_data_anyway() const throw() { return false; } diff --git a/src/xrGame/alife_online_offline_group.cpp b/src/xrGame/alife_online_offline_group.cpp index 56546f441fb..58e306b4c5f 100644 --- a/src/xrGame/alife_online_offline_group.cpp +++ b/src/xrGame/alife_online_offline_group.cpp @@ -58,10 +58,11 @@ void CSE_ALifeOnlineOfflineGroup::update() MEMBERS::iterator E = m_members.end(); for (; I != E; ++I) { - ((*I).second)->o_Position = o_Position; - ((*I).second)->m_tNodeID = m_tNodeID; - ((*I).second)->m_tGraphID = m_tGraphID; - ((*I).second)->m_fDistance = m_fDistance; + MEMBER* m = (*I).second; + m->o_Position = o_Position; + m->m_tNodeID = m_tNodeID; + m->m_tGraphID = m_tGraphID; + m->m_fDistance = m_fDistance; } return; } diff --git a/src/xrScriptEngine/ScriptExportMacros.hpp b/src/xrScriptEngine/ScriptExportMacros.hpp index 83899ee79d7..cda82ace2b2 100644 --- a/src/xrScriptEngine/ScriptExportMacros.hpp +++ b/src/xrScriptEngine/ScriptExportMacros.hpp @@ -60,7 +60,7 @@ #endif #define DEFINE_LUA_WRAPPER_CONST_METHOD_0(v_func_name, ret_type) \ - virtual ret_type v_func_name() const \ + virtual ret_type v_func_name() const throw()\ { \ try \ { \ diff --git a/src/xrServerEntities/xrServer_Object_Base.h b/src/xrServerEntities/xrServer_Object_Base.h index 4d9a01b2349..6e709f373ac 100644 --- a/src/xrServerEntities/xrServer_Object_Base.h +++ b/src/xrServerEntities/xrServer_Object_Base.h @@ -152,7 +152,7 @@ class CSE_Abstract : public IServerEntity, public CPureServerObject, public CScr virtual CSE_Abstract* base(); virtual const CSE_Abstract* base() const; virtual CSE_Abstract* init(); - virtual bool match_configuration() const { return true; } + virtual bool match_configuration() const throw() { return true; } // end of the virtual inheritance dependant code IC int script_clsid() const { diff --git a/src/xrServerEntities/xrServer_Objects.h b/src/xrServerEntities/xrServer_Objects.h index 80526f351a5..0c8a9bfeff8 100644 --- a/src/xrServerEntities/xrServer_Objects.h +++ b/src/xrServerEntities/xrServer_Objects.h @@ -228,7 +228,7 @@ class CSE_PHSkeleton SPHBonesData saved_bones; u16 source_id; // for break only virtual void load(NET_Packet& tNetPacket); - virtual bool need_save() const { return (!_flags.test(flNotSave)); } + virtual bool need_save() const throw() { return !_flags.test(flNotSave); } virtual void set_sorce_id(u16 si) { source_id = si; } virtual u16 get_source_id() { return source_id; } virtual CSE_Abstract* cast_abstract() { return 0; } diff --git a/src/xrServerEntities/xrServer_Objects_ALife.cpp b/src/xrServerEntities/xrServer_Objects_ALife.cpp index 99c489dce41..e56a8f0e25e 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife.cpp @@ -534,19 +534,21 @@ u32 CSE_ALifeObject::ef_detector_type() const return (u32(-1)); } -bool CSE_ALifeObject::used_ai_locations() const { return (!!m_flags.is(flUsedAI_Locations)); } -bool CSE_ALifeObject::can_switch_online() const { return (match_configuration() && !!m_flags.is(flSwitchOnline)); } -bool CSE_ALifeObject::can_switch_offline() const { return (!match_configuration() || !!m_flags.is(flSwitchOffline)); } -bool CSE_ALifeObject::can_save() const { return (!!m_flags.is(flCanSave)); } -bool CSE_ALifeObject::interactive() const -{ - return (!!m_flags.is(flInteractive) && !!m_flags.is(flVisibleForAI) && !!m_flags.is(flUsefulForAI)); -} +bool CSE_ALifeObject::used_ai_locations() const throw() +{ return !!m_flags.is(flUsedAI_Locations); } +bool CSE_ALifeObject::can_switch_online() const throw() +{ return match_configuration() && !!m_flags.is(flSwitchOnline); } +bool CSE_ALifeObject::can_switch_offline() const throw() +{ return !match_configuration() || !!m_flags.is(flSwitchOffline); } +bool CSE_ALifeObject::can_save() const throw() +{ return !!m_flags.is(flCanSave); } +bool CSE_ALifeObject::interactive() const throw() +{ return !!m_flags.is(flInteractive) && !!m_flags.is(flVisibleForAI) && !!m_flags.is(flUsefulForAI); } void CSE_ALifeObject::use_ai_locations(bool value) { m_flags.set(flUsedAI_Locations, BOOL(value)); } -void CSE_ALifeObject::can_switch_online(bool value) { m_flags.set(flSwitchOnline, BOOL(value)); } -void CSE_ALifeObject::can_switch_offline(bool value) { m_flags.set(flSwitchOffline, BOOL(value)); } -void CSE_ALifeObject::interactive(bool value) { m_flags.set(flInteractive, BOOL(value)); } +void CSE_ALifeObject::can_switch_online(bool value) throw() { m_flags.set(flSwitchOnline, BOOL(value)); } +void CSE_ALifeObject::can_switch_offline(bool value) throw() { m_flags.set(flSwitchOffline, BOOL(value)); } +void CSE_ALifeObject::interactive(bool value) throw() { m_flags.set(flInteractive, BOOL(value)); } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeGroupAbstract //////////////////////////////////////////////////////////////////////////// @@ -688,8 +690,8 @@ void CSE_ALifePHSkeletonObject::UPDATE_Read(NET_Packet& tNetPacket) inherited2::UPDATE_Read(tNetPacket); }; -bool CSE_ALifePHSkeletonObject::can_save() const { return CSE_PHSkeleton::need_save(); } -bool CSE_ALifePHSkeletonObject::used_ai_locations() const { return false; } +bool CSE_ALifePHSkeletonObject::can_save() const throw() { return CSE_PHSkeleton::need_save(); } +bool CSE_ALifePHSkeletonObject::used_ai_locations() const throw() { return false; } #ifndef XRGAME_EXPORTS void CSE_ALifePHSkeletonObject::FillProps(LPCSTR pref, PropItemVec& items) { @@ -711,8 +713,8 @@ CSE_ALifeSpaceRestrictor::CSE_ALifeSpaceRestrictor(LPCSTR caSection) : CSE_ALife } CSE_ALifeSpaceRestrictor::~CSE_ALifeSpaceRestrictor() {} -bool CSE_ALifeSpaceRestrictor::can_switch_offline() const { return (false); } -bool CSE_ALifeSpaceRestrictor::used_ai_locations() const { return (false); } +bool CSE_ALifeSpaceRestrictor::can_switch_offline() const throw() { return false; } +bool CSE_ALifeSpaceRestrictor::used_ai_locations() const throw() { return false; } IServerEntityShape* CSE_ALifeSpaceRestrictor::shape() { return (this); } void CSE_ALifeSpaceRestrictor::STATE_Read(NET_Packet& tNetPacket, u16 size) { @@ -1133,8 +1135,8 @@ void CSE_ALifeObjectPhysic::FillProps(LPCSTR pref, PropItemVec& values) } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeObjectPhysic::used_ai_locations() const { return (false); } -bool CSE_ALifeObjectPhysic::can_save() const { return CSE_PHSkeleton::need_save(); } +bool CSE_ALifeObjectPhysic::used_ai_locations() const throw() { return false; } +bool CSE_ALifeObjectPhysic::can_save() const throw() { return CSE_PHSkeleton::need_save(); } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeObjectHangingLamp //////////////////////////////////////////////////////////////////////////// @@ -1403,7 +1405,7 @@ CDUInterface* du, IServerEntityLEOwner* owner, bool bSelected, const Fmatrix& pa } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeObjectHangingLamp::used_ai_locations() const { return (false); } +bool CSE_ALifeObjectHangingLamp::used_ai_locations() const throw() { return false; } bool CSE_ALifeObjectHangingLamp::validate() { if (flags.test(flR1) || flags.test(flR2)) @@ -1413,7 +1415,7 @@ bool CSE_ALifeObjectHangingLamp::validate() return (false); } -bool CSE_ALifeObjectHangingLamp::match_configuration() const +bool CSE_ALifeObjectHangingLamp::match_configuration() const throw() { R_ASSERT3(flags.test(flR1) || flags.test(flR2), "no renderer type set for hanging-lamp ", name_replace()); #ifdef XRGAME_EXPORTS @@ -1443,7 +1445,7 @@ void CSE_ALifeObjectProjector::UPDATE_Write(NET_Packet& tNetPacket) { inherited: void CSE_ALifeObjectProjector::FillProps(LPCSTR pref, PropItemVec& values) { inherited::FillProps(pref, values); } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeObjectProjector::used_ai_locations() const { return (false); } +bool CSE_ALifeObjectProjector::used_ai_locations() const throw() { return false; } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeSchedulable //////////////////////////////////////////////////////////////////////////// @@ -1547,7 +1549,7 @@ void CSE_ALifeHelicopter::load(NET_Packet& tNetPacket) inherited1::load(tNetPacket); inherited3::load(tNetPacket); } -bool CSE_ALifeHelicopter::can_save() const { return CSE_PHSkeleton::need_save(); } +bool CSE_ALifeHelicopter::can_save() const throw() { return CSE_PHSkeleton::need_save(); } #ifndef XRGAME_EXPORTS void CSE_ALifeHelicopter::FillProps(LPCSTR pref, PropItemVec& values) { @@ -1559,7 +1561,7 @@ void CSE_ALifeHelicopter::FillProps(LPCSTR pref, PropItemVec& values) } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeHelicopter::used_ai_locations() const { return (false); } +bool CSE_ALifeHelicopter::used_ai_locations() const throw() { return false; } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeCar //////////////////////////////////////////////////////////////////////////// @@ -1606,8 +1608,8 @@ void CSE_ALifeCar::UPDATE_Write(NET_Packet& tNetPacket) inherited2::UPDATE_Write(tNetPacket); } -bool CSE_ALifeCar::used_ai_locations() const { return (false); } -bool CSE_ALifeCar::can_save() const { return CSE_PHSkeleton::need_save(); } +bool CSE_ALifeCar::used_ai_locations() const throw() { return false; } +bool CSE_ALifeCar::can_save() const throw() { return CSE_PHSkeleton::need_save(); } void CSE_ALifeCar::load(NET_Packet& tNetPacket) { inherited1::load(tNetPacket); @@ -1722,8 +1724,8 @@ void CSE_ALifeObjectBreakable::FillProps(LPCSTR pref, PropItemVec& values) } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeObjectBreakable::used_ai_locations() const { return (false); } -bool CSE_ALifeObjectBreakable::can_switch_offline() const { return (false); } +bool CSE_ALifeObjectBreakable::used_ai_locations() const throw() { return false; } +bool CSE_ALifeObjectBreakable::can_switch_offline() const throw() { return false; } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeObjectClimable //////////////////////////////////////////////////////////////////////////// @@ -1784,8 +1786,8 @@ void CSE_ALifeObjectClimable::set_additional_info(void* info) } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeObjectClimable::used_ai_locations() const { return (false); } -bool CSE_ALifeObjectClimable::can_switch_offline() const { return (false); } +bool CSE_ALifeObjectClimable::used_ai_locations() const throw() { return false; } +bool CSE_ALifeObjectClimable::can_switch_offline() const throw() { return false; } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeMountedWeapon //////////////////////////////////////////////////////////////////////////// diff --git a/src/xrServerEntities/xrServer_Objects_ALife.h b/src/xrServerEntities/xrServer_Objects_ALife.h index 9ee58d22587..5b57f67735c 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.h +++ b/src/xrServerEntities/xrServer_Objects_ALife.h @@ -99,7 +99,7 @@ class CSE_ALifeGraphPoint : public CSE_Abstract CSE_ALifeGraphPoint(LPCSTR caSection); virtual ~CSE_ALifeGraphPoint(); - virtual bool match_configuration() const { return false; } + virtual bool match_configuration() const throw() { return false; } #ifndef XRGAME_EXPORTS virtual void __stdcall on_render(CDUInterface* du, IServerEntityLEOwner* owner, bool bSelected, const Fmatrix& parent, int priority, bool strictB2F); @@ -151,17 +151,17 @@ class CSE_ALifeObject : public CSE_Abstract, public CRandom CSE_ALifeObject(LPCSTR caSection); virtual ~CSE_ALifeObject(); - virtual bool used_ai_locations() const; - virtual bool can_save() const; - virtual bool can_switch_online() const; - virtual bool can_switch_offline() const; - virtual bool interactive() const; + virtual bool used_ai_locations() const throw(); + virtual bool can_save() const throw(); + virtual bool can_switch_online() const throw(); + virtual bool can_switch_offline() const throw(); + virtual bool interactive() const throw(); virtual CSE_ALifeObject* cast_alife_object() { return this; } bool move_offline() const; - void can_switch_online(bool value); - void can_switch_offline(bool value); + void can_switch_online(bool value) throw(); + void can_switch_offline(bool value) throw(); void use_ai_locations(bool value); - void interactive(bool value); + void interactive(bool value) throw(); void move_offline(bool value); bool visible_for_map() const; void visible_for_map(bool value); @@ -174,7 +174,7 @@ class CSE_ALifeObject : public CSE_Abstract, public CRandom virtual void spawn_supplies(); CALifeSimulator& alife() const; virtual Fvector draw_level_position() const; - virtual bool keep_saved_data_anyway() const; + virtual bool keep_saved_data_anyway() const throw(); #endif virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); @@ -341,8 +341,8 @@ class CSE_ALifePHSkeletonObject : public CSE_ALifeDynamicObjectVisual, public CS public: CSE_ALifePHSkeletonObject(LPCSTR caSection); virtual ~CSE_ALifePHSkeletonObject(); - virtual bool can_save() const; - virtual bool used_ai_locations() const; + virtual bool can_save() const throw(); + virtual bool used_ai_locations() const throw(); virtual void load(NET_Packet& tNetPacket); virtual CSE_Abstract* cast_abstract() { return this; } public: @@ -364,8 +364,8 @@ class CSE_ALifeSpaceRestrictor : public CSE_ALifeDynamicObject, public CSE_Shape CSE_ALifeSpaceRestrictor(LPCSTR caSection); virtual ~CSE_ALifeSpaceRestrictor(); virtual IServerEntityShape* __stdcall shape(); - virtual bool can_switch_offline() const; - virtual bool used_ai_locations() const; + virtual bool can_switch_offline() const throw(); + virtual bool used_ai_locations() const throw(); virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); virtual void STATE_Read(NET_Packet& P, u16 size); @@ -411,7 +411,7 @@ class CSE_ALifeSmartZone : public CSE_ALifeSpaceRestrictor, public CSE_ALifeSche virtual void update(); virtual float detect_probability(); virtual void smart_touch(CSE_ALifeMonsterAbstract* monster); - virtual bool used_ai_locations() const { return true; }; + virtual bool used_ai_locations() const throw() { return true; }; virtual CSE_ALifeSmartZone* cast_smart_zone() { return this; }; #ifdef XRGAME_EXPORTS virtual bool bfActive(); @@ -444,8 +444,8 @@ class CSE_ALifeObjectPhysic : public CSE_ALifeDynamicObjectVisual, public CSE_PH shared_str fixed_bones; CSE_ALifeObjectPhysic(LPCSTR caSection); virtual ~CSE_ALifeObjectPhysic(); - virtual bool used_ai_locations() const; - virtual bool can_save() const; + virtual bool used_ai_locations() const throw(); + virtual bool can_save() const throw(); virtual void load(NET_Packet& tNetPacket); virtual CSE_Abstract* cast_abstract() { return this; } // virtual void load (IReader& r){inherited::load(r);} @@ -543,8 +543,8 @@ class CSE_ALifeObjectHangingLamp : public CSE_ALifeDynamicObjectVisual, public C CSE_ALifeObjectHangingLamp(LPCSTR caSection); virtual ~CSE_ALifeObjectHangingLamp(); virtual void load(NET_Packet& tNetPacket); - virtual bool used_ai_locations() const; - virtual bool match_configuration() const; + virtual bool used_ai_locations() const throw(); + virtual bool match_configuration() const throw(); virtual bool __stdcall validate(); #ifndef XRGAME_EXPORTS virtual void __stdcall on_render(CDUInterface* du, IServerEntityLEOwner* owner, bool bSelected, @@ -565,7 +565,7 @@ class CSE_ALifeObjectProjector : public CSE_ALifeDynamicObjectVisual public: CSE_ALifeObjectProjector(LPCSTR caSection); virtual ~CSE_ALifeObjectProjector(); - virtual bool used_ai_locations() const; + virtual bool used_ai_locations() const throw(); virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); virtual void STATE_Read(NET_Packet& P, u16 size); @@ -584,8 +584,8 @@ class CSE_ALifeHelicopter : public CSE_ALifeDynamicObjectVisual, public CSE_Moti CSE_ALifeHelicopter(LPCSTR caSection); virtual ~CSE_ALifeHelicopter(); virtual void load(NET_Packet& tNetPacket); - virtual bool can_save() const; - virtual bool used_ai_locations() const; + virtual bool can_save() const throw(); + virtual bool used_ai_locations() const throw(); virtual CSE_Motion* __stdcall motion(); virtual CSE_Abstract* cast_abstract() { return this; } virtual void UPDATE_Read(NET_Packet& P); @@ -619,9 +619,9 @@ class CSE_ALifeCar : public CSE_ALifeDynamicObjectVisual, public CSE_PHSkeleton float health; CSE_ALifeCar(LPCSTR caSection); virtual ~CSE_ALifeCar(); - virtual bool used_ai_locations() const; + virtual bool used_ai_locations() const throw(); virtual void load(NET_Packet& tNetPacket); - virtual bool can_save() const; + virtual bool can_save() const throw(); virtual CSE_Abstract* cast_abstract() { return this; } protected: virtual void data_load(NET_Packet& tNetPacket); @@ -643,8 +643,8 @@ class CSE_ALifeObjectBreakable : public CSE_ALifeDynamicObjectVisual float m_health; CSE_ALifeObjectBreakable(LPCSTR caSection); virtual ~CSE_ALifeObjectBreakable(); - virtual bool used_ai_locations() const; - virtual bool can_switch_offline() const; + virtual bool used_ai_locations() const throw(); + virtual bool can_switch_offline() const throw(); virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); virtual void STATE_Read(NET_Packet& P, u16 size); @@ -661,8 +661,8 @@ class CSE_ALifeObjectClimable : public CSE_Shape, public CSE_ALifeDynamicObject CSE_ALifeObjectClimable(LPCSTR caSection); shared_str material; virtual ~CSE_ALifeObjectClimable(); - virtual bool used_ai_locations() const; - virtual bool can_switch_offline() const; + virtual bool used_ai_locations() const throw(); + virtual bool can_switch_offline() const throw(); virtual IServerEntityShape* __stdcall shape(); #ifndef XRGAME_EXPORTS diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Items.cpp index a8755f4acd1..53dd2ddcf74 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items.cpp @@ -748,8 +748,9 @@ void CSE_ALifeItemAmmo::FillProps(LPCSTR pref, PropItemVec& values) } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeItemAmmo::can_switch_online() const { return inherited::can_switch_online(); } -bool CSE_ALifeItemAmmo::can_switch_offline() const { return (inherited::can_switch_offline() && a_elapsed != 0); } +bool CSE_ALifeItemAmmo::can_switch_online() const throw() { return inherited::can_switch_online(); } +bool CSE_ALifeItemAmmo::can_switch_offline() const throw() +{ return (inherited::can_switch_offline() && a_elapsed != 0); } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeItemDetector //////////////////////////////////////////////////////////////////////////// @@ -947,11 +948,11 @@ void CSE_ALifeItemBolt::STATE_Write(NET_Packet& tNetPacket) { inherited::STATE_W void CSE_ALifeItemBolt::STATE_Read(NET_Packet& tNetPacket, u16 size) { inherited::STATE_Read(tNetPacket, size); } void CSE_ALifeItemBolt::UPDATE_Write(NET_Packet& tNetPacket) { inherited::UPDATE_Write(tNetPacket); }; void CSE_ALifeItemBolt::UPDATE_Read(NET_Packet& tNetPacket) { inherited::UPDATE_Read(tNetPacket); }; -bool CSE_ALifeItemBolt::can_save() const +bool CSE_ALifeItemBolt::can_save() const throw() { - return (false); //! attached()); + return false; //! attached()); } -bool CSE_ALifeItemBolt::used_ai_locations() const { return false; } +bool CSE_ALifeItemBolt::used_ai_locations() const throw() { return false; } #ifndef XRGAME_EXPORTS void CSE_ALifeItemBolt::FillProps(LPCSTR pref, PropItemVec& values) { inherited::FillProps(pref, values); } #endif // #ifndef XRGAME_EXPORTS diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items.h b/src/xrServerEntities/xrServer_Objects_ALife_Items.h index b20444d6418..7fbab6880a6 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items.h +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items.h @@ -152,8 +152,8 @@ class CSE_ALifeItemAmmo : public CSE_ALifeItem CSE_ALifeItemAmmo(LPCSTR caSection); virtual ~CSE_ALifeItemAmmo(); virtual CSE_ALifeItemAmmo* cast_item_ammo() { return this; }; - virtual bool can_switch_online() const; - virtual bool can_switch_offline() const; + virtual bool can_switch_online() const throw(); + virtual bool can_switch_offline() const throw(); virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); virtual void STATE_Read(NET_Packet& P, u16 size); @@ -404,8 +404,8 @@ class CSE_ALifeItemBolt : public CSE_ALifeItem u32 m_ef_weapon_type; CSE_ALifeItemBolt(LPCSTR caSection); virtual ~CSE_ALifeItemBolt(); - virtual bool can_save() const; - virtual bool used_ai_locations() const; + virtual bool can_save() const throw(); + virtual bool used_ai_locations() const throw(); virtual u32 ef_weapon_type() const; virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp index 180029c0c4c..d17c739398e 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp @@ -517,7 +517,7 @@ CSE_ALifeTrader::CSE_ALifeTrader(LPCSTR caSection) CSE_ALifeTrader::~CSE_ALifeTrader() {} #ifdef DEBUG -bool CSE_ALifeTrader::match_configuration() const { return (!strstr(Core.Params, "-designer")); } +bool CSE_ALifeTrader::match_configuration() const throw() { return (!strstr(Core.Params, "-designer")); } #endif CSE_Abstract* CSE_ALifeTrader::init() @@ -585,7 +585,7 @@ void CSE_ALifeTrader::UPDATE_Read(NET_Packet& tNetPacket) inherited2::UPDATE_Read(tNetPacket); }; -bool CSE_ALifeTrader::interactive() const { return (false); } +bool CSE_ALifeTrader::interactive() const throw() { return false; } #ifndef XRGAME_EXPORTS void CSE_ALifeTrader::FillProps(LPCSTR _pref, PropItemVec& items) { @@ -859,7 +859,7 @@ CSE_ALifeCreatureAbstract::CSE_ALifeCreatureAbstract(LPCSTR caSection) : CSE_ALi CSE_ALifeCreatureAbstract::~CSE_ALifeCreatureAbstract() {} #ifdef DEBUG -bool CSE_ALifeCreatureAbstract::match_configuration() const { return (!strstr(Core.Params, "-designer")); } +bool CSE_ALifeCreatureAbstract::match_configuration() const throw() { return !strstr(Core.Params, "-designer"); } #endif u32 CSE_ALifeCreatureAbstract::ef_creature_type() const { return (m_ef_creature_type); } @@ -980,9 +980,9 @@ void CSE_ALifeCreatureAbstract::FillProps(LPCSTR pref, PropItemVec& items) } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeCreatureAbstract::used_ai_locations() const { return (true); } -bool CSE_ALifeCreatureAbstract::can_switch_online() const { return (inherited::can_switch_online()); } -bool CSE_ALifeCreatureAbstract::can_switch_offline() const +bool CSE_ALifeCreatureAbstract::used_ai_locations() const throw() { return true; } +bool CSE_ALifeCreatureAbstract::can_switch_online() const throw() { return inherited::can_switch_online(); } +bool CSE_ALifeCreatureAbstract::can_switch_offline() const throw() { return (inherited::can_switch_offline() && (get_health() > 0.f)); } @@ -1207,7 +1207,7 @@ CSE_ALifeCreatureActor::CSE_ALifeCreatureActor(LPCSTR caSection) CSE_ALifeCreatureActor::~CSE_ALifeCreatureActor() {} #ifdef DEBUG -bool CSE_ALifeCreatureActor::match_configuration() const { return (true); } +bool CSE_ALifeCreatureActor::match_configuration() const throw() { return true; } #endif CSE_Abstract* CSE_ALifeCreatureActor::init() @@ -1397,7 +1397,7 @@ void CSE_ALifeCreatureCrow::UPDATE_Write(NET_Packet& tNetPacket) { inherited::UP void CSE_ALifeCreatureCrow::FillProps(LPCSTR pref, PropItemVec& values) { inherited::FillProps(pref, values); } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeCreatureCrow::used_ai_locations() const { return (false); } +bool CSE_ALifeCreatureCrow::used_ai_locations() const throw() { return false; } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeCreaturePhantom //////////////////////////////////////////////////////////////////////////// @@ -1418,7 +1418,7 @@ void CSE_ALifeCreaturePhantom::UPDATE_Write(NET_Packet& tNetPacket) { inherited: void CSE_ALifeCreaturePhantom::FillProps(LPCSTR pref, PropItemVec& values) { inherited::FillProps(pref, values); } #endif // #ifndef XRGAME_EXPORTS -bool CSE_ALifeCreaturePhantom::used_ai_locations() const { return (false); } +bool CSE_ALifeCreaturePhantom::used_ai_locations() const throw() { return false; } //////////////////////////////////////////////////////////////////////////// // CSE_ALifeMonsterRat //////////////////////////////////////////////////////////////////////////// diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h index c41fd8e32f8..72d6851a475 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h @@ -107,7 +107,7 @@ class CSE_ALifeTrader : public CSE_ALifeDynamicObjectVisual, public CSE_ALifeTra public: CSE_ALifeTrader(LPCSTR caSection); virtual ~CSE_ALifeTrader(); - virtual bool interactive() const; + virtual bool interactive() const throw(); virtual CSE_Abstract* init(); virtual CSE_Abstract* base(); virtual const CSE_Abstract* base() const; @@ -120,7 +120,7 @@ class CSE_ALifeTrader : public CSE_ALifeDynamicObjectVisual, public CSE_ALifeTra virtual void add_offline(const xr_vector& saved_children, const bool& update_registries); #endif #ifdef DEBUG - virtual bool match_configuration() const; + virtual bool match_configuration() const throw(); #endif virtual CSE_Abstract* cast_abstract() { return this; }; virtual CSE_ALifeTraderAbstract* cast_trader_abstract() { return this; }; @@ -180,7 +180,7 @@ class CSE_ALifeAnomalousZone : public CSE_ALifeCustomZone CSE_ALifeSchedulable* tpALifeSchedulable, int iGroupIndex, bool bMutualDetection); virtual bool bfActive(); virtual CSE_ALifeDynamicObject* tpfGetBestDetector(); - virtual bool keep_saved_data_anyway() const; + virtual bool keep_saved_data_anyway() const throw(); #endif virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); @@ -266,9 +266,9 @@ class CSE_ALifeCreatureAbstract : public CSE_ALifeDynamicObjectVisual void set_killer_id(ALife::_OBJECT_ID const killer_id); IC bool g_Alive() const { return (get_health() > 0.f); } - virtual bool used_ai_locations() const; - virtual bool can_switch_online() const; - virtual bool can_switch_offline() const; + virtual bool used_ai_locations() const throw(); + virtual bool can_switch_online() const throw(); + virtual bool can_switch_offline() const throw(); virtual u32 ef_creature_type() const; virtual u32 ef_weapon_type() const; virtual u32 ef_detector_type() const; @@ -278,7 +278,7 @@ class CSE_ALifeCreatureAbstract : public CSE_ALifeDynamicObjectVisual virtual void on_spawn(); #endif #ifdef DEBUG - virtual bool match_configuration() const; + virtual bool match_configuration() const throw(); #endif virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); @@ -411,7 +411,7 @@ class CSE_ALifeCreatureActor : public CSE_ALifeCreatureAbstract, public CSE_ALif virtual const CSE_Abstract* base() const; virtual CSE_Abstract* init(); virtual void load(NET_Packet& tNetPacket); - virtual bool can_save() const { return true; } + virtual bool can_save() const throw() { return true; } virtual bool natural_weapon() const { return false; } virtual bool natural_detector() const { return false; } #ifdef XRGAME_EXPORTS @@ -420,7 +420,7 @@ class CSE_ALifeCreatureActor : public CSE_ALifeCreatureAbstract, public CSE_ALif virtual void add_offline(const xr_vector& saved_children, const bool& update_registries); #endif #ifdef DEBUG - virtual bool match_configuration() const; + virtual bool match_configuration() const throw(); #endif virtual CSE_Abstract* cast_abstract() { return this; }; virtual CSE_ALifeTraderAbstract* cast_trader_abstract() { return this; }; @@ -440,7 +440,7 @@ class CSE_ALifeCreatureCrow : public CSE_ALifeCreatureAbstract public: CSE_ALifeCreatureCrow(LPCSTR caSection); virtual ~CSE_ALifeCreatureCrow(); - virtual bool used_ai_locations() const; + virtual bool used_ai_locations() const throw(); virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); virtual void STATE_Read(NET_Packet& P, u16 size); @@ -455,7 +455,7 @@ class CSE_ALifeCreaturePhantom : public CSE_ALifeCreatureAbstract public: CSE_ALifeCreaturePhantom(LPCSTR caSection); virtual ~CSE_ALifeCreaturePhantom(); - virtual bool used_ai_locations() const; + virtual bool used_ai_locations() const throw(); virtual void UPDATE_Read(NET_Packet& P); virtual void UPDATE_Write(NET_Packet& P); virtual void STATE_Read(NET_Packet& P, u16 size); diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp index 14f7b3e4995..33cf757a0c9 100644 --- a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp +++ b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp @@ -86,12 +86,12 @@ CSE_SmartCover::~CSE_SmartCover() #endif // XRSE_FACTORY_EXPORTS } -IServerEntityShape* CSE_SmartCover::shape() { return (this); } -bool CSE_SmartCover::used_ai_locations() const { return (true); } -bool CSE_SmartCover::can_save() const { return (true); } -bool CSE_SmartCover::can_switch_online() const { return (true); } -bool CSE_SmartCover::can_switch_offline() const { return (false); } -bool CSE_SmartCover::interactive() const { return (false); } +IServerEntityShape* CSE_SmartCover::shape() { return this; } +bool CSE_SmartCover::used_ai_locations() const throw() { return true; } +bool CSE_SmartCover::can_save() const throw() { return true; } +bool CSE_SmartCover::can_switch_online() const throw() { return true; } +bool CSE_SmartCover::can_switch_offline() const throw() { return false; } +bool CSE_SmartCover::interactive() const throw() { return false; } LPCSTR CSE_SmartCover::description() const { return (m_description.c_str()); } #ifndef AI_COMPILER void CSE_SmartCover::set_available_loopholes(luabind::object table) { m_available_loopholes = table; } diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.h b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.h index 64cc9c84aa4..98066b1bd35 100644 --- a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.h +++ b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.h @@ -63,11 +63,11 @@ class CSE_SmartCover : public CSE_ALifeDynamicObject, public CSE_Shape CSE_SmartCover(LPCSTR caSection); virtual ~CSE_SmartCover(); virtual IServerEntityShape* __stdcall shape(); - virtual bool used_ai_locations() const; - virtual bool can_save() const; - virtual bool can_switch_online() const; - virtual bool can_switch_offline() const; - virtual bool interactive() const; + virtual bool used_ai_locations() const throw(); + virtual bool can_save() const throw(); + virtual bool can_switch_online() const throw(); + virtual bool can_switch_offline() const throw(); + virtual bool interactive() const throw(); LPCSTR description() const; #ifndef AI_COMPILER void set_available_loopholes(luabind::object table); diff --git a/src/xrServerEntities/xrServer_script_macroses.h b/src/xrServerEntities/xrServer_script_macroses.h index 8dad3d1b3c0..9c0cc939aa5 100644 --- a/src/xrServerEntities/xrServer_script_macroses.h +++ b/src/xrServerEntities/xrServer_script_macroses.h @@ -321,44 +321,44 @@ struct CWrapperAbstractItem : public T, public luabind::wrap_base ////////////////////////////////////////////////////////////////////////// // 0 ////////////////////////////////////////////////////////////////////////// -#define luabind_class_pure0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperPure, b) \ - luabind_virtual_Pure(a, CWrapperPure) +//#define luabind_class_pure0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperPure, b) \ +// luabind_virtual_Pure(a, CWrapperPure) -#define luabind_class_abstract0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstract, b) \ - luabind_virtual_Abstract(a, CWrapperAbstract) +//#define luabind_class_abstract0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstract, b) \ +// luabind_virtual_Abstract(a, CWrapperAbstract) -#define luabind_class_alife0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractALife, b) \ - luabind_virtual_Alife(a, CWrapperAbstractALife) +//#define luabind_class_alife0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractALife, b) \ +// luabind_virtual_Alife(a, CWrapperAbstractALife) -#define luabind_class_dynamic_alife0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractDynamicALife, b) \ - luabind_virtual_DynamicAlife(a, CWrapperAbstractDynamicALife) +//#define luabind_class_dynamic_alife0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractDynamicALife, b) \ +// luabind_virtual_DynamicAlife(a, CWrapperAbstractDynamicALife) -#define luabind_class_zone0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractZone, b) \ - luabind_virtual_Zone(a, CWrapperAbstractZone) +//#define luabind_class_zone0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractZone, b) \ +// luabind_virtual_Zone(a, CWrapperAbstractZone) -#define luabind_class_creature0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractCreature, b) \ - luabind_virtual_Creature(a, CWrapperAbstractCreature) +//#define luabind_class_creature0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractCreature, b) \ +// luabind_virtual_Creature(a, CWrapperAbstractCreature) -#define luabind_class_monster0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractMonster, b) \ - luabind_virtual_Monster(a, CWrapperAbstractMonster) +//#define luabind_class_monster0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractMonster, b) \ +// luabind_virtual_Monster(a, CWrapperAbstractMonster) -#define luabind_class_item0(a, b) \ - DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractItem, b) \ - luabind_virtual_Item(a, CWrapperAbstractItem) +//#define luabind_class_item0(a, b) \ +// DEFINE_LUABIND_CLASS_WRAPPER_0(a, CWrapperAbstractItem, b) \ +// luabind_virtual_Item(a, CWrapperAbstractItem) ////////////////////////////////////////////////////////////////////////// // 1 ////////////////////////////////////////////////////////////////////////// -#define luabind_class_pure1(a, b, c) \ - DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperPure, b, c) \ - luabind_virtual_Pure(a, CWrapperPure) +//#define luabind_class_pure1(a, b, c) \ +// DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperPure, b, c) \ +// luabind_virtual_Pure(a, CWrapperPure) #define luabind_class_abstract1(a, b, c) \ DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperAbstract, b, c) \ @@ -372,9 +372,9 @@ struct CWrapperAbstractItem : public T, public luabind::wrap_base DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperAbstractDynamicALife, b, c) \ luabind_virtual_DynamicAlife(a, CWrapperAbstractDynamicALife) -#define luabind_class_zone1(a, b, c) \ - DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperAbstractZone, b, c) \ - luabind_virtual_Zone(a, CWrapperAbstractZone) +//#define luabind_class_zone1(a, b, c) \ +// DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperAbstractZone, b, c) \ +// luabind_virtual_Zone(a, CWrapperAbstractZone) #define luabind_class_creature1(a, b, c) \ DEFINE_LUABIND_CLASS_WRAPPER_1(a, CWrapperAbstractCreature, b, c) \ @@ -391,17 +391,17 @@ struct CWrapperAbstractItem : public T, public luabind::wrap_base ////////////////////////////////////////////////////////////////////////// // 2 ////////////////////////////////////////////////////////////////////////// -#define luabind_class_pure2(a, b, c, d) \ - DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperPure, b, c, d) \ - luabind_virtual_Pure(a, CWrapperPure) +//#define luabind_class_pure2(a, b, c, d) \ +// DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperPure, b, c, d) \ +// luabind_virtual_Pure(a, CWrapperPure) #define luabind_class_abstract2(a, b, c, d) \ DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstract, b, c, d) \ luabind_virtual_Abstract(a, CWrapperAbstract) -#define luabind_class_alife2(a, b, c, d) \ - DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractALife, b, c, d) \ - luabind_virtual_Alife(a, CWrapperAbstractALife) +//#define luabind_class_alife2(a, b, c, d) \ +// DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractALife, b, c, d) \ +// luabind_virtual_Alife(a, CWrapperAbstractALife) #define luabind_class_dynamic_alife2(a, b, c, d) \ DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractDynamicALife, b, c, d) \ @@ -415,9 +415,9 @@ struct CWrapperAbstractItem : public T, public luabind::wrap_base DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractOnlineOfflineGroup, b, c, d) \ luabind_virtual_OnlineOfflineGroup(a, CWrapperAbstractOnlineOfflineGroup) -#define luabind_class_creature2(a, b, c, d) \ - DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractCreature, b, c, d) \ - luabind_virtual_Creature(a, CWrapperAbstractCreature) +//#define luabind_class_creature2(a, b, c, d) \ +// DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractCreature, b, c, d) \ +// luabind_virtual_Creature(a, CWrapperAbstractCreature) #define luabind_class_monster2(a, b, c, d) \ DEFINE_LUABIND_CLASS_WRAPPER_2(a, CWrapperAbstractMonster, b, c, d) \ @@ -430,69 +430,69 @@ struct CWrapperAbstractItem : public T, public luabind::wrap_base ////////////////////////////////////////////////////////////////////////// // 3 ////////////////////////////////////////////////////////////////////////// -#define luabind_class_pure3(a, b, c, d, e) \ - DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperPure, b, c, d, e) \ - luabind_virtual_Pure(a, CWrapperPure) +//#define luabind_class_pure3(a, b, c, d, e) \ +// DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperPure, b, c, d, e) \ +// luabind_virtual_Pure(a, CWrapperPure) -#define luabind_class_abstract3(a, b, c, d, e) \ - DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstract, b, c, d, e) \ - luabind_virtual_Abstract(a, CWrapperAbstract) +//#define luabind_class_abstract3(a, b, c, d, e) \ +// DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstract, b, c, d, e) \ +// luabind_virtual_Abstract(a, CWrapperAbstract) -#define luabind_class_alife3(a, b, c, d, e) \ - DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractALife, b, c, d, e) \ - luabind_virtual_Alife(a, CWrapperAbstractALife) +//#define luabind_class_alife3(a, b, c, d, e) \ +// DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractALife, b, c, d, e) \ +// luabind_virtual_Alife(a, CWrapperAbstractALife) #define luabind_class_dynamic_alife3(a, b, c, d, e) \ DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractDynamicALife, b, c, d, e) \ luabind_virtual_DynamicAlife(a, CWrapperAbstractDynamicALife) -#define luabind_class_zone3(a, b, c, d, e) \ - DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractZone, b, c, d, e) \ - luabind_virtual_Zone(a, CWrapperAbstractZone) +//#define luabind_class_zone3(a, b, c, d, e) \ +// DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractZone, b, c, d, e) \ +// luabind_virtual_Zone(a, CWrapperAbstractZone) #define luabind_class_creature3(a, b, c, d, e) \ DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractCreature, b, c, d, e) \ luabind_virtual_Creature(a, CWrapperAbstractCreature) -#define luabind_class_monster3(a, b, c, d, e) \ - DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractMonster, b, c, d, e) \ - luabind_virtual_Monster(a, CWrapperAbstractMonster) +//#define luabind_class_monster3(a, b, c, d, e) \ +// DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractMonster, b, c, d, e) \ +// luabind_virtual_Monster(a, CWrapperAbstractMonster) -#define luabind_class_item3(a, b, c, d, e) \ - DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractItem, b, c, d, e) \ - luabind_virtual_Item(a, CWrapperAbstractItem) +//#define luabind_class_item3(a, b, c, d, e) \ +// DEFINE_LUABIND_CLASS_WRAPPER_3(a, CWrapperAbstractItem, b, c, d, e) \ +// luabind_virtual_Item(a, CWrapperAbstractItem) ////////////////////////////////////////////////////////////////////////// // 4 ////////////////////////////////////////////////////////////////////////// -#define luabind_class_pure4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperPure, b, c, d, e, f) \ - luabind_virtual_Pure(a, CWrapperPure) - -#define luabind_class_abstract4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstract, b, c, d, e, f) \ - luabind_virtual_Abstract(a, CWrapperAbstract) - -#define luabind_class_alife4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractALife, b, c, d, e, f) \ - luabind_virtual_Alife(a, CWrapperAbstractALife) - -#define luabind_class_dynamic_alife4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractDynamicALife, b, c, d, e, f) \ - luabind_virtual_DynamicAlife(a, CWrapperAbstractDynamicALife) - -#define luabind_class_zone4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractZone, b, c, d, e, f) \ - luabind_virtual_Zone(a, CWrapperAbstractZone) - -#define luabind_class_creature4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractCreature, b, c, d, e, f) \ - luabind_virtual_Creature(a, CWrapperAbstractCreature) - -#define luabind_class_monster4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractMonster, b, c, d, e, f) \ - luabind_virtual_Monster(a, CWrapperAbstractMonster) - -#define luabind_class_item4(a, b, c, d, e, f) \ - DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractItem, b, c, d, e, f) \ - luabind_virtual_Item(a, CWrapperAbstractItem) +//#define luabind_class_pure4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperPure, b, c, d, e, f) \ +// luabind_virtual_Pure(a, CWrapperPure) +// +//#define luabind_class_abstract4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstract, b, c, d, e, f) \ +// luabind_virtual_Abstract(a, CWrapperAbstract) +// +//#define luabind_class_alife4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractALife, b, c, d, e, f) \ +// luabind_virtual_Alife(a, CWrapperAbstractALife) +// +//#define luabind_class_dynamic_alife4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractDynamicALife, b, c, d, e, f) \ +// luabind_virtual_DynamicAlife(a, CWrapperAbstractDynamicALife) +// +//#define luabind_class_zone4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractZone, b, c, d, e, f) \ +// luabind_virtual_Zone(a, CWrapperAbstractZone) +// +//#define luabind_class_creature4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractCreature, b, c, d, e, f) \ +// luabind_virtual_Creature(a, CWrapperAbstractCreature) +// +//#define luabind_class_monster4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractMonster, b, c, d, e, f) \ +// luabind_virtual_Monster(a, CWrapperAbstractMonster) +// +//#define luabind_class_item4(a, b, c, d, e, f) \ +// DEFINE_LUABIND_CLASS_WRAPPER_4(a, CWrapperAbstractItem, b, c, d, e, f) \ +// luabind_virtual_Item(a, CWrapperAbstractItem)