Skip to content

Commit 7ef837b

Browse files
committed
Moved weapon script export to WeaponScript.cpp
Fixed inheritance of script weapon classes.
1 parent 1ca95df commit 7ef837b

31 files changed

+168
-326
lines changed

src/xrGame/F1.cpp

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/xrGame/F1.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ class CF1 : public CGrenade
77
typedef CGrenade inherited;
88

99
public:
10-
CF1(void);
11-
virtual ~CF1(void);
10+
CF1() {}
11+
virtual ~CF1() {}
1212
};

src/xrGame/RGD5.cpp

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/xrGame/RGD5.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
22

3-
#include "grenade.h"
3+
#include "Grenade.h"
44

55
class CRGD5 : public CGrenade
66
{
77
typedef CGrenade inherited;
88

99
public:
10-
CRGD5(void);
11-
virtual ~CRGD5(void);
10+
CRGD5() {}
11+
virtual ~CRGD5() {}
1212
};

src/xrGame/WeaponAK74.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#include "pch_script.h"
1+
#include "stdafx.h"
22
#include "WeaponAK74.h"
3-
#include "xrScriptEngine/ScriptExporter.hpp"
43

54
CWeaponAK74::CWeaponAK74(ESoundTypes eSoundType) : CWeaponMagazinedWGrenade(eSoundType) {}
65
CWeaponAK74::~CWeaponAK74() {}
7-
using namespace luabind;
8-
9-
SCRIPT_EXPORT(CWeaponAK74, (CGameObject),
10-
{ module(luaState)[class_<CWeaponAK74, CGameObject>("CWeaponAK74").def(constructor<>())]; });

src/xrGame/WeaponBinoculars_script.cpp

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/xrGame/WeaponFN2000.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#include "pch_script.h"
1+
#include "stdafx.h"
22
#include "WeaponFN2000.h"
3-
#include "xrScriptEngine/ScriptExporter.hpp"
43

54
CWeaponFN2000::CWeaponFN2000() : CWeaponMagazined(SOUND_TYPE_WEAPON_SNIPERRIFLE) {}
65
CWeaponFN2000::~CWeaponFN2000() {}
7-
using namespace luabind;
8-
9-
SCRIPT_EXPORT(CWeaponFN2000, (CGameObject),
10-
{ module(luaState)[class_<CWeaponFN2000, CGameObject>("CWeaponFN2000").def(constructor<>())]; });

src/xrGame/WeaponFORT.cpp

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/xrGame/WeaponFORT.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ class CWeaponFORT : public CWeaponPistol
99

1010
protected:
1111
public:
12-
CWeaponFORT();
13-
virtual ~CWeaponFORT();
12+
CWeaponFORT() {}
13+
virtual ~CWeaponFORT() {}
1414
};

src/xrGame/WeaponGroza.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#include "pch_script.h"
2-
#include "weapongroza.h"
3-
#include "xrScriptEngine/ScriptExporter.hpp"
1+
#include "stdafx.h"
2+
#include "WeaponGroza.h"
43

54
CWeaponGroza::CWeaponGroza() : CWeaponMagazinedWGrenade(SOUND_TYPE_WEAPON_SUBMACHINEGUN) {}
65
CWeaponGroza::~CWeaponGroza() {}
7-
using namespace luabind;
8-
9-
SCRIPT_EXPORT(CWeaponGroza, (CGameObject),
10-
{ module(luaState)[class_<CWeaponGroza, CGameObject>("CWeaponGroza").def(constructor<>())]; });

0 commit comments

Comments
 (0)