Add playercolor to building pictures in messages
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
widelands |
Fix Released
|
Low
|
Unassigned |
Bug Description
When a military building is occupied/
If the player's tribe are the Barbarians, the spots where player colors shall be is white.
If the player plays the Atlanteans, the spots are blue, although the player's color is not blue.
The Empire has no military building with player colors (at least I could not find any).
The issue is that the Atlanteans' buildings' idle images have blue colors, while the Barbarians' ones are white. Only the idle image (without player colors) is displayed in the message window.
I think that image should always have the player colors. Therefor, only the player color mask would have to be added.
See also https:/
Related branches
- Widelands Developers: Pending requested
-
Diff: 10496 lines (+2235/-3546)134 files modifieddata/campaigns/atl01.wmf/scripting/init.lua (+2/-3)
data/campaigns/atl01.wmf/scripting/texts.lua (+58/-61)
data/campaigns/bar01.wmf/scripting/texts.lua (+71/-81)
data/campaigns/bar02.wmf/scripting/texts.lua (+33/-36)
data/campaigns/emp01.wmf/scripting/texts.lua (+28/-29)
data/campaigns/emp02.wmf/scripting/texts.lua (+35/-33)
data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua (+125/-210)
data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua (+56/-84)
data/campaigns/tutorial03_seafaring.wmf/scripting/texts.lua (+43/-74)
data/campaigns/tutorial04_economy.wmf/scripting/texts.lua (+112/-185)
data/maps/MP_Scenarios/Island_Hopping.wmf/scripting/first_island.lua (+4/-4)
data/maps/MP_Scenarios/Island_Hopping.wmf/scripting/multiplayer_init.lua (+1/-1)
data/maps/MP_Scenarios/Island_Hopping.wmf/scripting/texts.lua (+15/-16)
data/maps/MP_Scenarios/Smugglers.wmf/scripting/texts.lua (+6/-6)
data/maps/The_Green_Plateau.wmf/scripting/texts.lua (+7/-11)
data/scripting/editor/editor_controls.lua (+34/-36)
data/scripting/editor/editor_introduction.lua (+7/-9)
data/scripting/editor/format_editor.lua (+3/-22)
data/scripting/editor/terrain_help.lua (+9/-9)
data/scripting/editor/tree_help.lua (+3/-3)
data/scripting/format_scenario.lua (+7/-24)
data/scripting/formatting.lua (+321/-152)
data/scripting/messages.lua (+5/-4)
data/scripting/win_conditions/collectors.lua (+7/-7)
data/scripting/win_conditions/defeat_all.lua (+1/-0)
data/scripting/win_conditions/endless_game.lua (+1/-0)
data/scripting/win_conditions/endless_game_fogless.lua (+1/-0)
data/scripting/win_conditions/territorial_lord.lua (+1/-0)
data/scripting/win_conditions/win_condition_functions.lua (+1/-0)
data/scripting/win_conditions/win_condition_texts.lua (+5/-5)
data/scripting/win_conditions/wood_gnome.lua (+1/-1)
data/tribes/scripting/help/building_help.lua (+121/-118)
data/tribes/scripting/help/controls.lua (+75/-77)
data/tribes/scripting/help/format_help.lua (+88/-40)
data/tribes/scripting/help/introduction.lua (+2/-4)
data/tribes/scripting/help/ware_help.lua (+6/-6)
data/tribes/scripting/help/worker_help.lua (+38/-50)
data/txts/AUTHORS.lua (+17/-10)
data/txts/LICENSE.lua (+19/-29)
data/txts/README.lua (+32/-34)
data/txts/TRANSLATORS.lua (+28/-10)
data/txts/format_authors.lua (+0/-14)
data/txts/help/multiplayer_help.lua (+22/-25)
data/txts/translators_data.lua (+1/-1)
doc/sphinx/source/wlrichtext.rst (+4/-6)
src/editor/ui_menus/tool_change_resources_options_menu.cc (+1/-1)
src/graphic/CMakeLists.txt (+0/-7)
src/graphic/font.cc (+0/-1)
src/graphic/font_handler.cc (+0/-265)
src/graphic/font_handler.h (+0/-75)
src/graphic/font_handler1.cc (+3/-1)
src/graphic/graphic.cc (+0/-5)
src/graphic/richtext.cc (+0/-505)
src/graphic/richtext.h (+0/-61)
src/graphic/text/CMakeLists.txt (+1/-0)
src/graphic/text/rt_parse.cc (+29/-14)
src/graphic/text/rt_render.cc (+309/-129)
src/graphic/text/rt_render.h (+2/-9)
src/graphic/text/test/data/br/input00.txt (+0/-13)
src/graphic/text/test/data/br/width (+0/-1)
src/graphic/text/test/data/bullet_point/input00.txt (+8/-8)
src/graphic/text/test/data/div_autowidth_floatleftimg/input00.txt (+2/-2)
src/graphic/text/test/data/div_background_img/input00.txt (+2/-2)
src/graphic/text/test/data/div_fixedwidth_floatbothsides/input00.txt (+4/-4)
src/graphic/text/test/data/div_fixedwidth_floatleft/input00.txt (+2/-2)
src/graphic/text/test/data/div_fixedwidth_floatleftimg/input00.txt (+2/-2)
src/graphic/text/test/data/div_fixedwidth_floatright/input00.txt (+2/-2)
src/graphic/text/test/data/div_margin_bgclr/input00.txt (+4/-4)
src/graphic/text/test/data/div_margin_bgimg/input00.txt (+4/-4)
src/graphic/text/test/data/div_nonfloating_valign/input00.txt (+2/-2)
src/graphic/text/test/data/div_padding/input00.txt (+2/-2)
src/graphic/text/test/data/font_shadow/input00.txt (+1/-1)
src/graphic/text/test/data/table_like/input00.txt (+17/-14)
src/graphic/text_constants.h (+6/-12)
src/graphic/text_constants.h.moved (+42/-0)
src/graphic/text_layout.cc (+24/-5)
src/graphic/text_layout.h (+17/-8)
src/graphic/text_parser.cc (+0/-286)
src/graphic/text_parser.h (+0/-185)
src/logic/cmd_luacoroutine.cc (+1/-4)
src/logic/map_objects/map_object.cc (+63/-0)
src/logic/map_objects/map_object.h (+15/-1)
src/logic/map_objects/tribes/building.cc (+1/-57)
src/logic/map_objects/tribes/building.h (+0/-10)
src/logic/map_objects/tribes/militarysite.cc (+14/-8)
src/logic/map_objects/tribes/production_program.cc (+3/-4)
src/logic/map_objects/tribes/productionsite.cc (+3/-2)
src/logic/map_objects/tribes/ship.cc (+24/-48)
src/logic/map_objects/tribes/ship.h (+0/-6)
src/logic/map_objects/tribes/soldier.cc (+7/-10)
src/logic/map_objects/tribes/warehouse.cc (+12/-6)
src/logic/map_objects/tribes/worker.cc (+6/-16)
src/logic/map_objects/world/resource_description.cc (+1/-1)
src/logic/map_objects/world/resource_description.h (+3/-3)
src/scripting/lua_map.cc (+1/-1)
src/third_party/eris/lstate.h (+1/-1)
src/ui_basic/button.h (+0/-2)
src/ui_basic/editbox.cc (+2/-2)
src/ui_basic/editbox.h (+1/-1)
src/ui_basic/icongrid.h (+0/-1)
src/ui_basic/listselect.cc (+1/-1)
src/ui_basic/messagebox.cc (+1/-1)
src/ui_basic/multilineeditbox.cc (+1/-1)
src/ui_basic/multilinetextarea.cc (+63/-50)
src/ui_basic/multilinetextarea.h (+3/-10)
src/ui_basic/panel.cc (+6/-1)
src/ui_basic/progressbar.cc (+2/-2)
src/ui_basic/progresswindow.cc (+1/-1)
src/ui_basic/slider.cc (+6/-6)
src/ui_basic/textarea.cc (+1/-1)
src/ui_fsmenu/about.cc (+1/-1)
src/ui_fsmenu/base.cc (+2/-2)
src/ui_fsmenu/campaign_select.cc (+2/-2)
src/ui_fsmenu/launch_spg.cc (+1/-1)
src/ui_fsmenu/loadgame.cc (+1/-1)
src/ui_fsmenu/mapselect.cc (+1/-1)
src/ui_fsmenu/netsetup_lan.cc (+1/-1)
src/ui_fsmenu/options.cc (+1/-1)
src/wlapplication.cc (+1/-8)
src/wui/attack_box.cc (+1/-1)
src/wui/attack_box.h (+2/-1)
src/wui/chat_msg_layout.cc (+0/-60)
src/wui/chat_msg_layout.h (+0/-3)
src/wui/encyclopedia_window.cc (+6/-5)
src/wui/game_debug_ui.cc (+2/-2)
src/wui/game_message_menu.cc (+1/-5)
src/wui/game_summary.cc (+1/-1)
src/wui/gamechatpanel.cc (+3/-5)
src/wui/helpwindow.cc (+1/-1)
src/wui/helpwindow.h (+10/-7)
src/wui/mapdetails.cc (+5/-8)
src/wui/multiplayersetupgroup.cc (+1/-1)
src/wui/waresdisplay.cc (+4/-4)
utils/update_authors.py (+2/-4)
- Klaus Halfmann: Approve (test, compile, review)
- SirVer: Approve
- GunChleoc: Needs Resubmitting
- kaputtnik (community): Approve (testing)
-
Diff: 866 lines (+241/-112)26 files modifiedsrc/editor/tools/set_starting_pos_tool.cc (+1/-2)
src/editor/tools/set_starting_pos_tool.h (+1/-2)
src/editor/ui_menus/player_menu.cc (+3/-6)
src/graphic/CMakeLists.txt (+3/-0)
src/graphic/animation.cc (+12/-12)
src/graphic/animation.h (+2/-2)
src/graphic/playercolor.cc (+36/-10)
src/graphic/playercolor.h (+8/-2)
src/graphic/text/CMakeLists.txt (+1/-0)
src/graphic/text/rt_parse.cc (+2/-0)
src/graphic/text/rt_render.cc (+98/-18)
src/graphic/text_constants.h (+1/-0)
src/graphic/text_layout.cc (+17/-0)
src/graphic/text_layout.h (+1/-0)
src/logic/map_objects/map_object.cc (+2/-1)
src/logic/map_objects/tribes/building.cc (+12/-22)
src/logic/map_objects/tribes/ship.cc (+8/-11)
src/logic/map_objects/tribes/soldier.cc (+2/-2)
src/logic/map_objects/tribes/worker.cc (+1/-1)
src/ui_basic/multilinetextarea.h (+10/-2)
src/ui_fsmenu/launch_spg.cc (+1/-2)
src/wui/game_message_menu.cc (+13/-5)
src/wui/game_summary.cc (+1/-2)
src/wui/general_statistics_menu.cc (+1/-2)
src/wui/multiplayersetupgroup.cc (+3/-6)
src/wui/suggested_teams_box.cc (+1/-2)
description: | updated |
summary: |
- Blue color in message window although player's color is not blue + Add playercolor to building pictures in messages |
Changed in widelands: | |
milestone: | none → build20-rc1 |
tags: |
added: graphics removed: graphic |
Changed in widelands: | |
status: | Incomplete → In Progress |
assignee: | Jens Beyer (qcumber-some) → GunChleoc (gunchleoc) |
Changed in widelands: | |
status: | In Progress → Fix Committed |
assignee: | GunChleoc (gunchleoc) → nobody |
From what I can see, the atlantean colors are not blue, but just a blueish gray from the original pictures. So the behaviour is the same for the atlanteans and the barbarians.
However it would of course be nice to show the player color in those windows as well. :)