Skip to content

perf(morecolors): low-level hashtable optimization #20

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.

Sign up for GitHub

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

Open
Rushaway wants to merge 2 commits into
base: master
Choose a base branch
from
Open

perf(morecolors): low-level hashtable optimization #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e124302
perf(morecolors): low-level hashtable optimization
Rushaway Aug 27, 2025
ef81fa3
Remove hardcoded buffer length
Rushaway Dec 27, 2025
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
74 changes: 47 additions & 27 deletions addons/sourcemod/scripting/include/multicolors.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#endif
#define _multicolors_included

#define MuCo_VERSION "2.1.2"
#define MuCo_VERSION "2.2.0"

#include "multicolors/morecolors"
#include "multicolors/colors"
Expand All @@ -15,6 +15,7 @@
* - Powerlord
* - exvel
* - Dr. McKay
* - Rushaway / maxime1907 (SRCDSLAB)
*
* Based on stamm-colors
* - https://github.com/popoklopsi/Stamm/blob/master/include/stamm/stamm-colors.inc
Expand Down Expand Up @@ -108,7 +109,7 @@ stock void CPrintToChatAll(const char[] message, any ...) {
}
}
else {
MC_CheckTrie();
MC_InitFastColors();

char buffer2[MAX_BUFFER_LENGTH];

Expand Down Expand Up @@ -143,16 +144,24 @@ stock void CPrintToChatObservers(int target, const char[] message, any ...) {
CFixColors();
}

for (int client = 1; client <= MaxClients; client++) {
if (IsClientInGame(client) && !IsPlayerAlive(client) && !IsFakeClient(client)) {
int observee = GetEntPropEnt(client, Prop_Send, "m_hObserverTarget");
int ObserverMode = GetEntProp(client, Prop_Send, "m_iObserverMode");

if (observee == target && (ObserverMode == 4 || ObserverMode == 5)) {
CPrintToChat(client, buffer);
}
}
}
int observee;
int ObserverMode;

for (int client = 1; client <= MaxClients; client++) {
if (!IsClientInGame(client) || IsPlayerAlive(client) || IsFakeClient(client)) {
continue;
}

ObserverMode = GetEntProp(client, Prop_Send, "m_iObserverMode");
if (ObserverMode != 4 && ObserverMode != 5) {
continue;
}

observee = GetEntPropEnt(client, Prop_Send, "m_hObserverTarget");
if (observee == target) {
CPrintToChat(client, buffer);
}
}
}

/**
Expand Down Expand Up @@ -220,16 +229,23 @@ stock void CPrintToChatObserversEx(int target, const char[] message, any ...) {
CFixColors();
}

for (int client = 1; client <= MaxClients; client++) {
if (IsClientInGame(client) && !IsPlayerAlive(client) && !IsFakeClient(client)) {
int observee = GetEntPropEnt(client, Prop_Send, "m_hObserverTarget");
int ObserverMode = GetEntProp(client, Prop_Send, "m_iObserverMode");

if (observee == target && (ObserverMode == 4 || ObserverMode == 5)) {
CPrintToChatEx(client, target, buffer);
}
}
}
int observee;
int ObserverMode;
for (int client = 1; client <= MaxClients; client++) {
if (!IsClientInGame(client) || IsPlayerAlive(client) || IsFakeClient(client)) {
continue;
}

ObserverMode = GetEntProp(client, Prop_Send, "m_iObserverMode");
if (ObserverMode != 4 && ObserverMode != 5) {
continue;
}

observee = GetEntPropEnt(client, Prop_Send, "m_hObserverTarget");
if (observee == target) {
CPrintToChatEx(client, target, buffer);
}
}
}

/**
Expand Down Expand Up @@ -453,9 +469,13 @@ stock void CFixColors() {
}

stock bool IsSource2009() {
return (GetEngineVersion() == Engine_CSS
|| GetEngineVersion() == Engine_HL2DM
|| GetEngineVersion() == Engine_DODS
|| GetEngineVersion() == Engine_TF2
|| GetEngineVersion() == Engine_SDK2013);
static bool checked = false;
static bool result = false;

if (!checked) {
EngineVersion engine = GetEngineVersion();
result = (engine == Engine_CSS || engine == Engine_HL2DM || engine == Engine_DODS || engine == Engine_TF2 || engine == Engine_SDK2013);
checked = true;
}
return result;
}
Loading