*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@226 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-03-16 20:12:29 +00:00
parent b241c057d4
commit d5c4c91fc6
2 changed files with 5 additions and 2 deletions
+2 -1
View File
@@ -183,7 +183,8 @@ void localservertoclient(uchar *buf, int len) // processes any updates from th
e.y = getint(p)/DMF;
e.z = getint(p)/DMF;
if(gun==GUN_SHOTGUN) createrays(s, e);
int nademillis = getint(p)*100;
int nademillis = 2000/100*getint(p);
if(nademillis<0 || nademillis>100) nademillis = 100;
printf("nadesec: %i\n", nademillis);
shootv(gun, s, e, d, nademillis);
break;
+3 -1
View File
@@ -330,7 +330,9 @@ void throw_nade(dynent *d, vec &to, physent *p)
if(d==player1)
{
addmsg(1, 9, SV_SHOT, d->gunselect, (int)(from.x*DMF), (int)(from.y*DMF), (int)(from.z*DMF), (int)(to.x*DMF), (int)(to.y*DMF), (int)(to.z*DMF), (int)((lastmillis-p->millis)/100));
int percent_done = (lastmillis-p->millis)*100/2000;
if(percent_done < 0 || percent_done > 100) percent_done = 100;
addmsg(1, 9, SV_SHOT, d->gunselect, (int)(from.x*DMF), (int)(from.y*DMF), (int)(from.z*DMF), (int)(to.x*DMF), (int)(to.y*DMF), (int)(to.z*DMF), percent_done);
printf("grenade: %i\n", (lastmillis-curnade->millis)/100);
if(curnade) curnade = NULL;
};