mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
Remove <type> from minimap schema and templates
The <minimap> element in resource templates previously included a <type> child element that was required by CCmpMinimap.cpp. This commit removes the <type> field from the minimap schema in CCmpMinimap.cpp and from all affected templates, making the minimap component resource-agnostic and simplifying template definitions. Refs: #8170
This commit is contained in:
committed by
Nicolas Auvray
parent
4716a230ab
commit
56d7be5334
@@ -19,7 +19,6 @@
|
||||
<Undeletable>true</Undeletable>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>structure</Type>
|
||||
<Icon size="16.0">other.png</Icon>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
<Undeletable>true</Undeletable>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>structure</Type>
|
||||
<Icon size="16.0">other.png</Icon>
|
||||
</Minimap>
|
||||
<Researcher>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Tooltip>Catch fish for food.</Tooltip>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>food</Type>
|
||||
<Color r="227" g="130" b="141"/>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Icon>gaia/flora_bush_berry.png</Icon>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>food</Type>
|
||||
<Color r="155" g="204" b="102"/>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Icon>gaia/geology_metal.png</Icon>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>metal</Type>
|
||||
<Color r="227" g="159" b="12"/>
|
||||
<Icon size="16.0">metal.png</Icon>
|
||||
</Minimap>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Icon>gaia/geology_stone.png</Icon>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>stone</Type>
|
||||
<Color r="170" g="170" b="170"/>
|
||||
<Icon size="16.0">stone.png</Icon>
|
||||
</Minimap>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Icon>gaia/geology_stone.png</Icon>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>stone</Type>
|
||||
<Color r="128" g="128" b="128"/>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Icon>gaia/special_treasure.png</Icon>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>metal</Type>
|
||||
<Color r="250" g="250" b="250"/>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<Icon>gaia/flora_tree_generic.png</Icon>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>wood</Type>
|
||||
<Color r="69" g="107" b="68"/>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
</Loot>
|
||||
<Looter/>
|
||||
<Minimap>
|
||||
<Type>structure</Type>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
<Active>true</Active>
|
||||
|
||||
-1
@@ -85,7 +85,6 @@
|
||||
<metal>50</metal>
|
||||
</Loot>
|
||||
<Minimap>
|
||||
<Type>structure</Type>
|
||||
<Icon size="16.0">civil_centre.png</Icon>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -50,7 +50,6 @@
|
||||
<metal>200</metal>
|
||||
</Loot>
|
||||
<Minimap>
|
||||
<Type>structure</Type>
|
||||
<Icon size="16.0">wonder.png</Icon>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
</Identity>
|
||||
<Looter/>
|
||||
<Minimap>
|
||||
<Type>unit</Type>
|
||||
</Minimap>
|
||||
<Obstruction>
|
||||
<Unit/>
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
</Identity>
|
||||
<Loot disable=""/>
|
||||
<Minimap>
|
||||
<Type>food</Type>
|
||||
<Color r="227" g="130" b="141"/>
|
||||
</Minimap>
|
||||
<Position>
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
<metal>25</metal>
|
||||
</Loot>
|
||||
<Minimap>
|
||||
<Type>hero</Type>
|
||||
</Minimap>
|
||||
<Selectable>
|
||||
<Overlay>
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
<GenericName>Support</GenericName>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>support</Type>
|
||||
</Minimap>
|
||||
<Position>
|
||||
<Anchor>upright</Anchor>
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
<metal>10</metal>
|
||||
</Loot>
|
||||
<Minimap>
|
||||
<Type>hero</Type>
|
||||
</Minimap>
|
||||
<Position>
|
||||
<TurnRate>8</TurnRate>
|
||||
|
||||
@@ -69,18 +69,6 @@ public:
|
||||
static std::string GetSchema()
|
||||
{
|
||||
return
|
||||
"<element name='Type'>"
|
||||
"<choice>"
|
||||
"<value>food</value>"
|
||||
"<value>wood</value>"
|
||||
"<value>stone</value>"
|
||||
"<value>metal</value>"
|
||||
"<value>structure</value>"
|
||||
"<value>unit</value>"
|
||||
"<value>support</value>"
|
||||
"<value>hero</value>"
|
||||
"</choice>"
|
||||
"</element>"
|
||||
"<optional>"
|
||||
"<element name='Color'>"
|
||||
"<attribute name='r'>"
|
||||
|
||||
Reference in New Issue
Block a user