Adjusted map target modelview scaling, fixed a crash when targetting an entity without model.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/client/mapwindow.cc b/src/client/mapwindow.cc
index ffc777e..ed88f88 100644
--- a/src/client/mapwindow.cc
+++ b/src/client/mapwindow.cc
@@ -183,6 +183,8 @@ void MapWindow::set_target(const core::Entity *entity) {
 			mapwindow_modelview->set_mode(ui::ModelView::Model);
 			mapwindow_modelview->set_modelname(mapwindow_target->model()->name());
 			mapwindow_modelview->set_colors(mapwindow_target->color(), mapwindow_target->color_second());
+			mapwindow_modelview->set_zoom(2.5f);
+			mapwindow_modelview->set_radius(2.0f);
 			
 		} else if (mapwindow_target->type() == core::Entity::Globe) {
 			mapwindow_modelview->set_mode(ui::ModelView::Globe);
@@ -193,9 +195,15 @@ void MapWindow::set_target(const core::Entity *entity) {
 				globe->flag_is_set(core::Entity::Bright),
 				globe->coronaname()
 			);
+			mapwindow_modelview->set_zoom(2.5f);
+			if (globe->flag_is_set(core::Entity::Bright))
+				mapwindow_modelview->set_radius(0.5f);
+			else
+				mapwindow_modelview->set_radius(1.0f);
 		} else {
 			mapwindow_modelview->set_mode(ui::ModelView::Model);
-			mapwindow_modelview->set_modelname(0);
+			const std::string empty;
+			mapwindow_modelview->set_modelname(empty);
 		}
 		
 		mapwindow_modelview->show();