Benedikt Straub has proposed merging lp:~widelands-dev/widelands/geologist-messages into lp:widelands.
Commit message: Geologist messages use the resourceĀ“s image as icon instead of the resource indicatorĀ“s Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1793021 in widelands: "ressource indicators wrong display in message box" https://bugs.launchpad.net/widelands/+bug/1793021 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/geologist-messages into lp:widelands.
=== modified file 'src/logic/map_objects/tribes/worker.cc' --- src/logic/map_objects/tribes/worker.cc 2018-09-10 12:32:56 +0000 +++ src/logic/map_objects/tribes/worker.cc 2018-09-18 18:26:02 +0000 @@ -959,7 +959,7 @@ const ResourceDescription* const rdescr = world.get_resource(position.field->get_resources()); const TribeDescr& t = owner().tribe(); - const Immovable& ri = game.create_immovable( + game.create_immovable( position, t.get_resource_indicator( rdescr, (rdescr && rdescr->detectable()) ? position.field->get_resources_amount() : 0), @@ -980,7 +980,7 @@ get_owner()->add_message_with_timeout( game, std::unique_ptr<Message>( new Message(Message::Type::kGeologists, game.get_gametime(), - rdescr->descname(), ri.descr().representative_image_filename(), + rdescr->descname(), rdescr->representative_image(), rdescr->descname(), message, position, serial_, rdescr->name())), rdescr->timeout_ms(), rdescr->timeout_radius()); }
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp