thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-06-15 22:57:12 +02:00
Code Releases Activity

Replace GetObject with GetObj to avoid collisions on Windows.

Browse Source 
ef you MS
This commit is contained in:
Sandu Liviu Catalin
2020-04-17 17:42:09 +03:00
parent 1242b8a2fc
commit e13d1a91e7
22 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/Misc/Algo.hpp
View File

@ -712,7 +712,7 @@ template <> struct InstSpec< CObject >
*/
static inline Instances::const_iterator CBegin()
{
return Core::Get().GetObjects().cbegin();
return Core::Get().GetObjs().cbegin();
}
/* --------------------------------------------------------------------------------------------
@ -720,7 +720,7 @@ template <> struct InstSpec< CObject >
*/
static inline Instances::const_iterator CEnd()
{
return Core::Get().GetObjects().cend();
return Core::Get().GetObjs().cend();
}
/* --------------------------------------------------------------------------------------------
@ -907,7 +907,7 @@ template < typename T > struct AppendElemFunc
void operator () (const typename InstSpec< T >::Instance & inst) const
{
// Push the script object on the stack
sq_pushobject(mVM, inst.mObj.GetObject());
sq_pushobject(mVM, inst.mObj.GetObj());
// Append the object at the back of the array
if (SQ_FAILED(sq_arrayappend(mVM, mIdx)))
{

12
module/Misc/Command.hpp
View File

@ -640,7 +640,7 @@ public:
}
else
{
m_OnFail = Function(env.GetVM(), env.GetObject(), func.GetFunc());
m_OnFail = Function(env.GetVM(), env.GetObj(), func.GetFunc());
}
}
@ -669,7 +669,7 @@ public:
}
else
{
m_OnAuth = Function(env.GetVM(), env.GetObject(), func.GetFunc());
m_OnAuth = Function(env.GetVM(), env.GetObj(), func.GetFunc());
}
}
@ -1761,7 +1761,7 @@ public:
}
else
{
m_OnExec = Function(env.GetVM(), env.GetObject(), func.GetFunc());
m_OnExec = Function(env.GetVM(), env.GetObj(), func.GetFunc());
}
}
@ -1790,7 +1790,7 @@ public:
}
else
{
m_OnAuth = Function(env.GetVM(), env.GetObject(), func.GetFunc());
m_OnAuth = Function(env.GetVM(), env.GetObj(), func.GetFunc());
}
}
@ -1819,7 +1819,7 @@ public:
}
else
{
m_OnPost = Function(env.GetVM(), env.GetObject(), func.GetFunc());
m_OnPost = Function(env.GetVM(), env.GetObj(), func.GetFunc());
}
}
@ -1848,7 +1848,7 @@ public:
}
else
{
m_OnFail = Function(env.GetVM(), env.GetObject(), func.GetFunc());
m_OnFail = Function(env.GetVM(), env.GetObj(), func.GetFunc());
}
}

2
module/Misc/Routine.hpp
View File

@ -434,7 +434,7 @@ public:
*/
void SetEnv(const LightObj & env)
{
GetValid().mEnv = env.IsNull() ? LightObj(RootTable().GetObject()) : env;
GetValid().mEnv = env.IsNull() ? LightObj(RootTable().GetObj()) : env;
}
/* --------------------------------------------------------------------------------------------

2
module/Misc/Signal.hpp
View File

@ -113,7 +113,7 @@ protected:
* Forwarding constructor.
*/
Slot(Object & env, Function & func)
: Slot(env.GetObject(), func.GetFunc())
: Slot(env.GetObj(), func.GetFunc())
{
/* ... */
}

4
module/Misc/Tasks.cpp
View File

@ -190,7 +190,7 @@ LightObj & Tasks::FindEntity(Int32 id, Int32 type)
case ENT_BLIP: return Core::Get().GetBlip(id).mObj;
case ENT_CHECKPOINT: return Core::Get().GetCheckpoint(id).mObj;
case ENT_KEYBIND: return Core::Get().GetKeybind(id).mObj;
case ENT_OBJECT: return Core::Get().GetObject(id).mObj;
case ENT_OBJECT: return Core::Get().GetObj(id).mObj;
case ENT_PICKUP: return Core::Get().GetPickup(id).mObj;
case ENT_PLAYER: return Core::Get().GetPlayer(id).mObj;
case ENT_VEHICLE: return Core::Get().GetVehicle(id).mObj;
@ -244,7 +244,7 @@ SQInteger Tasks::Create(Int32 id, Int32 type, HSQUIRRELVM vm)
// Attempt to retrieve the entity instance
try
{
inst = FindEntity(id, type).GetObject();
inst = FindEntity(id, type).GetObj();
}
catch (const std::exception & e)
{