It compiles

1 files changed, 5 insertions, 10 deletions

diff --git a/game/client/world/player_target.cc b/game/client/world/player_target.cc
index f0550c0..3ede47e 100644
--- a/game/client/world/player_target.cc
+++ b/game/client/world/player_target.cc
@@ -16,17 +16,15 @@
 

 constexpr static float MAX_REACH = 16.0f;

 

-voxel_id world::player_target::voxel;

 voxel_pos world::player_target::coord;

 voxel_pos world::player_target::normal;

-const world::VoxelInfo* world::player_target::info;

+const world::Voxel* world::player_target::voxel;

 

 void world::player_target::init(void)

 {

-    world::player_target::voxel = NULL_VOXEL_ID;

     world::player_target::coord = voxel_pos();

     world::player_target::normal = voxel_pos();

-    world::player_target::info = nullptr;

+    world::player_target::voxel = nullptr;

 }

 

 void world::player_target::update(void)

@@ -37,29 +35,26 @@ void world::player_target::update(void)
         do {

             world::player_target::voxel = ray.step();

 

-            if(world::player_target::voxel != NULL_VOXEL_ID) {

+            if(world::player_target::voxel) {

                 world::player_target::coord = ray.vpos;

                 world::player_target::normal = ray.vnormal;

-                world::player_target::info = world::voxel_registry::find(world::player_target::voxel);

                 break;

             }

 

             world::player_target::coord = voxel_pos();

             world::player_target::normal = voxel_pos();

-            world::player_target::info = nullptr;

         } while(ray.distance < MAX_REACH);

     }

     else {

-        world::player_target::voxel = NULL_VOXEL_ID;

+        world::player_target::voxel = nullptr;

         world::player_target::coord = voxel_pos();

         world::player_target::normal = voxel_pos();

-        world::player_target::info = nullptr;

     }

 }

 

 void world::player_target::render(void)

 {

-    if((world::player_target::voxel != NULL_VOXEL_ID) && !client_game::hide_hud) {

+    if(world::player_target::voxel && !client_game::hide_hud) {

         auto cpos = coord::to_chunk(world::player_target::coord);

         auto fpos = coord::to_local(world::player_target::coord);