thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-11-04 00:07:19 +01:00
Code Releases Activity

Avoid creating multiple objects for the same string when event parameters contain strings.

Browse Source 
Include a helper fonstructor in the light object type for quick string object creation.
This commit is contained in:
Sandu Liviu Catalin
2017-02-21 22:17:25 +02:00
parent 135484e467
commit c5b509dcb3
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/sqrat/sqratObject.h
View File

@@ -711,6 +711,24 @@ struct LightObj {
}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// Constructs a LightObj from a string
///
/// \param i The string itself
/// \param i The length of the string
/// \param v VM that the object will exist in
///
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
LightObj(const SQChar * s, SQInteger l, HSQUIRRELVM v = DefaultVM::Get()) {
sq_pushstring(v, s, l);
if (SQ_FAILED(sq_getstackobj(v, -1, &mObj))) {
sq_resetobject(&mObj);
} else {
sq_addref(v, &mObj);
}
sq_pop(v, 1);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// Construct a LightObj from a regular Object instance.
///

28
source/CoreEvents.cpp
View File

@@ -200,7 +200,8 @@ void Core::EmitIncomingConnection(CStr player_name, size_t name_buffer_size, CCS
// Attempt to forward the event to the script callback
try
{
(*mOnIncomingConnection.first)(player_name, name_buffer_size, user_password, ip_address);
(*mOnIncomingConnection.first)(LightObj(player_name, -1), name_buffer_size,
LightObj(user_password, -1), LightObj(ip_address, -1));
}
catch (...)
{
@@ -290,8 +291,9 @@ void Core::EmitPlayerDisembark(Int32 player_id, Int32 vehicle_id)
void Core::EmitPlayerRename(Int32 player_id, CCStr old_name, CCStr new_name)
{
PlayerInst & _player = m_Players.at(player_id);
(*_player.mOnRename.first)(old_name, new_name);
(*mOnPlayerRename.first)(_player.mObj, old_name, new_name);
LightObj oname(old_name, -1), nname(new_name, -1);
(*_player.mOnRename.first)(oname, nname);
(*mOnPlayerRename.first)(_player.mObj, oname, nname);
}
// ------------------------------------------------------------------------------------------------
@@ -538,16 +540,18 @@ void Core::EmitPlayerAway(Int32 player_id, bool is_away)
void Core::EmitPlayerMessage(Int32 player_id, CCStr message)
{
PlayerInst & _player = m_Players.at(player_id);
(*_player.mOnMessage.first)(message);
(*mOnPlayerMessage.first)(_player.mObj, message);
LightObj msg(message, -1);
(*_player.mOnMessage.first)(msg);
(*mOnPlayerMessage.first)(_player.mObj, msg);
}
// ------------------------------------------------------------------------------------------------
void Core::EmitPlayerCommand(Int32 player_id, CCStr message)
{
PlayerInst & _player = m_Players.at(player_id);
(*_player.mOnCommand.first)(message);
(*mOnPlayerCommand.first)(_player.mObj, message);
LightObj msg(message, -1);
(*_player.mOnCommand.first)(msg);
(*mOnPlayerCommand.first)(_player.mObj, msg);
}
// ------------------------------------------------------------------------------------------------
@@ -555,8 +559,9 @@ void Core::EmitPlayerPrivateMessage(Int32 player_id, Int32 target_player_id, CCS
{
PlayerInst & _player = m_Players.at(player_id);
PlayerInst & _receiver = m_Players.at(target_player_id);
(*_player.mOnMessage.first)(_receiver.mObj, message);
(*mOnPlayerPrivateMessage.first)(_player.mObj, _receiver.mObj, message);
LightObj msg(message, -1);
(*_player.mOnMessage.first)(_receiver.mObj, msg);
(*mOnPlayerPrivateMessage.first)(_player.mObj, _receiver.mObj, msg);
}
// ------------------------------------------------------------------------------------------------
@@ -592,8 +597,9 @@ void Core::EmitPlayerSpectate(Int32 player_id, Int32 target_player_id)
void Core::EmitPlayerCrashreport(Int32 player_id, CCStr report)
{
PlayerInst & _player = m_Players.at(player_id);
(*_player.mOnCrashreport.first)(report);
(*mOnPlayerCrashreport.first)(_player.mObj, report);
LightObj rep(report, -1);
(*_player.mOnCrashreport.first)(rep);
(*mOnPlayerCrashreport.first)(_player.mObj, rep);
}
// ------------------------------------------------------------------------------------------------