fix docking box drawing

2 files changed, 12 insertions, 7 deletions

diff --git a/doc/index.html b/doc/index.html
index b15475f..7974f9b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -65,18 +65,19 @@
 <p>
 	<table><TR>
 		<td>Ingar=KCT=</td>
-		<td>Project lead, programming, models, graphics</td></tr>
+		<td>Game design, programming, modelling, graphics, sounds
+		</td></tr>
 
 		<td>[mDc]Thorn</td>
-		<td>Technical advisor, models, sky sphere, alpha testing
+		<td>Gameplay advice, modelling, graphics
 		</td></tr>
 
 		<td>Supertanker</td>
-		<td>Station 15 model, Supertanker model, Avatar model, Bumblebee model
+		<td>Modelling
 		</td></tr>
 
 		<td>Odin</td>
-		<td>Heavy Cruiser model</td>
+		<td>Modelling</td>
 		</tr>
 
 		<td>Josky=KCT=</td>
diff --git a/src/model/map.cc b/src/model/map.cc
index 6494cd7..0e124c6 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -877,15 +877,15 @@ Model * Map::load(std::string const &name)
 			dock = new Dock();
 			model->add_dock(dock);
 
-		} else if (mapfile.classname().compare("target_dock") == 0) {
+		} else if (mapfile.classname().compare("trigger_dock") == 0) {
 
 			// dock attributes
 			if (mapfile.got_key_vector3f("origin", dock->dock_location)) {
-				flare->light_location *= SCALE;
+				dock->dock_location *= SCALE;
 				continue;
 							
 			} else if (mapfile.got_key_float("radius", dock->dock_radius)) {
-			dock->dock_radius /= 100.0f;
+				dock->dock_radius /= 100.0f;
 				continue;
 				
 			}
@@ -973,6 +973,10 @@ Model * Map::load(std::string const &name)
 		(*eit)->engine_location -= mapfile.map_center;
 	}
 
+	for (Model::Docks::iterator dit = model->docks().begin(); dit != model->docks().end(); dit++) {
+		(*dit)->dock_location -= mapfile.map_center;
+	}
+
 	con_debug << "  " << mapfile.name() << " " << mapfile.map_brushes << " brushes " <<
 		mapfile.map_faces << "/" << mapfile.map_faces_detail << " faces/detail " << std::endl;