From 302c1cf912752bc0b2816de471f835c148507989 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 10 Apr 2006 10:50:42 +0000 Subject: [PATCH] added support for %w/%W (weapon/ammo); asay_ aliases for some useful messages git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1269 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 9 +++++++++ data/qcsrc/server/gamec/miscfunctions.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/data/default.cfg b/data/default.cfg index 35d5df2c5..f0672b48f 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -14,6 +14,15 @@ set g_nexuizversion "1.5.1 RC3" gameversion 15102 +// say aliases +alias asay_ctf_flagcarrier "say_team flag carrier at %y" +alias asay_ctf_haveflag "say_team (%l) have the flag" +alias asay_willgo "say_team will go to %y" +alias asay_support "say_team (%l) need help, %h%%" +alias asay_killed "say_team got killed at %d" +alias asay_noammo "say_team (%l) need %W for %w" +alias asay_drop "say_team (%l) dropped %w ; impulse 17" + // other aliases alias +scores "+showscores; ping" alias -scores "-showscores" diff --git a/data/qcsrc/server/gamec/miscfunctions.c b/data/qcsrc/server/gamec/miscfunctions.c index 511e444f4..d676f795f 100644 --- a/data/qcsrc/server/gamec/miscfunctions.c +++ b/data/qcsrc/server/gamec/miscfunctions.c @@ -269,6 +269,24 @@ string(string msg) formatmessage = replacement = NearestLocation(self.cursor_trace_endpos); else if(escape == "d") replacement = NearestLocation(self.death_origin); + else if(escape == "w") + { + float wep; + wep = self.weapon; + if(!wep) + wep = self.switchweapon; + if(!wep) + wep = self.cnt; + replacement = W_Name(wep); + } + else if(escape == "W") + { + if(self.items & IT_SHELLS) replacement = "shells"; + else if(self.items & IT_NAILS) replacement = "bullets"; + else if(self.items & IT_ROCKETS) replacement = "rockets"; + else if(self.items & IT_CELLS) replacement = "cells"; + else replacement = "batteries"; // ;) + } else if(escape == "x") { if(self.cursor_trace_ent) -- 2.39.2