From a83479591bb88cf1c13733847556d37ef45ba902 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 15 Apr 2007 18:26:33 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@959 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/hudgun.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/source/src/hudgun.cpp b/source/src/hudgun.cpp index 839c1a22..4f09c8ae 100644 --- a/source/src/hudgun.cpp +++ b/source/src/hudgun.cpp @@ -6,10 +6,6 @@ VAR(swaymovediv, 1, 200, 1000); VAR(swayupspeeddiv, 1, 125, 1000); VAR(swayupmovediv, 1, 200, 1000); -VAR(x, 0, 0, 1000); -VAR(y, 0, 0, 1000); -VAR(z, 0, 0, 1000); - struct weaponmove { float k_rot, kick; @@ -69,19 +65,18 @@ struct weaponmove k_back = kick_back(player1->gunselect)*kick/10; } - float swayspeed = (float) (sinf((float)lastmillis/swayspeeddiv))/(swaymovediv/10.0f); - float swayupspeed = (float) (sinf((float)lastmillis/swayupspeeddiv-90))/(swayupmovediv/10.0f); + float swayspeed = sinf((float)lastmillis/swayspeeddiv)/(swaymovediv/10.0f); + float swayupspeed = cosf((float)lastmillis/swayupspeeddiv)/(swayupmovediv/10.0f); - float plspeed = min(1.0f, sqrt(fabs(player1->vel.x*player1->vel.x) + fabs(player1->vel.y*player1->vel.y))); + float plspeed = min(1.0f, sqrt(player1->vel.x*player1->vel.x + player1->vel.y*player1->vel.y)); swayspeed *= plspeed/2; swayupspeed *= plspeed/2; + + swap(float, sway.x, sway.y); + sway.y = -sway.y; - float tmp = sway.x; - sway.x = sway.y; - sway.y = -tmp; - - if(swayupspeed<0.0f)swayupspeed = -swayupspeed; // sway a semicirle only + swayupspeed = fabs(swayupspeed); // sway a semicirle only sway.z = 1.0f; sway.x *= swayspeed;