Moved weapon script export to WeaponScript.cpp

Fixed inheritance of script weapon classes.

src/xrGame/F1.h

@@ -7,6 +7,6 @@ class CF1 : public CGrenade
     typedef CGrenade inherited;
 
 public:
-    CF1(void);
-    virtual ~CF1(void);
+    CF1() {}
+    virtual ~CF1() {}
 };

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() {}
 };

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, CGameObject>("CWeaponAK74").def(constructor<>())]; });

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, CGameObject>("CWeaponFN2000").def(constructor<>())]; });

src/xrGame/WeaponFORT.h

@@ -9,6 +9,6 @@ class CWeaponFORT : public CWeaponPistol
 
 protected:
 public:
-    CWeaponFORT();
-    virtual ~CWeaponFORT();
+    CWeaponFORT() {}
+    virtual ~CWeaponFORT() {}
 };

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, CGameObject>("CWeaponGroza").def(constructor<>())]; });

src/xrGame/WeaponHPSA.cpp

@@ -1,5 +1,4 @@
-#include "pch_script.h"
-
+#include "stdafx.h"
 #include "WeaponHPSA.h"
 
 CWeaponHPSA::CWeaponHPSA() : CWeaponPistol() {}

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, CGameObject>("CWeaponLR300").def(constructor<>())]; });

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, CGameObject>("CWeaponPM").def(constructor<>())]; });

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, CGameObject>("CWeaponSVD").def(constructor<>())]; });

src/xrGame/WeaponSVU.h

@@ -7,6 +7,6 @@ class CWeaponSVU : public CWeaponCustomPistol
     typedef CWeaponCustomPistol inherited;
 
 public:
-    CWeaponSVU(void);
-    virtual ~CWeaponSVU(void);
+    CWeaponSVU() {}
+    virtual ~CWeaponSVU() {}
 };

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, CGameObject>("CWeapon")
+            .def(constructor<>())
+            .def("can_kill", (bool (CWeapon::*)() const)&CWeapon::can_kill)
+    ];
+});
+
+SCRIPT_EXPORT(CWeaponMagazined, (CWeapon),
+    { module(luaState)[class_<CWeaponMagazined, CWeapon>("CWeaponMagazined").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponMagazinedWGrenade, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponMagazinedWGrenade, CWeaponMagazined>("CWeaponMagazinedWGrenade").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponBinoculars, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponBinoculars, CWeaponMagazined>("CWeaponBinoculars").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponBM16, (CWeaponShotgun),
+    { module(luaState)[class_<CWeaponBM16, CWeaponShotgun>("CWeaponBM16").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponFN2000, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponFN2000, CWeaponMagazined>("CWeaponFN2000").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponFORT, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponFORT, CWeaponMagazined>("CWeaponFORT").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CF1, (CGameObject, CExplosive), {
+    module(luaState)[class_<CF1, bases<CGameObject, CExplosive>>("CF1").def(constructor<>()),
+    // new 14.10.08 peacemaker
+    class_<CWeaponAmmo, CGameObject>("CWeaponAmmo").def(constructor<>()),
+    class_<CMedkit, CGameObject>("CMedkit").def(constructor<>()),
+    class_<CAntirad, CGameObject>("CAntirad").def(constructor<>()),
+    class_<CFoodItem, CGameObject>("CFoodItem").def(constructor<>()),
+    class_<CBottleItem, CGameObject>("CBottleItem").def(constructor<>()),
+    class_<CInventoryBox, CGameObject>("CInventoryBox").def(constructor<>()),
+    class_<CExplosiveItem, bases<CGameObject, CExplosive>>("CExplosiveItem").def(constructor<>())];
+});
+
+SCRIPT_EXPORT(CWeaponHPSA, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponHPSA, CWeaponMagazined>("CWeaponHPSA").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponKnife, (CWeapon),
+    { module(luaState)[class_<CWeaponKnife, CWeapon>("CWeaponKnife").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponLR300, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponLR300, CWeaponMagazined>("CWeaponLR300").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponPM, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponPM, CWeaponMagazined>("CWeaponPM").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CRGD5, (CGameObject, CExplosive),
+    { module(luaState)[class_<CRGD5, bases<CGameObject, CExplosive>>("CRGD5").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponRPG7, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponRPG7, CWeaponMagazined>("CWeaponRPG7").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponSVD, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponSVD, CWeaponMagazined>("CWeaponSVD").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponSVU, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponSVU, CWeaponMagazined>("CWeaponSVU").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponAK74, (CWeaponMagazinedWGrenade),
+    { module(luaState)[class_<CWeaponAK74, CWeaponMagazinedWGrenade>("CWeaponAK74").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponAutomaticShotgun, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponAutomaticShotgun, CWeaponMagazined>("CWeaponAutomaticShotgun").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponGroza, (CWeaponMagazinedWGrenade),
+    { module(luaState)[class_<CWeaponGroza, CWeaponMagazinedWGrenade>("CWeaponGroza").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponRG6, (CWeaponShotgun),
+    { module(luaState)[class_<CWeaponRG6, CWeaponShotgun>("CWeaponRG6").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponShotgun, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponShotgun, CWeaponMagazined>("CWeaponShotgun").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponUSP45, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponUSP45, CWeaponMagazined>("CWeaponUSP45").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponVal, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponVal, CWeaponMagazined>("CWeaponVal").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponVintorez, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponVintorez, CWeaponMagazined>("CWeaponVintorez").def(constructor<>())]; });
+
+SCRIPT_EXPORT(CWeaponWalther, (CWeaponMagazined),
+    { module(luaState)[class_<CWeaponWalther, CWeaponMagazined>("CWeaponWalther").def(constructor<>())]; });

src/xrGame/WeaponUSP45.h

@@ -7,6 +7,6 @@ class CWeaponUSP45 : public CWeaponPistol
     typedef CWeaponPistol inherited;
 
 public:
-    CWeaponUSP45();
-    virtual ~CWeaponUSP45();
+    CWeaponUSP45() {}
+    virtual ~CWeaponUSP45() {}
 };

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, CGameObject>("CWeaponVal").def(constructor<>())]; });