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

fix wrong pointer, and adding "quicknade_hold" variable

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5448 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-07-22 21:35:16 +00:00
parent 9bc699c27a
commit 72ae28dd12
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/scoreboard.cpp
+4 -4
View File
@@ -170,15 +170,15 @@ void renderscore(playerent *d)
{
case 1:
{
if(m_flags) formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->flagscore, d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, ign);
else formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, ign);
if(m_flags) formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->flagscore, d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, ign);
else formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, ign);
break;
}
case 0:
default:
{
if(m_flags) formatstring(s)("%s%d\t%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->flagscore, d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
else formatstring(s)("%s%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
if(m_flags) formatstring(s)("%s%d\t%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->flagscore, d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
else formatstring(s)("%s%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
break;
}
}
source/src/weapon.cpp
+2 -1
View File
@@ -97,6 +97,7 @@ void shiftweapon(int s)
}
bool quicknade = false;
VARP(quicknade_hold, 0, 0, 1);
void quicknadethrow(bool on)
{
@@ -106,7 +107,7 @@ void quicknadethrow(bool on)
if(player1->weapons[GUN_GRENADE]->mag > 0)
{
if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]);
if(player1->weaponsel->type == GUN_GRENADE) attack(true);
if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold ) attack(true);
}
}
else