diff --git a/src/xrGame/F1.cpp b/src/xrGame/F1.cpp deleted file mode 100644 index 60ff80ee92b..00000000000 --- a/src/xrGame/F1.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "pch_script.h" -#include "f1.h" -#include "WeaponAmmo.h" -#include "Medkit.h" -#include "Antirad.h" -#include "FoodItem.h" -#include "BottleItem.h" -#include "ExplosiveItem.h" -#include "InventoryBox.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -CF1::CF1(void) {} -CF1::~CF1(void) {} -using namespace luabind; - -SCRIPT_EXPORT(CF1, (CGameObject), { - module(luaState)[class_("CF1").def(constructor<>()), - // new 14.10.08 peacemaker - class_("CWeaponAmmo").def(constructor<>()), - class_("CMedkit").def(constructor<>()), - class_("CAntirad").def(constructor<>()), - class_("CFoodItem").def(constructor<>()), - class_("CBottleItem").def(constructor<>()), - class_("CInventoryBox").def(constructor<>()), - class_("CExplosiveItem").def(constructor<>())]; -}); diff --git a/src/xrGame/F1.h b/src/xrGame/F1.h index 697343285df..0f0e3b3dcc8 100644 --- a/src/xrGame/F1.h +++ b/src/xrGame/F1.h @@ -7,6 +7,6 @@ class CF1 : public CGrenade typedef CGrenade inherited; public: - CF1(void); - virtual ~CF1(void); + CF1() {} + virtual ~CF1() {} }; diff --git a/src/xrGame/RGD5.cpp b/src/xrGame/RGD5.cpp deleted file mode 100644 index 867071ef54d..00000000000 --- a/src/xrGame/RGD5.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "pch_script.h" -#include "rgd5.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -CRGD5::CRGD5(void) {} -CRGD5::~CRGD5(void) {} -using namespace luabind; - -SCRIPT_EXPORT(CRGD5, (CGameObject), { module(luaState)[class_("CRGD5").def(constructor<>())]; }); diff --git a/src/xrGame/RGD5.h b/src/xrGame/RGD5.h index a0fc42a8775..9553d0a1a96 100644 --- a/src/xrGame/RGD5.h +++ b/src/xrGame/RGD5.h @@ -1,12 +1,12 @@ #pragma once -#include "grenade.h" +#include "Grenade.h" class CRGD5 : public CGrenade { typedef CGrenade inherited; public: - CRGD5(void); - virtual ~CRGD5(void); + CRGD5() {} + virtual ~CRGD5() {} }; diff --git a/src/xrGame/WeaponAK74.cpp b/src/xrGame/WeaponAK74.cpp index 2d2dc6c4344..c30fc268e5c 100644 --- a/src/xrGame/WeaponAK74.cpp +++ b/src/xrGame/WeaponAK74.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" +#include "stdafx.h" #include "WeaponAK74.h" -#include "xrScriptEngine/ScriptExporter.hpp" CWeaponAK74::CWeaponAK74(ESoundTypes eSoundType) : CWeaponMagazinedWGrenade(eSoundType) {} CWeaponAK74::~CWeaponAK74() {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponAK74, (CGameObject), - { module(luaState)[class_("CWeaponAK74").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponBinoculars_script.cpp b/src/xrGame/WeaponBinoculars_script.cpp deleted file mode 100644 index 1111df09177..00000000000 --- a/src/xrGame/WeaponBinoculars_script.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "pch_script.h" -#include "weaponbinoculars.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponBinoculars, (CGameObject), - { module(luaState)[class_("CWeaponBinoculars").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponFN2000.cpp b/src/xrGame/WeaponFN2000.cpp index 5eaaa129d1e..54371940733 100644 --- a/src/xrGame/WeaponFN2000.cpp +++ b/src/xrGame/WeaponFN2000.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" +#include "stdafx.h" #include "WeaponFN2000.h" -#include "xrScriptEngine/ScriptExporter.hpp" CWeaponFN2000::CWeaponFN2000() : CWeaponMagazined(SOUND_TYPE_WEAPON_SNIPERRIFLE) {} CWeaponFN2000::~CWeaponFN2000() {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponFN2000, (CGameObject), - { module(luaState)[class_("CWeaponFN2000").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponFORT.cpp b/src/xrGame/WeaponFORT.cpp deleted file mode 100644 index c366fd3c117..00000000000 --- a/src/xrGame/WeaponFORT.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "pch_script.h" -#include "WeaponFORT.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -CWeaponFORT::CWeaponFORT() {} -CWeaponFORT::~CWeaponFORT() {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponFORT, (CGameObject), - { module(luaState)[class_("CWeaponFORT").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponFORT.h b/src/xrGame/WeaponFORT.h index 279d4799966..3f15cf0fe93 100644 --- a/src/xrGame/WeaponFORT.h +++ b/src/xrGame/WeaponFORT.h @@ -9,6 +9,6 @@ class CWeaponFORT : public CWeaponPistol protected: public: - CWeaponFORT(); - virtual ~CWeaponFORT(); + CWeaponFORT() {} + virtual ~CWeaponFORT() {} }; diff --git a/src/xrGame/WeaponGroza.cpp b/src/xrGame/WeaponGroza.cpp index 43fc5030781..20fa75d67da 100644 --- a/src/xrGame/WeaponGroza.cpp +++ b/src/xrGame/WeaponGroza.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" -#include "weapongroza.h" -#include "xrScriptEngine/ScriptExporter.hpp" +#include "stdafx.h" +#include "WeaponGroza.h" CWeaponGroza::CWeaponGroza() : CWeaponMagazinedWGrenade(SOUND_TYPE_WEAPON_SUBMACHINEGUN) {} CWeaponGroza::~CWeaponGroza() {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponGroza, (CGameObject), - { module(luaState)[class_("CWeaponGroza").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponHPSA.cpp b/src/xrGame/WeaponHPSA.cpp index 7622a7c5206..9404e68bbd9 100644 --- a/src/xrGame/WeaponHPSA.cpp +++ b/src/xrGame/WeaponHPSA.cpp @@ -1,5 +1,4 @@ -#include "pch_script.h" - +#include "stdafx.h" #include "WeaponHPSA.h" CWeaponHPSA::CWeaponHPSA() : CWeaponPistol() {} diff --git a/src/xrGame/WeaponHPSA_script.cpp b/src/xrGame/WeaponHPSA_script.cpp deleted file mode 100644 index 91d5ec48bf5..00000000000 --- a/src/xrGame/WeaponHPSA_script.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "pch_script.h" -#include "WeaponHPSA.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponHPSA, (CGameObject), - { module(luaState)[class_("CWeaponHPSA").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponKnife_script.cpp b/src/xrGame/WeaponKnife_script.cpp deleted file mode 100644 index 1a6e3f6c72c..00000000000 --- a/src/xrGame/WeaponKnife_script.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "pch_script.h" -#include "WeaponKnife.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponKnife, (CGameObject), - { module(luaState)[class_("CWeaponKnife").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponLR300.cpp b/src/xrGame/WeaponLR300.cpp index 936fbfce85c..77ccce92f9a 100644 --- a/src/xrGame/WeaponLR300.cpp +++ b/src/xrGame/WeaponLR300.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" +#include "stdafx.h" #include "WeaponLR300.h" -#include "xrScriptEngine/ScriptExporter.hpp" CWeaponLR300::CWeaponLR300() : CWeaponMagazined(SOUND_TYPE_WEAPON_SUBMACHINEGUN) {} CWeaponLR300::~CWeaponLR300() {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponLR300, (CGameObject), - { module(luaState)[class_("CWeaponLR300").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponPM.cpp b/src/xrGame/WeaponPM.cpp index 4577511cc30..fd329869d6a 100644 --- a/src/xrGame/WeaponPM.cpp +++ b/src/xrGame/WeaponPM.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" +#include "stdafx.h" #include "WeaponPM.h" -#include "xrScriptEngine/ScriptExporter.hpp" CWeaponPM::CWeaponPM() : CWeaponPistol() {} CWeaponPM::~CWeaponPM() {} -using namespace luabind; - -SCRIPT_EXPORT( - CWeaponPM, (CGameObject), { module(luaState)[class_("CWeaponPM").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponRG6_script.cpp b/src/xrGame/WeaponRG6_script.cpp deleted file mode 100644 index 813732764aa..00000000000 --- a/src/xrGame/WeaponRG6_script.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "pch_script.h" -#include "WeaponRG6.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponRG6, (CGameObject), - { module(luaState)[class_("CWeaponRG6").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponRPG7_script.cpp b/src/xrGame/WeaponRPG7_script.cpp deleted file mode 100644 index bc3355dd2ea..00000000000 --- a/src/xrGame/WeaponRPG7_script.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "pch_script.h" -#include "WeaponRPG7.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponRPG7, (CGameObject), - { module(luaState)[class_("CWeaponRPG7").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponSVD.cpp b/src/xrGame/WeaponSVD.cpp index ae405128b03..2380465cda3 100644 --- a/src/xrGame/WeaponSVD.cpp +++ b/src/xrGame/WeaponSVD.cpp @@ -1,6 +1,5 @@ -#include "pch_script.h" -#include "weaponsvd.h" -#include "xrScriptEngine/ScriptExporter.hpp" +#include "stdafx.h" +#include "WeaponSVD.h" CWeaponSVD::CWeaponSVD(void) {} CWeaponSVD::~CWeaponSVD(void) {} @@ -23,8 +22,3 @@ void CWeaponSVD::OnAnimationEnd(u32 state) } inherited::OnAnimationEnd(state); } - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponSVD, (CGameObject), - { module(luaState)[class_("CWeaponSVD").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponSVU.cpp b/src/xrGame/WeaponSVU.cpp deleted file mode 100644 index 51174f2c442..00000000000 --- a/src/xrGame/WeaponSVU.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "pch_script.h" -#include "weaponsvu.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -CWeaponSVU::CWeaponSVU(void) {} -CWeaponSVU::~CWeaponSVU(void) {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponSVU, (CGameObject), - { module(luaState)[class_("CWeaponSVU").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponSVU.h b/src/xrGame/WeaponSVU.h index e1e17deb238..8525a0fb6a0 100644 --- a/src/xrGame/WeaponSVU.h +++ b/src/xrGame/WeaponSVU.h @@ -7,6 +7,6 @@ class CWeaponSVU : public CWeaponCustomPistol typedef CWeaponCustomPistol inherited; public: - CWeaponSVU(void); - virtual ~CWeaponSVU(void); + CWeaponSVU() {} + virtual ~CWeaponSVU() {} }; diff --git a/src/xrGame/WeaponScript.cpp b/src/xrGame/WeaponScript.cpp new file mode 100644 index 00000000000..25c652a68c6 --- /dev/null +++ b/src/xrGame/WeaponScript.cpp @@ -0,0 +1,127 @@ +#include "pch_script.h" +#include "Weapon.h" +#include "WeaponMagazined.h" +#include "WeaponMagazinedWGrenade.h" +#include "WeaponBinoculars.h" +#include "WeaponBM16.h" +#include "F1.h" +#include "WeaponFN2000.h" +#include "WeaponFORT.h" +#include "WeaponAmmo.h" +#include "WeaponHPSA.h" +#include "WeaponKnife.h" +#include "WeaponLR300.h" +#include "WeaponPM.h" +#include "RGD5.h" +#include "WeaponRPG7.h" +#include "WeaponSVD.h" +#include "WeaponSVU.h" +#include "WeaponAK74.h" +#include "WeaponAutomaticShotgun.h" +#include "WeaponGroza.h" +#include "WeaponRG6.h" +#include "WeaponShotgun.h" +#include "WeaponUSP45.h" +#include "WeaponVal.h" +#include "WeaponVintorez.h" +#include "WeaponWalther.h" +#include "Medkit.h" +#include "Antirad.h" +#include "FoodItem.h" +#include "BottleItem.h" +#include "ExplosiveItem.h" +#include "InventoryBox.h" +#include "xrScriptEngine/ScriptExporter.hpp" + +using namespace luabind; + +SCRIPT_EXPORT(CWeapon, (CGameObject), +{ + module(luaState) + [ + class_("CWeapon") + .def(constructor<>()) + .def("can_kill", (bool (CWeapon::*)() const)&CWeapon::can_kill) + ]; +}); + +SCRIPT_EXPORT(CWeaponMagazined, (CWeapon), + { module(luaState)[class_("CWeaponMagazined").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponMagazinedWGrenade, (CWeaponMagazined), + { module(luaState)[class_("CWeaponMagazinedWGrenade").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponBinoculars, (CWeaponMagazined), + { module(luaState)[class_("CWeaponBinoculars").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponBM16, (CWeaponShotgun), + { module(luaState)[class_("CWeaponBM16").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponFN2000, (CWeaponMagazined), + { module(luaState)[class_("CWeaponFN2000").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponFORT, (CWeaponMagazined), + { module(luaState)[class_("CWeaponFORT").def(constructor<>())]; }); + +SCRIPT_EXPORT(CF1, (CGameObject, CExplosive), { + module(luaState)[class_>("CF1").def(constructor<>()), + // new 14.10.08 peacemaker + class_("CWeaponAmmo").def(constructor<>()), + class_("CMedkit").def(constructor<>()), + class_("CAntirad").def(constructor<>()), + class_("CFoodItem").def(constructor<>()), + class_("CBottleItem").def(constructor<>()), + class_("CInventoryBox").def(constructor<>()), + class_>("CExplosiveItem").def(constructor<>())]; +}); + +SCRIPT_EXPORT(CWeaponHPSA, (CWeaponMagazined), + { module(luaState)[class_("CWeaponHPSA").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponKnife, (CWeapon), + { module(luaState)[class_("CWeaponKnife").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponLR300, (CWeaponMagazined), + { module(luaState)[class_("CWeaponLR300").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponPM, (CWeaponMagazined), + { module(luaState)[class_("CWeaponPM").def(constructor<>())]; }); + +SCRIPT_EXPORT(CRGD5, (CGameObject, CExplosive), + { module(luaState)[class_>("CRGD5").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponRPG7, (CWeaponMagazined), + { module(luaState)[class_("CWeaponRPG7").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponSVD, (CWeaponMagazined), + { module(luaState)[class_("CWeaponSVD").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponSVU, (CWeaponMagazined), + { module(luaState)[class_("CWeaponSVU").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponAK74, (CWeaponMagazinedWGrenade), + { module(luaState)[class_("CWeaponAK74").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponAutomaticShotgun, (CWeaponMagazined), + { module(luaState)[class_("CWeaponAutomaticShotgun").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponGroza, (CWeaponMagazinedWGrenade), + { module(luaState)[class_("CWeaponGroza").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponRG6, (CWeaponShotgun), + { module(luaState)[class_("CWeaponRG6").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponShotgun, (CWeaponMagazined), + { module(luaState)[class_("CWeaponShotgun").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponUSP45, (CWeaponMagazined), + { module(luaState)[class_("CWeaponUSP45").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponVal, (CWeaponMagazined), + { module(luaState)[class_("CWeaponVal").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponVintorez, (CWeaponMagazined), + { module(luaState)[class_("CWeaponVintorez").def(constructor<>())]; }); + +SCRIPT_EXPORT(CWeaponWalther, (CWeaponMagazined), + { module(luaState)[class_("CWeaponWalther").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponUSP45.cpp b/src/xrGame/WeaponUSP45.cpp deleted file mode 100644 index 5011ceaeaa8..00000000000 --- a/src/xrGame/WeaponUSP45.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "pch_script.h" -#include "weaponusp45.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -CWeaponUSP45::CWeaponUSP45() {} -CWeaponUSP45::~CWeaponUSP45() {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponUSP45, (CGameObject), - { module(luaState)[class_("CWeaponUSP45").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponUSP45.h b/src/xrGame/WeaponUSP45.h index bc580d6220b..d64f801b623 100644 --- a/src/xrGame/WeaponUSP45.h +++ b/src/xrGame/WeaponUSP45.h @@ -7,6 +7,6 @@ class CWeaponUSP45 : public CWeaponPistol typedef CWeaponPistol inherited; public: - CWeaponUSP45(); - virtual ~CWeaponUSP45(); + CWeaponUSP45() {} + virtual ~CWeaponUSP45() {} }; diff --git a/src/xrGame/WeaponVal.cpp b/src/xrGame/WeaponVal.cpp index ff149dc4901..adecdfddeb2 100644 --- a/src/xrGame/WeaponVal.cpp +++ b/src/xrGame/WeaponVal.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" +#include "stdafx.h" #include "weaponval.h" -#include "xrScriptEngine/ScriptExporter.hpp" CWeaponVal::CWeaponVal(void) : CWeaponMagazined(SOUND_TYPE_WEAPON_SUBMACHINEGUN) {} CWeaponVal::~CWeaponVal(void) {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponVal, (CGameObject), - { module(luaState)[class_("CWeaponVal").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponVintorez.cpp b/src/xrGame/WeaponVintorez.cpp index 79994dfdd60..694a384b3cd 100644 --- a/src/xrGame/WeaponVintorez.cpp +++ b/src/xrGame/WeaponVintorez.cpp @@ -1,10 +1,5 @@ -#include "pch_script.h" -#include "weaponvintorez.h" -#include "xrScriptEngine/ScriptExporter.hpp" +#include "stdafx.h" +#include "WeaponVintorez.h" CWeaponVintorez::CWeaponVintorez(void) : CWeaponMagazined(SOUND_TYPE_WEAPON_SNIPERRIFLE) {} CWeaponVintorez::~CWeaponVintorez(void) {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponVintorez, (CGameObject), - { module(luaState)[class_("CWeaponVintorez").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponWalther.cpp b/src/xrGame/WeaponWalther.cpp deleted file mode 100644 index 93483ed1c5e..00000000000 --- a/src/xrGame/WeaponWalther.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "pch_script.h" -#include "weaponwalther.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -CWeaponWalther::CWeaponWalther(void) {} -CWeaponWalther::~CWeaponWalther(void) {} -using namespace luabind; - -SCRIPT_EXPORT(CWeaponWalther, (CGameObject), - { module(luaState)[class_("CWeaponWalther").def(constructor<>())]; }); diff --git a/src/xrGame/WeaponWalther.h b/src/xrGame/WeaponWalther.h index 5ee528df20f..99b5d9325d0 100644 --- a/src/xrGame/WeaponWalther.h +++ b/src/xrGame/WeaponWalther.h @@ -1,5 +1,4 @@ #pragma once - #include "WeaponPistol.h" class CWeaponWalther : public CWeaponPistol @@ -7,6 +6,6 @@ class CWeaponWalther : public CWeaponPistol using inherited = CWeaponPistol; public: - CWeaponWalther(); - virtual ~CWeaponWalther(); + CWeaponWalther() {} + virtual ~CWeaponWalther() {} }; diff --git a/src/xrGame/weaponBM16_script.cpp b/src/xrGame/weaponBM16_script.cpp deleted file mode 100644 index 9f1e18a0d63..00000000000 --- a/src/xrGame/weaponBM16_script.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "pch_script.h" -#include "WeaponBM16.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponBM16, (CGameObject), - { module(luaState)[class_("CWeaponBM16").def(constructor<>())]; }); diff --git a/src/xrGame/weaponshotgun_script.cpp b/src/xrGame/weaponshotgun_script.cpp deleted file mode 100644 index c23f1ae8b80..00000000000 --- a/src/xrGame/weaponshotgun_script.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "pch_script.h" -#include "WeaponShotgun.h" -#include "WeaponAutomaticShotgun.h" -#include "xrScriptEngine/ScriptExporter.hpp" - -using namespace luabind; - -SCRIPT_EXPORT(CWeaponShotgun, (CGameObject), { - module(luaState)[class_("CWeaponShotgun").def(constructor<>()), - class_("CWeaponAutomaticShotgun").def(constructor<>())]; -}); diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj index a94debaea47..b5ef72f4bbb 100644 --- a/src/xrGame/xrGame.vcxproj +++ b/src/xrGame/xrGame.vcxproj @@ -2384,10 +2384,6 @@ pch_script.h $(IntDir)$(ProjectName)_script.pch - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - @@ -2861,10 +2857,6 @@ - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - @@ -3642,110 +3634,43 @@ - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - + - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - + + + - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - + pch_script.h $(IntDir)$(ProjectName)_script.pch - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - + - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - + pch_script.h $(IntDir)$(ProjectName)_script.pch - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - + - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - - - pch_script.h - $(IntDir)$(ProjectName)_script.pch - + + diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters index 870d092c18c..136ea781a0f 100644 --- a/src/xrGame/xrGame.vcxproj.filters +++ b/src/xrGame/xrGame.vcxproj.filters @@ -2299,6 +2299,9 @@ {d9b405a9-3bb7-4739-bfc6-60b1a7c278cc} + + {db77f57b-2177-4c67-98d3-eb3e09476a41} + @@ -8533,45 +8536,24 @@ Core\Client\Objects\items & weapons\Weapons\Custom Weapon\Automatic - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon Walther 99 - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon Vintorez Core\Client\Objects\items & weapons\Weapons\Various weapons\Knife - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Knife - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon Groza - - Core\Client\Objects\items & weapons\Weapons\Various weapons\RGD5 - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon Val - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon USP45 - Core\Client\Objects\items & weapons\Weapons\Various weapons\Bolt - - Core\Client\Objects\items & weapons\Weapons\Various weapons\SVU - Core\Client\Objects\items & weapons\Weapons\Various weapons\RPG7 - - Core\Client\Objects\items & weapons\Weapons\Various weapons\RPG7 - - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Grenade F1 - Core\Client\Objects\items & weapons\Weapons\Various weapons\SVD @@ -8587,42 +8569,24 @@ Core\Client\Objects\items & weapons\Weapons\Various weapons\HPSA - - Core\Client\Objects\items & weapons\Weapons\Various weapons\HPSA - Core\Client\Objects\items & weapons\Weapons\Various weapons\PM Core\Client\Objects\items & weapons\Weapons\Various weapons\Binocular - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Binocular - Core\Client\Objects\items & weapons\Weapons\Various weapons\Binocular Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon Shotgun - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon Shotgun - - - Core\Client\Objects\items & weapons\Weapons\Various weapons\FORT - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon RG6 - - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon RG6 - Core\Client\Objects\items & weapons\Weapons\Various weapons\BM-16 - - Core\Client\Objects\items & weapons\Weapons\Various weapons\BM-16 - Core\Client\Objects\items & weapons\Weapons\Various weapons\Weapon AutomaticShotgun @@ -10218,6 +10182,9 @@ UI\Common\LoadingScreen + + Core\Client\Objects\items & weapons\Weapons\WeaponScript +