From 8c3abbb3c04c6119b8f0ceb546c3aff66703ba14 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 12 Jul 2011 14:26:09 +0000
Subject: Removed Entity::Complex flag: collision models will be used if
 availble, removed a number of irrelevant comments.

---
 src/game/base/game.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/game/base/game.cc')

diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 5639e20..2d25993 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -1160,6 +1160,7 @@ bool Game::load_zone(core::Zone *zone)
 				jumppoint = new JumpGate();
 				entity = jumppoint;
 				jumppoint->set_zone(zone);
+				jumppoint->set_radius(0);
 				count ++;
 
 			} else if (zoneini.got_section("jumppoint")) {
@@ -1175,12 +1176,16 @@ bool Game::load_zone(core::Zone *zone)
 				racetrack->set_radius(0);
 
 			} else if (zoneini.got_section("checkpoint")) {
-				checkpoint = new CheckPoint(racetrack);
-				entity = checkpoint;
+				
 				if (!racetrack) {
 					zoneini.unknown_error("checkpoint without racetrack");
+					entity = 0;
+					checkpoint = 0;
+				} else {
+					checkpoint = new CheckPoint(racetrack);
+					entity = checkpoint;
+					checkpoint->set_radius(0);
 				}
-				checkpoint->set_radius(0);
 
 			} else if (zoneini.got_section("planet")) {
 				planet = new Planet();
@@ -1533,7 +1538,6 @@ bool Game::generate_entity_menus(core::Entity *entity)
 	using core::ButtonDescription;
 
 	if ((entity->moduletype() != planet_enttype) && (entity->moduletype() != station_enttype)) {
-		//con_warn << "Can not generate menus for entity '" << entity->label() << "'" << std::endl;
 		// not dockable
 		return false;
 	}
-- 
cgit v1.2.3