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

warning fix for killmessage, removing gibmessage

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6239 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lucas GAUTHERON
2011-04-12 20:47:16 +00:00
parent 222029426c
commit 9e9c62bcc3
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entity.h
+2 -14
View File
@@ -617,23 +617,11 @@ struct medalsst {bool assigned; int cn; int item;};
#define MAXKILLMSGLEN 16
extern char fragmessages[NUMGUNS][MAXKILLMSGLEN];
extern char gibmessages[NUMGUNS][MAXKILLMSGLEN];
inline char *killmessage(int gun, bool gib = false)
inline const char *killmessage(int gun, bool gib = false)
{
if(gun<0 || gun>=NUMGUNS) return "";
if(gib) return gibmessages[gun];
else return fragmessages[gun];
}
// TODO : remove when custom kill messages feature is finished (2011apr06,lucas)
inline const char * gib_message(int gun)
{
switch (gun)
{
case GUN_KNIFE: return "slashed";
case GUN_SNIPER: return "sniped"; // alternative: "eliminated"; // 2011jan17:ft: "headshot" is not an action, it's a noun, headshotted is not a word.
case GUN_SHOTGUN: return "splattered";
case GUN_GRENADE:
default: return "gibbed";
}
}