From 95d8a679ecf4ea3f8f01c8627a2aa253d41c1be4 Mon Sep 17 00:00:00 2001 From: driAn Date: Mon, 15 Jan 2007 22:30:35 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@818 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clients2c.cpp | 10 +++++----- source/src/weapon.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 48477a69..3729c964 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -253,7 +253,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) if(actor==cn) { - conoutf("%s suicided", d->name); + conoutf("\f2%s suicided", d->name); } else if(actor==clientnum) { @@ -261,14 +261,14 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) if(isteam(player1->team, d->team)) { frags = -1; - conoutf("you fragged a teammate (%s)", d->name); + conoutf("\f2you fragged a teammate (%s)", d->name); extern void showteamkill(); showteamkill(); } else { frags = 1; - conoutf("you fragged %s", d->name); + conoutf("\f2you fragged %s", d->name); }; addmsg(SV_FRAGS, "ri", player1->frags += frags); if(gib) addgib(d); @@ -280,11 +280,11 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) { if(isteam(a->team, d->team)) { - conoutf("%s fragged his teammate (%s)", a->name, d->name); + conoutf("\f2%s fragged his teammate (%s)", a->name, d->name); } else { - conoutf("%s fragged %s", a->name, d->name); + conoutf("\f2%s fragged %s", a->name, d->name); }; if(gib) addgib(d); }; diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 790b240d..4317c869 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -16,7 +16,7 @@ guninfo guns[NUMGUNS] = { S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 5, 0, 0, 1, 35, 7, 9, 9, false, "shotgun" }, //reload time is for 1 shell from 7 too powerful to 6 { S_SUBGUN, S_RSUBGUN, 1650, 80, 16, 0, 0, 70, 15, 30, 1, 2, true, "subgun" }, { S_SNIPER, S_RSNIPER, 1950, 1500, 85, 0, 0, 60, 50, 5, 4, 4, false, "sniper" }, - { S_ASSAULT, S_RASSAULT, 2000, 130, 25, 0, 0, 20, 40, 15, 0, 2, true, "assault" }, //recoil was 44 + { S_ASSAULT, S_RASSAULT, 2000, 130, 25, 0, 0, 20, 40, 15, 0, 2, false, "assault" }, //recoil was 44 { S_NULL, S_NULL, 1000, 1200, 150, 20, 6, 1, 1, 1, 3, 1, false, "grenade" }, };