Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: excessive work with the PrepareArray and client_print_color error #22

Merged
merged 1 commit into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/amxmodx/scripting/include/rt_api.inc
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ forward rt_creating_corpse_start(const iEnt, const id);
*
* @noreturn
*/
forward rt_creating_corpse_end(const iEnt, const id, const vOrigin[3]);
forward rt_creating_corpse_end(const iEnt, const id, const Float:vOrigin[3]);

/**
* Removal of corpses
Expand Down
9 changes: 2 additions & 7 deletions addons/amxmodx/scripting/rt_core.sma
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,9 @@ public MessageHook_ClCorpse() {
if(g_eCvars[CORPSE_TIME])
set_entvar(iEnt, var_fuser4, get_gametime() + g_eCvars[CORPSE_TIME]);

new szOriginData[3];
fOrigin[2] += 20.0;

for(new i; i < 3; i++)
szOriginData[i] = floatround(fOrigin[i]);

szOriginData[2] += 20;

ExecuteForward(g_eForwards[CreatingCorpseEnd], _, iEnt, iPlayer, PrepareArray(szOriginData, sizeof(szOriginData)));
ExecuteForward(g_eForwards[CreatingCorpseEnd], _, iEnt, iPlayer, PrepareArray(_:fOrigin, sizeof(fOrigin)));

return PLUGIN_HANDLED;
}
Expand Down
9 changes: 2 additions & 7 deletions addons/amxmodx/scripting/rt_effects.sma
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,13 @@ public rt_revive_end(const iEnt, const id, const iActivator, const Modes:eMode)
}
}

public rt_creating_corpse_end(const iEnt, const id, const origin[3]) {
public rt_creating_corpse_end(const iEnt, const id, const Float:vOrigin[3]) {
if(g_eCvars[CORPSE_SPRITE][0] == EOS)
return;

new iEntSprite = rg_create_entity("info_target");

new Float:fOrigin[3];

for(new i; i < 3; i++)
fOrigin[i] = float(origin[i]);

engfunc(EngFunc_SetOrigin, iEntSprite, fOrigin);
engfunc(EngFunc_SetOrigin, iEntSprite, vOrigin);
engfunc(EngFunc_SetModel, iEntSprite, g_eCvars[CORPSE_SPRITE]);

set_entvar(iEntSprite, var_classname, CORPSE_SPRITE_CLASSNAME);
Expand Down
2 changes: 1 addition & 1 deletion addons/amxmodx/scripting/rt_planting.sma
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public rt_revive_start(const iEnt, const id, const iActivator, const Modes:eMode
}

if(iMode == MODE_PLANT) {
UTIL_NotifyClient(iActivator, print_team_red, "%l%l", "RT_CHAT_TAG", "RT_IS_PLANTED");
UTIL_NotifyClient(iActivator, print_team_red, "%l%l", "RT_CHAT_TAG", "RT_IS_PLANTED", id);
return PLUGIN_HANDLED;
}
}
Expand Down