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

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@818 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-01-15 22:30:35 +00:00
parent d101d3d221
commit 95d8a679ec
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clients2c.cpp
+5 -5
View File
@@ -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);
};
source/src/weapon.cpp
+1 -1
View File
@@ -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" },
};