when reloading, keep weapon down until gunwait is finished even if longer than reloading time

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3668 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2008-11-20 08:27:43 +00:00
parent 8b77658168
commit 5870cc2797
+5 -4
View File
@@ -40,15 +40,16 @@ struct weaponmove
{
anim = ANIM_GUN_RELOAD;
basetime = player1->weaponchanging;
float progress = max(0.0f, min(1.0f, (lastmillis - player1->weaponchanging)/(float) weapon::weaponchangetime));
k_rot = -(sinf((float)(progress*2*90.0f)*PI/180.0f)*90);
float progress = clamp((lastmillis - player1->weaponchanging)/(float)weapon::weaponchangetime, 0.0f, 1.0f);
k_rot = -90*sinf(progress*M_PI);
}
else if(player1->weaponsel->reloading)
{
anim = ANIM_GUN_RELOAD;
basetime = player1->weaponsel->reloading;
float progress = max(0.0f, min(1.0f, (lastmillis - player1->weaponsel->reloading)/(float)player1->weaponsel->info.reloadtime));
k_rot = -(sinf((float)(progress*2*90.0f)*PI/180.0f)*90);
float reloadtime = (float)player1->weaponsel->info.reloadtime,
progress = clamp((lastmillis - player1->weaponsel->reloading)/reloadtime, 0.0f, clamp(1.0f - (player1->lastaction + player1->weaponsel->gunwait - lastmillis)/reloadtime, 0.5f, 1.0f));
k_rot = -90*sinf(progress*M_PI);
}
else
{