model API cleanup, render WORLDSCALE

3 files changed, 5 insertions, 5 deletions

diff --git a/src/client/buymenu.cc b/src/client/buymenu.cc
index 79b5444..8c69a7a 100644
--- a/src/client/buymenu.cc
+++ b/src/client/buymenu.cc
@@ -32,7 +32,7 @@ BuyMenu::BuyMenu(ui::Widget *parent, const char * label) : ui::Window(parent)
 	menu_modelview = new ui::ModelView(menu_modelpane);
 	menu_modelview->set_label("modelview");
 	menu_modelview->set_background(false);
-	menu_modelview->set_border(true);
+	menu_modelview->set_border(false);
 
 	menu_closebutton = new ui::Button(menu_modelpane, "Close","view hide");
 
diff --git a/src/client/hud.cc b/src/client/hud.cc
index 3d32d3a..102c445 100644
--- a/src/client/hud.cc
+++ b/src/client/hud.cc
@@ -117,7 +117,7 @@ void HUD::draw_target(core::Entity *entity, bool is_active_target)
 	target = render::Camera::axis().transpose() * target;
 
 	// calculate the intersection between the line (0,0,0)-target and the frustum front
-	float t = (render::Camera::frustum_front() + 0.001f) / target.x;
+	float t = (render::FRUSTUMFRONT + 0.001f) / target.x;
 	Vector3f center(target *t);
 
 	float cx = render::State::width() * (0.5 - center.y);
diff --git a/src/client/targets.cc b/src/client/targets.cc
index c634557..496f4e5 100644
--- a/src/client/targets.cc
+++ b/src/client/targets.cc
@@ -226,7 +226,7 @@ void func_target_center(std::string const &args)
 	
 	// this is essentialy the hover algorithm with the cursor in the center
 	core::Entity *new_target = 0;
-	math::Vector3f center = render::Camera::eye() + render::Camera::axis().forward() * (render::Camera::frustum_front() + 0.001);
+	math::Vector3f center = render::Camera::eye() + render::Camera::axis().forward() * (render::FRUSTUMFRONT + 0.001);
 	float smallest_d = -1;
 
 	for (core::Zone::Content::iterator it=core::localcontrol()->zone()->content().begin(); it != core::localcontrol()->zone()->content().end(); it++) {
@@ -359,11 +359,11 @@ void frame()
 		y = (float)(input::mouse_position_y() - render::State::height() /2) / (float)render::State::height() / render::State::aspect();
 	}
 
-	Vector3f cursor = render::Camera::eye() + render::Camera::axis().forward() * (render::Camera::frustum_front() + 0.001);
+	Vector3f cursor = render::Camera::eye() + render::Camera::axis().forward() * (render::FRUSTUMFRONT + 0.001);
 	cursor -= render::Camera::axis().left() * x;
 	cursor -= render::Camera::axis().up() * y;
 
-	math::Vector3f center = render::Camera::eye() + (render::Camera::axis().forward() * (render::Camera::frustum_front() +0.001f));
+	math::Vector3f center = render::Camera::eye() + (render::Camera::axis().forward() * (render::FRUSTUMFRONT +0.001f));
 	for (core::Zone::Content::iterator it=zone->content().begin(); it != zone->content().end(); it++) {
 		core::Entity *entity = (*it);