Skip to content

Commit

Permalink
Revert a941aee (bad rename).
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Nov 14, 2015
1 parent 4410adb commit 83631d8
Show file tree
Hide file tree
Showing 11 changed files with 96 additions and 97 deletions.
4 changes: 2 additions & 2 deletions src/xrGame/GameObject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ const animation_movement_controller* animation_movement ( ) const { return m_an
bool nonscript_usable();
void set_nonscript_usable(bool usable);

ScriptObjectBinder *GetScriptObjectBinder() { return scriptBinder.object(); }
void SetScriptObjectBinder(ScriptObjectBinder *object) { scriptBinder.set_object(object); }
CScriptBinderObject *GetScriptBinderObject() { return scriptBinder.object(); }
void SetScriptBinderObject(CScriptBinderObject *object) { scriptBinder.set_object(object); }
};

#endif // !defined(AFX_GAMEOBJECT_H__3DA72D03_C759_4688_AEBB_89FA812AA873__INCLUDED_)
2 changes: 1 addition & 1 deletion src/xrGame/script_binder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void CScriptBinder::net_Destroy ()
xr_delete (m_object);
}

void CScriptBinder::set_object (ScriptObjectBinder *object)
void CScriptBinder::set_object (CScriptBinderObject *object)
{
if (IsGameTypeSingle()) {
VERIFY2 (!m_object,"Cannot bind to the object twice!");
Expand Down
8 changes: 4 additions & 4 deletions src/xrGame/script_binder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#pragma once

class CSE_Abstract;
class ScriptObjectBinder;
class CScriptBinderObject;
class NET_Packet;

class CScriptBinder {
protected:
ScriptObjectBinder *m_object;
CScriptBinderObject *m_object;

public:
CScriptBinder ();
Expand All @@ -30,8 +30,8 @@ class CScriptBinder {
virtual void load (IReader &input_packet);
virtual BOOL net_SaveRelevant();
virtual void net_Relcase (CObject *object);
void set_object (ScriptObjectBinder *object);
IC ScriptObjectBinder *object ();
void set_object (CScriptBinderObject *object);
IC CScriptBinderObject *object ();
};

#include "script_binder_inline.h"
2 changes: 1 addition & 1 deletion src/xrGame/script_binder_inline.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

IC ScriptObjectBinder *CScriptBinder::object ()
IC CScriptBinderObject *CScriptBinder::object ()
{
return (m_object);
}
26 changes: 13 additions & 13 deletions src/xrGame/script_binder_object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,61 +10,61 @@
#include "script_binder_object.h"
#include "script_game_object.h"

ScriptObjectBinder::ScriptObjectBinder(CScriptGameObject *object)
CScriptBinderObject::CScriptBinderObject (CScriptGameObject *object)
{
m_object = object;
}

ScriptObjectBinder::~ScriptObjectBinder()
CScriptBinderObject::~CScriptBinderObject ()
{
#ifdef DEBUG
if (m_object)
Msg ("Destroying binded object %s",m_object->Name());
#endif
}

void ScriptObjectBinder::reinit ()
void CScriptBinderObject::reinit ()
{
}

void ScriptObjectBinder::reload (LPCSTR section)
void CScriptBinderObject::reload (LPCSTR section)
{
}

bool ScriptObjectBinder::net_Spawn (SpawnType DC)
bool CScriptBinderObject::net_Spawn (SpawnType DC)
{
return (true);
}

void ScriptObjectBinder::net_Destroy ()
void CScriptBinderObject::net_Destroy ()
{
}

void ScriptObjectBinder::net_Import (NET_Packet *net_packet)
void CScriptBinderObject::net_Import (NET_Packet *net_packet)
{
}

void ScriptObjectBinder::net_Export (NET_Packet *net_packet)
void CScriptBinderObject::net_Export (NET_Packet *net_packet)
{
}

void ScriptObjectBinder::shedule_Update (u32 time_delta)
void CScriptBinderObject::shedule_Update (u32 time_delta)
{
}

void ScriptObjectBinder::save (NET_Packet *output_packet)
void CScriptBinderObject::save (NET_Packet *output_packet)
{
}

void ScriptObjectBinder::load (IReader *input_packet)
void CScriptBinderObject::load (IReader *input_packet)
{
}

bool ScriptObjectBinder::net_SaveRelevant ()
bool CScriptBinderObject::net_SaveRelevant ()
{
return (false);
}

void ScriptObjectBinder::net_Relcase (CScriptGameObject *object)
void CScriptBinderObject::net_Relcase (CScriptGameObject *object)
{
}
7 changes: 3 additions & 4 deletions src/xrGame/script_binder_object.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ class CSE_ALifeObject;
class CScriptGameObject;
class NET_Packet;

class ScriptObjectBinder
{
class CScriptBinderObject {
public:
typedef CSE_ALifeObject* SpawnType;
CScriptGameObject *m_object;

public:
ScriptObjectBinder(CScriptGameObject *object);
virtual ~ScriptObjectBinder();
CScriptBinderObject (CScriptGameObject *object);
virtual ~CScriptBinderObject();
virtual void reinit ();
virtual void reload (LPCSTR section);
virtual bool net_Spawn (SpawnType DC);
Expand Down
28 changes: 14 additions & 14 deletions src/xrGame/script_binder_object_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@

using namespace luabind;

SCRIPT_EXPORT(ScriptObjectBinder, (),
SCRIPT_EXPORT(CScriptBinderObject, (),
{
module(luaState)
[
class_<ScriptObjectBinder,ScriptObjectBinderWrapper>("object_binder")
.def_readonly("object", &ScriptObjectBinder::m_object)
class_<CScriptBinderObject,CScriptBinderObjectWrapper>("object_binder")
.def_readonly("object", &CScriptBinderObject::m_object)
.def( constructor<CScriptGameObject*>())
.def("reinit", &ScriptObjectBinder::reinit, &ScriptObjectBinderWrapper::reinit_static)
.def("reload", &ScriptObjectBinder::reload, &ScriptObjectBinderWrapper::reload_static)
.def("net_spawn", &ScriptObjectBinder::net_Spawn, &ScriptObjectBinderWrapper::net_Spawn_static)
.def("net_destroy", &ScriptObjectBinder::net_Destroy, &ScriptObjectBinderWrapper::net_Destroy_static)
.def("net_import", &ScriptObjectBinder::net_Import, &ScriptObjectBinderWrapper::net_Import_static)
.def("net_export", &ScriptObjectBinder::net_Export, &ScriptObjectBinderWrapper::net_Export_static)
.def("update", &ScriptObjectBinder::shedule_Update, &ScriptObjectBinderWrapper::shedule_Update_static)
.def("save", &ScriptObjectBinder::save, &ScriptObjectBinderWrapper::save_static)
.def("load", &ScriptObjectBinder::load, &ScriptObjectBinderWrapper::load_static)
.def("net_save_relevant", &ScriptObjectBinder::net_SaveRelevant, &ScriptObjectBinderWrapper::net_SaveRelevant_static)
.def("net_Relcase", &ScriptObjectBinder::net_Relcase, &ScriptObjectBinderWrapper::net_Relcase_static)
.def("reinit", &CScriptBinderObject::reinit, &CScriptBinderObjectWrapper::reinit_static)
.def("reload", &CScriptBinderObject::reload, &CScriptBinderObjectWrapper::reload_static)
.def("net_spawn", &CScriptBinderObject::net_Spawn, &CScriptBinderObjectWrapper::net_Spawn_static)
.def("net_destroy", &CScriptBinderObject::net_Destroy, &CScriptBinderObjectWrapper::net_Destroy_static)
.def("net_import", &CScriptBinderObject::net_Import, &CScriptBinderObjectWrapper::net_Import_static)
.def("net_export", &CScriptBinderObject::net_Export, &CScriptBinderObjectWrapper::net_Export_static)
.def("update", &CScriptBinderObject::shedule_Update, &CScriptBinderObjectWrapper::shedule_Update_static)
.def("save", &CScriptBinderObject::save, &CScriptBinderObjectWrapper::save_static)
.def("load", &CScriptBinderObject::load, &CScriptBinderObjectWrapper::load_static)
.def("net_save_relevant", &CScriptBinderObject::net_SaveRelevant, &CScriptBinderObjectWrapper::net_SaveRelevant_static)
.def("net_Relcase", &CScriptBinderObject::net_Relcase, &CScriptBinderObjectWrapper::net_Relcase_static)
];
});
72 changes: 36 additions & 36 deletions src/xrGame/script_binder_object_wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,121 +11,121 @@
#include "script_game_object.h"
#include "xrServer_Objects_ALife.h"

ScriptObjectBinderWrapper::ScriptObjectBinderWrapper(CScriptGameObject *object) :
ScriptObjectBinder(object)
CScriptBinderObjectWrapper::CScriptBinderObjectWrapper (CScriptGameObject *object) :
CScriptBinderObject (object)
{
}

ScriptObjectBinderWrapper::~ScriptObjectBinderWrapper()
CScriptBinderObjectWrapper::~CScriptBinderObjectWrapper ()
{
}

void ScriptObjectBinderWrapper::reinit ()
void CScriptBinderObjectWrapper::reinit ()
{
luabind::call_member<void> (this,"reinit");
}

void ScriptObjectBinderWrapper::reinit_static (ScriptObjectBinder *script_binder_object)
void CScriptBinderObjectWrapper::reinit_static (CScriptBinderObject *script_binder_object)
{
script_binder_object->ScriptObjectBinder::reinit ();
script_binder_object->CScriptBinderObject::reinit ();
}

void ScriptObjectBinderWrapper::reload (LPCSTR section)
void CScriptBinderObjectWrapper::reload (LPCSTR section)
{
luabind::call_member<void> (this,"reload",section);
}

void ScriptObjectBinderWrapper::reload_static (ScriptObjectBinder *script_binder_object, LPCSTR section)
void CScriptBinderObjectWrapper::reload_static (CScriptBinderObject *script_binder_object, LPCSTR section)
{
script_binder_object->ScriptObjectBinder::reload (section);
script_binder_object->CScriptBinderObject::reload (section);
}

bool ScriptObjectBinderWrapper::net_Spawn (SpawnType DC)
bool CScriptBinderObjectWrapper::net_Spawn (SpawnType DC)
{
return (luabind::call_member<bool>(this,"net_spawn",DC));
}

bool ScriptObjectBinderWrapper::net_Spawn_static (ScriptObjectBinder *script_binder_object, SpawnType DC)
bool CScriptBinderObjectWrapper::net_Spawn_static (CScriptBinderObject *script_binder_object, SpawnType DC)
{
return (script_binder_object->ScriptObjectBinder::net_Spawn(DC));
return (script_binder_object->CScriptBinderObject::net_Spawn(DC));
}

void ScriptObjectBinderWrapper::net_Destroy ()
void CScriptBinderObjectWrapper::net_Destroy ()
{
luabind::call_member<void> (this,"net_destroy");
}

void ScriptObjectBinderWrapper::net_Destroy_static (ScriptObjectBinder *script_binder_object)
void CScriptBinderObjectWrapper::net_Destroy_static (CScriptBinderObject *script_binder_object)
{
script_binder_object->ScriptObjectBinder::net_Destroy();
script_binder_object->CScriptBinderObject::net_Destroy();
}

void ScriptObjectBinderWrapper::net_Import (NET_Packet *net_packet)
void CScriptBinderObjectWrapper::net_Import (NET_Packet *net_packet)
{
luabind::call_member<void> (this,"net_import",net_packet);
}

void ScriptObjectBinderWrapper::net_Import_static (ScriptObjectBinder *script_binder_object, NET_Packet *net_packet)
void CScriptBinderObjectWrapper::net_Import_static (CScriptBinderObject *script_binder_object, NET_Packet *net_packet)
{
script_binder_object->ScriptObjectBinder::net_Import (net_packet);
script_binder_object->CScriptBinderObject::net_Import (net_packet);
}

void ScriptObjectBinderWrapper::net_Export (NET_Packet *net_packet)
void CScriptBinderObjectWrapper::net_Export (NET_Packet *net_packet)
{
luabind::call_member<void> (this,"net_export",net_packet);
}

void ScriptObjectBinderWrapper::net_Export_static (ScriptObjectBinder *script_binder_object, NET_Packet *net_packet)
void CScriptBinderObjectWrapper::net_Export_static (CScriptBinderObject *script_binder_object, NET_Packet *net_packet)
{
script_binder_object->ScriptObjectBinder::net_Export (net_packet);
script_binder_object->CScriptBinderObject::net_Export (net_packet);
}

void ScriptObjectBinderWrapper::shedule_Update (u32 time_delta)
void CScriptBinderObjectWrapper::shedule_Update (u32 time_delta)
{
luabind::call_member<void> (this,"update",time_delta);
}

void ScriptObjectBinderWrapper::shedule_Update_static (ScriptObjectBinder *script_binder_object, u32 time_delta)
void CScriptBinderObjectWrapper::shedule_Update_static (CScriptBinderObject *script_binder_object, u32 time_delta)
{
script_binder_object->ScriptObjectBinder::shedule_Update (time_delta);
script_binder_object->CScriptBinderObject::shedule_Update (time_delta);
}

void ScriptObjectBinderWrapper::save (NET_Packet *output_packet)
void CScriptBinderObjectWrapper::save (NET_Packet *output_packet)
{
luabind::call_member<void> (this,"save",output_packet);
}

void ScriptObjectBinderWrapper::save_static (ScriptObjectBinder *script_binder_object, NET_Packet *output_packet)
void CScriptBinderObjectWrapper::save_static (CScriptBinderObject *script_binder_object, NET_Packet *output_packet)
{
script_binder_object->ScriptObjectBinder::save (output_packet);
script_binder_object->CScriptBinderObject::save (output_packet);
}

void ScriptObjectBinderWrapper::load (IReader *input_packet)
void CScriptBinderObjectWrapper::load (IReader *input_packet)
{
luabind::call_member<void> (this,"load",input_packet);
}

void ScriptObjectBinderWrapper::load_static (ScriptObjectBinder *script_binder_object, IReader *input_packet)
void CScriptBinderObjectWrapper::load_static (CScriptBinderObject *script_binder_object, IReader *input_packet)
{
script_binder_object->ScriptObjectBinder::load (input_packet);
script_binder_object->CScriptBinderObject::load (input_packet);
}

bool ScriptObjectBinderWrapper::net_SaveRelevant ()
bool CScriptBinderObjectWrapper::net_SaveRelevant ()
{
return (luabind::call_member<bool>(this,"net_save_relevant"));
}

bool ScriptObjectBinderWrapper::net_SaveRelevant_static(ScriptObjectBinder *script_binder_object)
bool CScriptBinderObjectWrapper::net_SaveRelevant_static(CScriptBinderObject *script_binder_object)
{
return (script_binder_object->ScriptObjectBinder::net_SaveRelevant());
return (script_binder_object->CScriptBinderObject::net_SaveRelevant());
}

void ScriptObjectBinderWrapper::net_Relcase (CScriptGameObject *object)
void CScriptBinderObjectWrapper::net_Relcase (CScriptGameObject *object)
{
luabind::call_member<void> (this,"net_Relcase",object);
}

void ScriptObjectBinderWrapper::net_Relcase_static (ScriptObjectBinder *script_binder_object, CScriptGameObject *object)
void CScriptBinderObjectWrapper::net_Relcase_static (CScriptBinderObject *script_binder_object, CScriptGameObject *object)
{
script_binder_object->ScriptObjectBinder::net_Relcase (object);
script_binder_object->CScriptBinderObject::net_Relcase (object);
}
28 changes: 14 additions & 14 deletions src/xrGame/script_binder_object_wrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@

class CScriptGameObject;

class ScriptObjectBinderWrapper : public ScriptObjectBinder, public luabind::wrap_base {
class CScriptBinderObjectWrapper : public CScriptBinderObject, public luabind::wrap_base {
public:
ScriptObjectBinderWrapper(CScriptGameObject *object);
virtual ~ScriptObjectBinderWrapper();
CScriptBinderObjectWrapper (CScriptGameObject *object);
virtual ~CScriptBinderObjectWrapper ();
virtual void reinit ();
static void reinit_static (ScriptObjectBinder *script_binder_object);
static void reinit_static (CScriptBinderObject *script_binder_object);
virtual void reload (LPCSTR section);
static void reload_static (ScriptObjectBinder *script_binder_object, LPCSTR section);
static void reload_static (CScriptBinderObject *script_binder_object, LPCSTR section);
virtual bool net_Spawn (SpawnType DC);
static bool net_Spawn_static (ScriptObjectBinder *script_binder_object, SpawnType DC);
static bool net_Spawn_static (CScriptBinderObject *script_binder_object, SpawnType DC);
virtual void net_Destroy ();
static void net_Destroy_static (ScriptObjectBinder *script_binder_object);
static void net_Destroy_static (CScriptBinderObject *script_binder_object);
virtual void net_Import (NET_Packet *net_packet);
static void net_Import_static (ScriptObjectBinder *script_binder_object, NET_Packet *net_packet);
static void net_Import_static (CScriptBinderObject *script_binder_object, NET_Packet *net_packet);
virtual void net_Export (NET_Packet *net_packet);
static void net_Export_static (ScriptObjectBinder *script_binder_object, NET_Packet *net_packet);
static void net_Export_static (CScriptBinderObject *script_binder_object, NET_Packet *net_packet);
virtual void shedule_Update (u32 time_delta);
static void shedule_Update_static (ScriptObjectBinder *script_binder_object, u32 time_delta);
static void shedule_Update_static (CScriptBinderObject *script_binder_object, u32 time_delta);
virtual void save (NET_Packet *output_packet);
static void save_static (ScriptObjectBinder *script_binder_object, NET_Packet *output_packet);
static void save_static (CScriptBinderObject *script_binder_object, NET_Packet *output_packet);
virtual void load (IReader *input_packet);
static void load_static (ScriptObjectBinder *script_binder_object, IReader *input_packet);
static void load_static (CScriptBinderObject *script_binder_object, IReader *input_packet);
virtual bool net_SaveRelevant ();
static bool net_SaveRelevant_static (ScriptObjectBinder *script_binder_object);
static bool net_SaveRelevant_static (CScriptBinderObject *script_binder_object);
virtual void net_Relcase (CScriptGameObject *object);
static void net_Relcase_static (ScriptObjectBinder *script_binder_object, CScriptGameObject *object);
static void net_Relcase_static (CScriptBinderObject *script_binder_object, CScriptGameObject *object);
};
Loading

0 comments on commit 83631d8

Please sign in to comment.