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>2008-02-03 01:43:03 +0000
committerStijn Buys <ingar@osirion.org>2008-02-03 01:43:03 +0000
commitb4973888aeaea2dde6058bc06c3f6631349e7f3c (patch)
tree010de10692b330d7634ad3090fb94d14c101f484 /src/client/camera.cc
parent67f8a7a783e550cab8e6a77d997b31815ee8cd7e (diff)
command buffer handling
engine function parsing buffered client console
Diffstat (limited to 'src/client/camera.cc')
-rw-r--r--src/client/camera.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/client/camera.cc b/src/client/camera.cc
index 5355a26..a7c3349 100644
--- a/src/client/camera.cc
+++ b/src/client/camera.cc
@@ -4,8 +4,7 @@
the terms and conditions of the GNU General Public License version 2
*/
-#include "client/camera.h"
-#include "game/game.h"
+#include "client/client.h"
#include "math/mathlib.h"
using math::degrees360f;
@@ -40,7 +39,7 @@ Camera::~Camera()
void Camera::draw(float elapsed)
{
if (mode == Track) {
- yaw_target = game::ship.yaw();
+ yaw_target = game.ship.yaw();
}
// adjust yaw
@@ -107,7 +106,7 @@ void Camera::nextmode() {
case Overview:
// switch camera to Track mode
mode = Track;
- yaw_target = game::ship.yaw();
+ yaw_target = game.ship.yaw();
yaw_current = yaw_target;
pitch_target = pitch_track;
pitch_current = pitch_target;
@@ -116,7 +115,7 @@ void Camera::nextmode() {
case Track:
// switch camera to Free mode
mode = Free;
- yaw_target = game::ship.yaw();
+ yaw_target = game.ship.yaw();
yaw_current = yaw_target;
pitch_target = pitch_track;
pitch_current = pitch_target;