diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-12-28 22:55:35 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-12-28 22:55:35 +0000 |
| commit | f416e6b792e5dda143f60b7a2724db6b3ec33d75 (patch) | |
| tree | 553ddcaa6c60489904a8db818eff688c0b85a437 /src/client/mapwindow.cc | |
| parent | fe96eee5db2acbef1ea0f360b180fd9f8f990444 (diff) | |
Support for rendering globes with rings,
removed hardcoded 'corona' prefix for corona textures,
added support for projectile fire sounds.
Diffstat (limited to 'src/client/mapwindow.cc')
| -rw-r--r-- | src/client/mapwindow.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/mapwindow.cc b/src/client/mapwindow.cc index c8ebaa8..19cf687 100644 --- a/src/client/mapwindow.cc +++ b/src/client/mapwindow.cc @@ -238,8 +238,10 @@ void MapWindow::show_entity_info(const core::Entity *entity) mapwindow_modelview->set_colors(globe->color(), globe->color_second()); mapwindow_modelview->set_globetexturename( globe->texturename(), - globe->has_flag(core::Entity::Bright), - globe->coronaname() + globe->coronaname(), + globe->ringsname(), + globe->has_flag(core::Entity::Bright) + ); mapwindow_modelview->set_zoom(2.5f); if (globe->has_flag(core::Entity::Bright)) { |