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@1288 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-09-03 17:57:16 +00:00
parent 7ed7a2bac7
commit 1b5d7310a9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entity.h
+1
View File
@@ -407,6 +407,7 @@ struct bounceent : physent // nades, gibs
#define NADE_IN_HAND (player1->gunselect==GUN_GRENADE && player1->inhandnade)
#define NADE_THROWING (player1->gunselect==GUN_GRENADE && player1->thrownademillis && !player1->inhandnade)
#define NADE_THROW_TIME (13*(1000/25))
#define has_akimbo(d) ((d)->gunselect==GUN_PISTOL && (d)->akimbo)
source/src/hudgun.cpp
+3 -3
View File
@@ -19,10 +19,10 @@ struct weaponmove
void calcmove(vec base, int basetime)
{
int timediff = NADE_THROWING ? (lastmillis-player1->thrownademillis) : lastmillis-basetime;
int animtime = min(player1->gunwait[player1->gunselect], attackdelay(player1->gunselect));
int timediff = NADE_THROWING ? lastmillis-player1->thrownademillis : lastmillis-basetime;
int animtime = NADE_THROWING ? NADE_THROW_TIME : min(player1->gunwait[player1->gunselect], attackdelay(player1->gunselect));
int rtime = reloadtime(player1->gunselect);
kick = k_rot = 0.0f;
pos = player1->o;
anim = ANIM_GUN_IDLE;
source/src/weapon.cpp
+1 -1
View File
@@ -731,7 +731,7 @@ void shoot(playerent *d, vec &targ)
{
d->shots = 0;
if(d->thrownademillis && attacktime >= 13*(1000/25))
if(d->thrownademillis && attacktime >= NADE_THROW_TIME)
{
d->weaponchanging = true;
d->nextweapon = d->mag[GUN_GRENADE] ? GUN_GRENADE : d->primary;