Some of the remaining three patches no longer applied cleanly to trunk r9802.  Here are the updated versions (PATCHv6).

(file #20329, file #20330, file #20331)

First 2 patches have been applied and will get in 2.6.1.

Version 4 of the patch series.  This is for trunk r9671.

• file #19862 [PATCHv4 1/6] Adjust what gets drawn in front of what
• file #19863 [PATCHv4 2/6] Move morel graphics higher
• file #19864 [PATCHv4 3/6] Update comments for CUnit::IX, CUnit::IY
• file #19865 [PATCHv4 4/6] Add RandomPosition property of unit types
• file #19866 [PATCHv4 5/6] Add NudgeUnitUnderCursor in the map editor
• file #19867 [PATCHv4 6/6] Randomize positions of trees and morels

This has at least these changes since v3:

• Added a comment about CUnit::IY in sea and air units.
• NudgeUnitUnderCursor saturates IX and IY to signed char.
• NudgeUnitUnderCursor uses sprintf_s, so the message can be translated as a whole.
• Removed some trailing whitespace.

Version 2 of the patch series.

---

File #19830
[PATCHv2 1/6] Adjust what gets drawn in front of what

Make DrawLevelCompare ignore the sprite size and consider only the tiles.  An engineer standing in front of an artil now gets properly drawn in the front, rather than lying below.

The engineer had DrawLevel = 25 specified twice.  Remove the duplicate.

Move morels and rocks from DrawLevel = 2 to DrawLevel = 25 so that people who should be walking behind them don't get drawn in the front.

---

File #19831
[PATCHv2 2/6] Move morel graphics higher

Move the morel graphics up by 16-24 pixels so that the fungi appear to be rooted in the tiles where they are placed, and the position of "unit-destroyed-1x1-place" corpse will match.

---

File #19832
[PATCHv2 3/6] Update comments for CUnit::IX, CUnit::IY

The values can be negative, too.

---

File #19833
[PATCHv2 4/6] Add RandomPosition property of unit types

Make it possible to slightly randomize the positions of individual trees in forests.  The amount of randomness is controlled separately for each unit type, and it defaults to zero.

When a unit dies, preserve CUnit::IX and CUnit::IX for the corpse.

---

File #19834
[PATCHv2 5/6] Add NudgeUnitUnderCursor in the map editor

Shift + arrow keys move the unit under the cursor one pixel at a time.  This is a way to try out coordinates for RandomPosition.

---

File #19835
[PATCHv2 6/6] Randomize positions of trees and morels

RandomPosition = {-6, -6, 6, 6} for trees seems a good balance between making forests look natural and letting the player see which tile each tree is blocking.

---

And finally, a screen shot of lava-river.map with randomly positioned trees.  It looks more natural than before, doesn't it?

A series of two patches.

---

0001-Move-morel-graphics-higher.patch
[PATCH 1/2] Move morel graphics higher

Move the morel graphics up by 12-29 pixels so that the fungi appear to be rooted in the tiles where they are placed.  Leave some variation so it doesn't look like someone has planted them in neat rows.

---

0002-Adjust-what-gets-drawn-in-front-of-what.patch
[PATCH 2/2] Adjust what gets drawn in front of what

Make DrawLevelCompare ignore the sprite size and consider only the tiles.  An engineer standing in front of an artil now gets properly drawn in the front, rather than lying below.

The engineer had DrawLevel = 25 specified twice.  Remove the
duplicate.

Move morels and rocks from DrawLevel = 2 to DrawLevel = 25 so that people who should be walking behind them don't get drawn in the front.

---

presentation.map
setup.sms

These form a map containing several morels so you can load it in the editor and see how Patch 1/2 changes the result.