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

akimbo bug fixed; some new bugs added

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4598 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2009-08-05 21:21:57 +00:00
parent bb791457ef
commit f1e879e7fd
46 changed files with 2794 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+12 -7
View File
@@ -583,16 +583,21 @@ bool weapon::reload()
return true;
}
VAR(oldfashionedgunstats, 0, 0, 1);
void weapon::renderstats()
{
char gunstats[64];
sprintf(gunstats, "%i", mag); ///%i", mag, ammo);
sprintf(gunstats, oldfashionedgunstats ? "%i/%i" : "%i", mag, ammo);
draw_text(gunstats, 690, 823);
int offset = text_width(gunstats);
glScalef(0.5f, 0.5f, 1.0f);
sprintf(gunstats, "%i", ammo);
draw_text(gunstats, (690 + offset)*2, 826*2);
glLoadIdentity();
if(!oldfashionedgunstats)
{
int offset = text_width(gunstats);
glScalef(0.5f, 0.5f, 1.0f);
sprintf(gunstats, "%i", ammo);
draw_text(gunstats, (690 + offset)*2, 826*2);
glLoadIdentity();
}
}
//VAR(recoiltest, 0, 0, 1); // FIXME ON RELEASE
@@ -808,7 +813,7 @@ bool grenades::attack(vec &targ)
int attackmillis = lastmillis-owner->lastaction;
vec &to = targ;
bool waitdone = attackmillis>=gunwait;
bool waitdone = attackmillis>=gunwait && !(m_arena && m_teammode && arenaintermission);
if(waitdone) gunwait = reloading = 0;
switch(state)