Skip to content

Commit fc2a659

Browse files
committed
Different approach to fix errors fixed in #376
1 parent 4a791d6 commit fc2a659

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

src/core/modules/engines/engines_gamerules_wrap.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
#include "engines_gamerules.h"
3434

3535
// SDK
36+
// CS:GO/Blade doesn't compile without the next two lines
37+
#if defined(ENGINE_CSGO) | defined(ENGINE_BLADE)
38+
#include "baseanimating.h"
39+
extern IUniformRandomStream* randomStr;
40+
#define random randomStr
41+
#endif
3642
#include "game/shared/gamerules.h"
3743

3844
//---------------------------------------------------------------------------------

src/core/modules/entities/blade/entities_props.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
//-----------------------------------------------------------------------------
3737
// ServerClass extension class.
3838
//-----------------------------------------------------------------------------
39-
class ServerClassExt
39+
class ServerClassSpecificExt
4040
{
4141
public:
4242
static const char *get_name(ServerClass *pServerClass)

src/core/modules/entities/blade/entities_props_wrap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
template<class T, class U>
4242
void export_engine_specific_server_class(T _props, U ServerClass_)
4343
{
44-
ServerClass_.add_property("name", &ServerClassExt::get_name);
44+
ServerClass_.add_property("name", &ServerClassSpecificExt::get_name);
4545
}
4646

4747

src/core/modules/entities/csgo/entities_props.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
//-----------------------------------------------------------------------------
3737
// ServerClass extension class.
3838
//-----------------------------------------------------------------------------
39-
class ServerClassExt
39+
class ServerClassSpecificExt
4040
{
4141
public:
4242
static const char *get_name(ServerClass *pServerClass)

src/core/modules/entities/csgo/entities_props_wrap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
template<class T, class U>
4242
void export_engine_specific_server_class(T _props, U ServerClass_)
4343
{
44-
ServerClass_.add_property("name", &ServerClassExt::get_name);
44+
ServerClass_.add_property("name", &ServerClassSpecificExt::get_name);
4545
}
4646

4747

0 commit comments

Comments
 (0)