Skip to content

Commit 6ddb564

Browse files
committed
Code refactoring
1 parent 38630ed commit 6ddb564

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

client/input/gamepad.as

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void ClearState( void ) {
9393
/**
9494
* Adds view rotation from the gamepad.
9595
*/
96-
Vec3 AddViewAngles() {
96+
Vec3 GetAngularMovement() {
9797
Vec3 viewAngles;
9898
Vec4 sticks = GetThumbsticks();
9999

@@ -131,7 +131,7 @@ Vec3 AddViewAngles() {
131131
/**
132132
* Adds movement from the gamepad.
133133
*/
134-
Vec3 AddMovement() {
134+
Vec3 GetMovement() {
135135
Vec3 movement;
136136
Vec4 sticks = GetThumbsticks();
137137

client/input/keys.as

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ float KeyState( Kbutton @key ) {
260260
}
261261

262262
/*
263-
* AddViewAngles
263+
* GetAngularMovement
264264
*/
265-
Vec3 AddViewAngles( void ) {
265+
Vec3 GetAngularMovement( void ) {
266266
float speed;
267267
Vec3 viewAngles;
268268

@@ -288,9 +288,9 @@ Vec3 AddViewAngles( void ) {
288288
}
289289

290290
/*
291-
* AddMovement
291+
* GetMovement
292292
*/
293-
Vec3 AddMovement() {
293+
Vec3 GetMovement() {
294294
float down;
295295
Vec3 movement;
296296

client/input/main.as

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,27 @@ uint GetButtonBits()
6767
return bits;
6868
}
6969

70-
Vec3 AddViewAngles( const Vec3 angles )
70+
Vec3 GetAngularMovement()
7171
{
72-
Vec3 diff;
72+
Vec3 move;
7373

74-
diff += CGame::Input::Keys::AddViewAngles();
75-
diff += CGame::Input::Mouse::AddViewAngles();
76-
diff += CGame::Input::Gamepad::AddViewAngles();
77-
diff += CGame::Input::Touch::AddViewAngles();
74+
move += CGame::Input::Keys::GetAngularMovement();
75+
move += CGame::Input::Mouse::GetAngularMovement();
76+
move += CGame::Input::Gamepad::GetAngularMovement();
77+
move += CGame::Input::Touch::GetAngularMovement();
7878

79-
return angles + diff;
79+
return move;
8080
}
8181

82-
Vec3 AddMovement( const Vec3 move )
82+
Vec3 GetMovement()
8383
{
84-
Vec3 diff;
84+
Vec3 move;
8585

86-
diff += CGame::Input::Keys::AddMovement();
87-
diff += CGame::Input::Gamepad::AddMovement();
88-
diff += CGame::Input::Touch::AddMovement();
86+
move += CGame::Input::Keys::GetMovement();
87+
move += CGame::Input::Gamepad::GetMovement();
88+
move += CGame::Input::Touch::GetMovement();
8989

90-
return move + diff;
90+
return move;
9191
}
9292

9393
}

client/input/mouse.as

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void Move( int mx, int my ) {
130130
/**
131131
* Adds view rotation from mouse.
132132
*/
133-
Vec3 AddViewAngles() {
133+
Vec3 GetAngularMovement() {
134134
Vec3 move;
135135

136136
if( mouse_x != 0.0 || mouse_y != 0.0 ) {

client/input/touch.as

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ void Frame( void ) {
6969
}
7070

7171
/*
72-
* AddViewAngles
72+
* GetAngularMovement
7373
*/
74-
Vec3 AddViewAngles() {
74+
Vec3 GetAngularMovement() {
7575
Vec3 viewAngles;
7676

7777
Touchpad @viewpad = GetTouchpad( TOUCHPAD_VIEW );
@@ -111,9 +111,9 @@ Vec3 AddViewAngles() {
111111
}
112112

113113
/*
114-
* AddMovement
114+
* GetMovement
115115
*/
116-
Vec3 AddMovement() {
116+
Vec3 GetMovement() {
117117
int upmove;
118118
Vec3 movement;
119119

0 commit comments

Comments
 (0)