Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/camera.cc4
-rw-r--r--src/render/textures.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/render/camera.cc b/src/render/camera.cc
index 5a6607f..6c9a115 100644
--- a/src/render/camera.cc
+++ b/src/render/camera.cc
@@ -264,11 +264,11 @@ void Camera::draw(float seconds)
}
}
-/* if (core::localcontrol()->model()) {
+ if (core::localcontrol()->model()) {
camera_target -= (core::localcontrol()->model()->maxbbox().x + 0.1f) * camera_axis.forward();
camera_target += (core::localcontrol()->model()->maxbbox().z + 0.1f ) * camera_axis.up();
}
-*/
+
} else if (mode() == Free) {
camera_axis.assign(target_axis);
diff --git a/src/render/textures.cc b/src/render/textures.cc
index 71abc87..e4b047f 100644
--- a/src/render/textures.cc
+++ b/src/render/textures.cc
@@ -45,6 +45,7 @@ void Textures::init()
// crosshairs
load("bitmaps/crosshairs/aim");
+ load("bitmaps/crosshairs/center");
load("bitmaps/crosshairs/control");
load("bitmaps/crosshairs/target");