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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1210 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-08-07 16:56:31 +00:00
parent fdfc4f4358
commit 48ef16f292
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+4 -1
View File
@@ -33,6 +33,8 @@ void checkweaponswitch()
{
gun_changed = true;
player1->weaponchanging = false;
if(player1->gunwait) player1->gunwait = max(player1->gunwait - (lastmillis-player1->lastaction), 0);
player1->lastaction = player1->gunwait ? lastmillis : 0;
}
else if(timeprogress>WEAPONCHANGE_TIME/2)
{
@@ -118,10 +120,11 @@ void reload(playerent *d)
if(d->mag[d->gunselect] >= (has_akimbo(d) ? 2 : 1)*guns[d->gunselect].magsize) return;
if(d == player1) setscope(false);
if(player1->gunwait) player1->gunwait = max(player1->gunwait - (lastmillis-player1->lastaction), 0);
d->reloading = true;
d->lastaction = lastmillis;
d->akimbolastaction[0] = d->akimbolastaction[1] = lastmillis;
d->gunwait = guns[d->gunselect].reloadtime;
d->gunwait += guns[d->gunselect].reloadtime;
int numbullets = (has_akimbo(d) ? 2 : 1)*guns[d->gunselect].magsize - d->mag[d->gunselect];