kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup killmessages

Browse Source 
* remove server-side custom killmessages (log files need to be uniform)
* clean up client-side custom killmessages
This commit is contained in:
ac-stef
2017-05-22 20:19:15 +02:00
parent 271d5b3929
commit 2bc8936680
9 changed files with 29 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+17 -9
View File
@@ -814,26 +814,34 @@ VARP(hitsound, 0, 0, 2);
void setkillmessage(const char *gun, bool gib, const char *message)
{
int guni = getlistindex(gun, gunnames, true, -1);
if(guni < 0)
if(!valid_weapon(guni))
{
conoutf("invalid gun specified");
}
else
{
if(!message || !*message)
{
result(killmessage(guni, gib));
}
else
{
copystring(killmessages[gib ? 1 : 0][guni], message, sizeof(killmessages[gib ? 1 : 0][guni]));
}
defformatstring(aname)("%smessage_%s", gib ? "gib" : "frag", gunnames[guni]);
if(*message) alias(aname, message);
const char *res = getalias(aname);
result(res ? res : "");
}
}
COMMANDF(fragmessage, "ss", (const char *gun, const char *message) { setkillmessage(gun, false, message); });
COMMANDF(gibmessage, "ss", (const char *gun, const char *message) { setkillmessage(gun, true, message); });
const char *killmessage(int gun, bool gib = false)
{
if(valid_weapon(gun))
{
extern const char *killmessages[2][NUMGUNS];
defformatstring(aname)("%smessage_%s", gib ? "gib" : "frag", gunnames[gun]);
const char *res = getalias(aname);
return res ? res : killmessages[gib ? 1 : 0][gun];
}
return "";
}
COMMANDF(burstshots, "si", (char *gun, int *shots)
{
int guni = getlistindex(gun, gunnames, true, -1);