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

disable sway

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1390 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-10-18 19:07:08 +00:00
parent b129ec518f
commit b2d0e5cda9
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/admin.cfg
+4 -1
View File
@@ -5,4 +5,7 @@ alias mastermode [ callvote 3 $arg1 ]
alias autoteam [ callvote 4 $arg1 ]
alias forceteam [ callvote 5 $arg1 ]
alias givemaster [ callvote 6 $arg1 ]
alias map [ callvote 7 $arg1 $arg2 ]
alias map [ callvote 7 $arg1 $arg2 ]
alias recorddemo [ callvote 8 $arg1 ]
alias stopdemo [ callvote 9 ]
alias cleardemos [ callvote 10 $arg1 ]
source/src/hudgun.cpp
+21 -17
View File
@@ -1,8 +1,8 @@
#include "cube.h"
VAR(nosway, 0, 0, 1);
VAR(swayspeeddiv, 1, 105, 1000);
VAR(swaymovediv, 1, 200, 1000);
VAR(swayupspeeddiv, 1, 105, 1000);
VAR(swayupmovediv, 1, 200, 1000);
@@ -77,24 +77,28 @@ struct weaponmove
k_rot = kick_rot(player1->gunselect)*kick;
k_back = kick_back(player1->gunselect)*kick/10;
}
float swayspeed = sinf((float)swaymillis/swayspeeddiv)/(swaymovediv/10.0f);
float swayupspeed = cosf((float)swaymillis/swayupspeeddiv)/(swayupmovediv/10.0f);
if(nosway) sway.x = sway.y = sway.z = 0;
else
{
float swayspeed = sinf((float)swaymillis/swayspeeddiv)/(swaymovediv/10.0f);
float swayupspeed = cosf((float)swaymillis/swayupspeeddiv)/(swayupmovediv/10.0f);
float plspeed = min(1.0f, sqrt(player1->vel.x*player1->vel.x + player1->vel.y*player1->vel.y));
swayspeed *= plspeed/2;
swayupspeed *= plspeed/2;
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;
swayupspeed = fabs(swayupspeed); // sway a semicirle only
sway.z = 1.0f;
sway.x *= swayspeed;
sway.y *= swayspeed;
sway.z *= swayupspeed;
swap(float, sway.x, sway.y);
sway.y = -sway.y;
swayupspeed = fabs(swayupspeed); // sway a semicirle only
sway.z = 1.0f;
sway.x *= swayspeed;
sway.y *= swayspeed;
sway.z *= swayupspeed;
}
pos.x -= base.x*k_back+sway.x;
pos.y -= base.y*k_back+sway.y;