X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=9d5c5df783bcdae26d78e5145230f1ef9793464f;hb=25b79ab38c2be2e5c89b8240504f641fd9c4899c;hp=d9370844e8ae24cb0f061777dd1e00d0381fce0e;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index d937084..9d5c5df 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -52,11 +52,11 @@ void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const
 	}
 }
 
-void Track3D::render()
+void Track3D::render() const
 {
 	prepare_render();
 
-	glPushName((unsigned)this);
+	glPushName(reinterpret_cast<unsigned>(this));
 
 	varray.apply();
 	glColor4f(0.25*color.r, 0.25*color.g, 0.25*color.b, 1);
@@ -71,7 +71,7 @@ void Track3D::render()
 	glPopMatrix();
 }
 
-void Track3D::render_endpoints()
+void Track3D::render_endpoints() const
 {
 	prepare_render();
 
@@ -99,7 +99,7 @@ void Track3D::render_endpoints()
 	glPopMatrix();
 }
 
-void Track3D::render_route(int route)
+void Track3D::render_route(int route) const
 {
 	prepare_render();
 
@@ -115,7 +115,7 @@ void Track3D::render_route(int route)
 	glPopMatrix();
 }
 
-void Track3D::prepare_render()
+void Track3D::prepare_render() const
 {
 	const Point &pos=track.get_position();
 	float rot=track.get_rotation();
@@ -175,7 +175,7 @@ void Track3D::build_part(const TrackPart &part, GL::VertexArrayBuilder &va_build
 	unsigned nsegs;
 	if(radius)
 	{
-		nsegs=(unsigned)(part.length*(1<<quality))+1;
+		nsegs=static_cast<unsigned>(part.length*(1<<quality))+1;
 		Point center(x-sin(dir)*radius, y+cos(dir)*radius, 0);
 		float r=fabs(radius);
 		float start=((radius<0)?M_PI:0)+dir;