Refactor trace calls and remove the debug crap from the previous commit.

4 files changed, 2 insertions, 33 deletions

diff --git a/src/game/game.cpp b/src/game/game.cpp
index 4b9a9a3..8deadd6 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -251,31 +251,6 @@ void state_t::command(v2f_t x, int number)
 	if (!selected_units.size())
 		return;
 
-	// debugging
-	if (number == 666) {
-		for (size_t i = 0; i < 100; i++) {
-			v2f_t rad;
-			world::trace_t best;
-
-			best.hit = false;
-			best.frac = 2.0f;
-
-			rad = v2f_t::rad(i / 99.0f * 2.0f * M_PI);
-
-			for (unit_t *unit : selected_units) {
-				world::trace_t trace;
-
-				trace = world::ray_v_rect(x, x + rad * 10, unit->cmodel.bounds);
-				if (trace.frac < best.frac)
-					best = trace;
-			}
-
-			debug_render->render_line(x, best.end, (best.hit ? sf::Color::Yellow : sf::Color::White));
-		}
-
-		return;
-	}
-
 	snap[0] = std::round(x[0] - 0.5f) + 0.5f;
 	snap[1] = std::round(x[1] - 0.5f) + 0.5f;
 
diff --git a/src/game/interface.cpp b/src/game/interface.cpp
index 7615acf..b187d42 100644
--- a/src/game/interface.cpp
+++ b/src/game/interface.cpp
@@ -334,12 +334,6 @@ void state_t::render_to(render::state_t *render)
 	std::stringstream ss;
 	double fps;
 
-	// debug
-	{
-		auto wmouse = window->mapPixelToCoords(sf::Mouse::getPosition(*window));
-		game->command(wmouse, 666);
-	}
-
 	if (select.selecting) {
 		sf::Color color;
 
diff --git a/src/game/unit_soldier.cpp b/src/game/unit_soldier.cpp
index 4112d9a..e44e8a2 100644
--- a/src/game/unit_soldier.cpp
+++ b/src/game/unit_soldier.cpp
@@ -84,7 +84,7 @@ void unit_soldier_t::shoot(v2f_t aim)
 
 	end = x + (aim - x).norm() * 40;
 
-	trace = world->trace(x, end, CF_SOLID);
+	trace = world->ray_v_all(x, end, CF_SOLID, this);
 
 	muzzle_point = x + v2f_t(0, -1.0f);
 
diff --git a/src/game/unit_spider.cpp b/src/game/unit_spider.cpp
index 9d1ec30..728e42e 100644
--- a/src/game/unit_spider.cpp
+++ b/src/game/unit_spider.cpp
@@ -56,7 +56,7 @@ void unit_spider_t::target_and_attack(void)
 	if ((x - target->x).len() >= 1.0f)
 		return;
 
-	trace = world->trace(x, target->x, CF_SOLID);
+	trace = world->ray_v_tiles(x, target->x, CF_SOLID);
 	if (trace.hit)
 		return;