widelands

Merge lp:~widelands-dev/widelands/geologist-messages into lp:widelands

  1. geologist-messages
  2. Merge into trunk
Proposed by Benedikt Straub
Status: Merged
Merged at revision: 8846
Proposed branch: lp:~widelands-dev/widelands/geologist-messages
Merge into: lp:widelands
Diff against target: 208 lines (+14/-14)
2 files modified
data/tribes/immovables/resi/frisians/init.lua (+11/-11)
src/logic/map_objects/tribes/worker.cc (+3/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/geologist-messages
Reviewer Review Type Date Requested Status
hessenfarmer Approve
GunChleoc Needs Fixing
Review via email: mp+355267@code.launchpad.net

Commit message

Geologist messages use the resource's image as icon instead of the resource indicator's

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3997. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/430196840.
Appveyor build 3794. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_geologist_messages-3794.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I am against this change - it replaces a symbol that the player knows with a symbol that is never, ever seen on the map except in the editor.

How about trying it the other way around, to see how that looks?

review: Needs Fixing
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

According to how it looks in the message box it might be that the bug is hidden in the format rather than the image

I would suspect the hardcoded padding value.

https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/worker.cc#L972

Revision history for this message
Benedikt Straub (nordfriese) wrote :

@hessenfarmer: I think the bug is caused by that that the old resis were squarish while some of the new ones are much taller than wide, so the title is not indented as far as for other messages

@GunChleoc: I now put the resi image in the message body, so the two images are now swapped compared to trunk

Revision history for this message
Benedikt Straub (nordfriese) wrote :

@hessenfarmer: Uploaded improved graphics for the frisian resis to this branch, how about these?

Revision history for this message
GunChleoc (gunchleoc) wrote :

I still do not like having the editor resource images as message icons. I'd prefer to keep it as it is, or have the resource indicator for both.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

The editor icons were already being used in the message body…

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

@ Nordfriese: to test the message box I need to wait for anppveyor or build myself. Will report back later. Although I believe that the swap of the images will be very good for visibility and readability og the message box, because the non quadratic images will ever be porrly visible in the message title lines.
@ GunChleoc: I think this would fit well although we show the editor image in the title. Cause the image there si scaled so small, all that really matters is color. and the editor images provide that much better than the ressource indicators. In the body the Indicators fit better cause they are tribe specific.

Just quickly excahged the none image and a coal image. None visibility is better now but with buildhelp on it is still not ideal. If we won't go for a flag with a cross we should at least make the pole a little bit thicker and especially the knob of the flagpole bigger. For the ressources I would have preferred two equal flags (like the top one is) but that is a matter of taste. the same for the height of the poles. for my taste they could be even shorter (especially when having two equal flags but that is not that important. So your choice.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

I tested the message box finally and I think the usage of the editor images in the message title fits very well. The Res Indicator is used in the message body and is looking good there as well so I think we should have this branch.

If possible It would even be better to have the knob of the flagpoles bigger to better see the empty flagpole for the "none" Resi.

review: Approve (test)
Revision history for this message
Benedikt Straub (nordfriese) wrote :

A bigger knob wouldn´t look good imho. At least it doesn´t in Blender, and it´s hard to guess whether something looks good in-game if it looks bad while designing it. I have instead crossed the flagpole now, how about this?

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Well this would be better visible but imho it doesn't fit to a flagpole / flag concept and doesn't look that good either. So if a bigger knob does not look good as well we have two options:
Either you give it a try with having a small (smaller than the normal flags) flag with an x at half mast to increase visibility while hopefully not causing confusion with stones found

or you leave it like it is and accepting that the empty poles are not outstanding from the yellow buildhelp icons. (with buildhelp off they are clearly visible)

Only other thing that comes to my mind that might be worth a try is to move the indicator to the left so they won't be hidden behind the yellow buildhelp flags.

In every case thanks a lot for your effort and patience with my comments

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Okay, next try with a very small flag (animated) with a cross. The flag is barely visible, just enough not to vanish behind the buildhelp, so it can´t be confused with anything; the flagpole is as before.

Revision history for this message
GunChleoc (gunchleoc) wrote :

OK, you have convinced me with the message icons.

I'll have to look at the other graphics sometime next week, unless hessenfarmer greenlights them first.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

From a first look into the .png this should be fine will test it in the game this weekend.

@GunChleoc: Which graphics do you mean. I think most of them (if not all) have been discussed in the original branch and the 2 bugs that arose with them will be fixed with this branch. Anyhow if you tell me what to look at I will do so over the weekend.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

now I tested the new "none" resi in the game. It is really getting better now. I have experimented with the hotspot as with the current hotspot the flags of the building help are directly in front of the flagpole. with a hotspot of (0,46) the resi flag is placed on the right side of the build help flag and is much better visible. This could be a setting for all frisian resi in my eyes.

Regarding the little flag of the "none" resi: it looks very good and fits well to the overall frisian resi concept. To make it even better it should be a little brighter cause it has the same brightness as the grey mountains.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4012. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/431547762.
Appveyor build 3809. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_geologist_messages-3809.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

OK, brightened the flag a bit, made the cross slightly darker, and shifted the hotspot for all fri resis as you suggested.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Wow now it looks good in my eyes. And it is clearly visible while still being a good overall design.
Thanks a lot for another feature to have more graphical diversity.

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4014. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/431698863.
Appveyor build 3811. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_geologist_messages-3811.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Agreed, looking good :D

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/immovables/resi/frisians/init.lua'
2--- data/tribes/immovables/resi/frisians/init.lua 2018-09-01 10:50:00 +0000
3+++ data/tribes/immovables/resi/frisians/init.lua 2018-09-24 08:01:14 +0000
4@@ -16,8 +16,8 @@
5
6 animations = {
7 idle = {
8- pictures = { dirname .. "pics/none.png" },
9- hotspot = {2, 49},
10+ pictures = path.list_files(dirname .. "pics/none_?.png"),
11+ hotspot = {0, 46},
12 },
13 }
14 }
15@@ -39,7 +39,7 @@
16 animations = {
17 idle = {
18 pictures = path.list_files(dirname .. "pics/water_?.png"),
19- hotspot = {2, 49},
20+ hotspot = {0, 46},
21 fps = 4,
22 },
23 }
24@@ -62,7 +62,7 @@
25 animations = {
26 idle = {
27 pictures = path.list_files(dirname .. "pics/coal_1_?.png"),
28- hotspot = {2, 49},
29+ hotspot = {0, 46},
30 fps = 4,
31 },
32 }
33@@ -85,7 +85,7 @@
34 animations = {
35 idle = {
36 pictures = path.list_files(dirname .. "pics/gold_1_?.png"),
37- hotspot = {2, 49},
38+ hotspot = {0, 46},
39 fps = 4,
40 },
41 }
42@@ -108,7 +108,7 @@
43 animations = {
44 idle = {
45 pictures = path.list_files(dirname .. "pics/iron_1_?.png"),
46- hotspot = {2, 49},
47+ hotspot = {0, 46},
48 fps = 4,
49 },
50 }
51@@ -131,7 +131,7 @@
52 animations = {
53 idle = {
54 pictures = path.list_files(dirname .. "pics/stones_1_?.png"),
55- hotspot = {2, 49},
56+ hotspot = {0, 46},
57 fps = 4,
58 },
59 }
60@@ -154,7 +154,7 @@
61 animations = {
62 idle = {
63 pictures = path.list_files(dirname .. "pics/coal_2_?.png"),
64- hotspot = {2, 49},
65+ hotspot = {0, 46},
66 fps = 4,
67 },
68 }
69@@ -177,7 +177,7 @@
70 animations = {
71 idle = {
72 pictures = path.list_files(dirname .. "pics/gold_2_?.png"),
73- hotspot = {2, 49},
74+ hotspot = {0, 46},
75 fps = 4,
76 },
77 }
78@@ -200,7 +200,7 @@
79 animations = {
80 idle = {
81 pictures = path.list_files(dirname .. "pics/iron_2_?.png"),
82- hotspot = {2, 49},
83+ hotspot = {0, 46},
84 fps = 4,
85 },
86 }
87@@ -223,7 +223,7 @@
88 animations = {
89 idle = {
90 pictures = path.list_files(dirname .. "pics/stones_2_?.png"),
91- hotspot = {2, 49},
92+ hotspot = {0, 46},
93 fps = 4,
94 },
95 }
96
97=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_1_0.png'
98Binary files data/tribes/immovables/resi/frisians/pics/coal_1_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_0.png 2018-09-24 08:01:14 +0000 differ
99=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_1_1.png'
100Binary files data/tribes/immovables/resi/frisians/pics/coal_1_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_1.png 2018-09-24 08:01:14 +0000 differ
101=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_1_2.png'
102Binary files data/tribes/immovables/resi/frisians/pics/coal_1_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_2.png 2018-09-24 08:01:14 +0000 differ
103=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_1_3.png'
104Binary files data/tribes/immovables/resi/frisians/pics/coal_1_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_3.png 2018-09-24 08:01:14 +0000 differ
105=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_2_0.png'
106Binary files data/tribes/immovables/resi/frisians/pics/coal_2_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_0.png 2018-09-24 08:01:14 +0000 differ
107=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_2_1.png'
108Binary files data/tribes/immovables/resi/frisians/pics/coal_2_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_1.png 2018-09-24 08:01:14 +0000 differ
109=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_2_2.png'
110Binary files data/tribes/immovables/resi/frisians/pics/coal_2_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_2.png 2018-09-24 08:01:14 +0000 differ
111=== modified file 'data/tribes/immovables/resi/frisians/pics/coal_2_3.png'
112Binary files data/tribes/immovables/resi/frisians/pics/coal_2_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_3.png 2018-09-24 08:01:14 +0000 differ
113=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_1_0.png'
114Binary files data/tribes/immovables/resi/frisians/pics/gold_1_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_0.png 2018-09-24 08:01:14 +0000 differ
115=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_1_1.png'
116Binary files data/tribes/immovables/resi/frisians/pics/gold_1_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_1.png 2018-09-24 08:01:14 +0000 differ
117=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_1_2.png'
118Binary files data/tribes/immovables/resi/frisians/pics/gold_1_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_2.png 2018-09-24 08:01:14 +0000 differ
119=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_1_3.png'
120Binary files data/tribes/immovables/resi/frisians/pics/gold_1_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_3.png 2018-09-24 08:01:14 +0000 differ
121=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_2_0.png'
122Binary files data/tribes/immovables/resi/frisians/pics/gold_2_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_0.png 2018-09-24 08:01:14 +0000 differ
123=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_2_1.png'
124Binary files data/tribes/immovables/resi/frisians/pics/gold_2_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_1.png 2018-09-24 08:01:14 +0000 differ
125=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_2_2.png'
126Binary files data/tribes/immovables/resi/frisians/pics/gold_2_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_2.png 2018-09-24 08:01:14 +0000 differ
127=== modified file 'data/tribes/immovables/resi/frisians/pics/gold_2_3.png'
128Binary files data/tribes/immovables/resi/frisians/pics/gold_2_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_3.png 2018-09-24 08:01:14 +0000 differ
129=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_1_0.png'
130Binary files data/tribes/immovables/resi/frisians/pics/iron_1_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_0.png 2018-09-24 08:01:14 +0000 differ
131=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_1_1.png'
132Binary files data/tribes/immovables/resi/frisians/pics/iron_1_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_1.png 2018-09-24 08:01:14 +0000 differ
133=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_1_2.png'
134Binary files data/tribes/immovables/resi/frisians/pics/iron_1_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_2.png 2018-09-24 08:01:14 +0000 differ
135=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_1_3.png'
136Binary files data/tribes/immovables/resi/frisians/pics/iron_1_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_3.png 2018-09-24 08:01:14 +0000 differ
137=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_2_0.png'
138Binary files data/tribes/immovables/resi/frisians/pics/iron_2_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_0.png 2018-09-24 08:01:14 +0000 differ
139=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_2_1.png'
140Binary files data/tribes/immovables/resi/frisians/pics/iron_2_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_1.png 2018-09-24 08:01:14 +0000 differ
141=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_2_2.png'
142Binary files data/tribes/immovables/resi/frisians/pics/iron_2_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_2.png 2018-09-24 08:01:14 +0000 differ
143=== modified file 'data/tribes/immovables/resi/frisians/pics/iron_2_3.png'
144Binary files data/tribes/immovables/resi/frisians/pics/iron_2_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_3.png 2018-09-24 08:01:14 +0000 differ
145=== removed file 'data/tribes/immovables/resi/frisians/pics/none.png'
146Binary files data/tribes/immovables/resi/frisians/pics/none.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/none.png 1970-01-01 00:00:00 +0000 differ
147=== added file 'data/tribes/immovables/resi/frisians/pics/none_0.png'
148Binary files data/tribes/immovables/resi/frisians/pics/none_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/none_0.png 2018-09-24 08:01:14 +0000 differ
149=== added file 'data/tribes/immovables/resi/frisians/pics/none_1.png'
150Binary files data/tribes/immovables/resi/frisians/pics/none_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/none_1.png 2018-09-24 08:01:14 +0000 differ
151=== added file 'data/tribes/immovables/resi/frisians/pics/none_2.png'
152Binary files data/tribes/immovables/resi/frisians/pics/none_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/none_2.png 2018-09-24 08:01:14 +0000 differ
153=== added file 'data/tribes/immovables/resi/frisians/pics/none_3.png'
154Binary files data/tribes/immovables/resi/frisians/pics/none_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/none_3.png 2018-09-24 08:01:14 +0000 differ
155=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_1_0.png'
156Binary files data/tribes/immovables/resi/frisians/pics/stones_1_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_0.png 2018-09-24 08:01:14 +0000 differ
157=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_1_1.png'
158Binary files data/tribes/immovables/resi/frisians/pics/stones_1_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_1.png 2018-09-24 08:01:14 +0000 differ
159=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_1_2.png'
160Binary files data/tribes/immovables/resi/frisians/pics/stones_1_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_2.png 2018-09-24 08:01:14 +0000 differ
161=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_1_3.png'
162Binary files data/tribes/immovables/resi/frisians/pics/stones_1_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_3.png 2018-09-24 08:01:14 +0000 differ
163=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_2_0.png'
164Binary files data/tribes/immovables/resi/frisians/pics/stones_2_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_0.png 2018-09-24 08:01:14 +0000 differ
165=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_2_1.png'
166Binary files data/tribes/immovables/resi/frisians/pics/stones_2_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_1.png 2018-09-24 08:01:14 +0000 differ
167=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_2_2.png'
168Binary files data/tribes/immovables/resi/frisians/pics/stones_2_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_2.png 2018-09-24 08:01:14 +0000 differ
169=== modified file 'data/tribes/immovables/resi/frisians/pics/stones_2_3.png'
170Binary files data/tribes/immovables/resi/frisians/pics/stones_2_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_3.png 2018-09-24 08:01:14 +0000 differ
171=== modified file 'data/tribes/immovables/resi/frisians/pics/water_0.png'
172Binary files data/tribes/immovables/resi/frisians/pics/water_0.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/water_0.png 2018-09-24 08:01:14 +0000 differ
173=== modified file 'data/tribes/immovables/resi/frisians/pics/water_1.png'
174Binary files data/tribes/immovables/resi/frisians/pics/water_1.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/water_1.png 2018-09-24 08:01:14 +0000 differ
175=== modified file 'data/tribes/immovables/resi/frisians/pics/water_2.png'
176Binary files data/tribes/immovables/resi/frisians/pics/water_2.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/water_2.png 2018-09-24 08:01:14 +0000 differ
177=== modified file 'data/tribes/immovables/resi/frisians/pics/water_3.png'
178Binary files data/tribes/immovables/resi/frisians/pics/water_3.png 2018-09-01 10:35:31 +0000 and data/tribes/immovables/resi/frisians/pics/water_3.png 2018-09-24 08:01:14 +0000 differ
179=== modified file 'src/logic/map_objects/tribes/worker.cc'
180--- src/logic/map_objects/tribes/worker.cc 2018-09-10 12:32:56 +0000
181+++ src/logic/map_objects/tribes/worker.cc 2018-09-24 08:01:14 +0000
182@@ -963,7 +963,7 @@
183 position,
184 t.get_resource_indicator(
185 rdescr, (rdescr && rdescr->detectable()) ? position.field->get_resources_amount() : 0),
186- MapObjectDescr::OwnerType::kTribe, nullptr /* owner */);
187+ MapObjectDescr::OwnerType::kTribe, get_owner());
188
189 // Geologist also sends a message notifying the player
190 if (rdescr && rdescr->detectable() && position.field->get_resources_amount()) {
191@@ -971,7 +971,7 @@
192 const std::string message =
193 (boost::format("<div padding_r=10><p><img width=%d src=%s></p></div>"
194 "<div width=*><p><font size=%d>%s</font></p></div>") %
195- width % rdescr->representative_image() % UI_FONT_SIZE_MESSAGE %
196+ width % ri.descr().representative_image_filename() % UI_FONT_SIZE_MESSAGE %
197 _("A geologist found resources."))
198 .str();
199
200@@ -980,7 +980,7 @@
201 get_owner()->add_message_with_timeout(
202 game, std::unique_ptr<Message>(
203 new Message(Message::Type::kGeologists, game.get_gametime(),
204- rdescr->descname(), ri.descr().representative_image_filename(),
205+ rdescr->descname(), rdescr->representative_image(),
206 rdescr->descname(), message, position, serial_, rdescr->name())),
207 rdescr->timeout_ms(), rdescr->timeout_radius());
208 }

Subscribers

People subscribed via source and target branches

to status/vote changes: