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

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@326 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-08-15 16:42:43 +00:00
parent db6db0e1e5
commit d47812b663
11 changed files with 497 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/rendermd3.cpp
+5 -4
View File
@@ -231,6 +231,8 @@ void md3model::render()
a->frm = 0;
nextfrm = a->frm + 1;
}
/*printf("frame %i\n", a->frm);*/
#define interpolate(p1,p2) ((p1) + t * ((p2) - (p1)))
@@ -401,8 +403,7 @@ struct weaponmove
calcmove(vec base, int basetime)
{
bool akimbo = player1->akimbo && player1->gunselect==GUN_PISTOL;
bool throwingnade = player1->gunselect==GUN_GRENADE && player1->thrownademillis && !player1->inhandnade;
int timediff = throwingnade ? (lastmillis-player1->thrownademillis) : lastmillis-basetime;
int timediff = NADE_THROWING ? (lastmillis-player1->thrownademillis) : lastmillis-basetime;
int animtime = attackdelay(player1->gunselect);
int rtime = reloadtime(player1->gunselect);
@@ -446,8 +447,8 @@ struct weaponmove
if(player1->lastaction && player1->lastattackgun==player1->gunselect)
{
if(throwingnade) anim = MDL_GUN_ATTACK2;
else if(lastmillis-player1->lastaction<animtime || (player1->gunselect==GUN_GRENADE && player1->inhandnade))
if(NADE_THROWING && timediff<animtime) anim = MDL_GUN_ATTACK2;
else if(lastmillis-player1->lastaction<animtime || NADE_IN_HAND)
anim = MDL_GUN_ATTACK;
};