Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-11-11 20:56:30 +0000
committerStijn Buys <ingar@osirion.org>2012-11-11 20:56:30 +0000
commit7bec374404aa1a0b30c220aee49b4a9890437f75 (patch)
tree8800c5623039b59bd781d4310e0c9c966e3b2b8e /src/client
parent89d8f7f384dcd6c201288bf6fe86ab19e59e1a5c (diff)
Cleaned up core::EntyControlable client-side and server-side proprties API.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/input.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/client/input.cc b/src/client/input.cc
index 480ba61..2c03c64 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -909,14 +909,14 @@ void frame()
else if (local_thrust > 0.99f)
local_thrust = 1.0f;
- core::localcontrol()->set_thrust(local_thrust);
- core::localcontrol()->set_direction(local_direction);
- core::localcontrol()->set_pitch(local_pitch / render::State::aspect());
- core::localcontrol()->set_roll(local_roll);
- core::localcontrol()->set_strafe(local_strafe);
- core::localcontrol()->set_vstrafe(local_vstrafe);
- core::localcontrol()->set_afterburner(local_afterburner);
- core::localcontrol()->set_control_flags(local_controlflags);
+ core::localcontrol()->set_target_thrust(local_thrust);
+ core::localcontrol()->set_target_direction(local_direction);
+ core::localcontrol()->set_target_pitch(local_pitch / render::State::aspect());
+ core::localcontrol()->set_target_roll(local_roll);
+ core::localcontrol()->set_target_strafe(local_strafe);
+ core::localcontrol()->set_target_vstrafe(local_vstrafe);
+ core::localcontrol()->set_target_afterburner(local_afterburner);
+ core::localcontrol()->set_target_controlflags(local_controlflags);
} else {
@@ -926,6 +926,7 @@ void frame()
local_vstrafe = 0.0f;
local_strafe = 0.0f;
local_afterburner = 0.0f;
+ local_controlflags = 0;
render::Camera::set_direction(0.0f);
render::Camera::set_pitch(0.0f);