Remove the <os> element from scenarios

Fix #522
calref · Feb 17, 2025 · 2145d88 · 2145d88
1 parent c6f06ea
commit 2145d88
Show file tree

Hide file tree

Showing 67 changed files with 0 additions and 67 deletions.
diff --git a/rsrc/bases/bladbase/scenario.xml b/rsrc/bases/bladbase/scenario.xml
@@ -25,7 +25,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os>Microsoft Windows 7 Service Pack 1</os>
     </creator>
     <game>
         <num-towns>1</num-towns>

diff --git a/rsrc/scenarios/busywork/scenario.xml b/rsrc/scenarios/busywork/scenario.xml
@@ -40,7 +40,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os>Apple Mac OS X Version 10.7.5 (Build 11G63)</os>
     </creator>
     <game>
         <num-towns>4</num-towns>

diff --git a/rsrc/scenarios/stealth/scenario.xml b/rsrc/scenarios/stealth/scenario.xml
@@ -43,7 +43,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os>Apple Mac OS X Version 10.7.5 (Build 11G63)</os>
     </creator>
     <game>
         <num-towns>21</num-towns>

diff --git a/rsrc/scenarios/valleydy/scenario.xml b/rsrc/scenarios/valleydy/scenario.xml
@@ -40,7 +40,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os>Apple Mac OS X Version 10.7.5 (Build 11G63)</os>
     </creator>
     <game>
         <num-towns>21</num-towns>

diff --git a/rsrc/scenarios/zakhazi/scenario.xml b/rsrc/scenarios/zakhazi/scenario.xml
@@ -43,7 +43,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os>Apple Mac OS X Version 10.7.5 (Build 11G63)</os>
     </creator>
     <game>
         <num-towns>23</num-towns>

diff --git a/rsrc/schemas/readme.md b/rsrc/schemas/readme.md
@@ -162,7 +162,6 @@ the following subtags:
 	format, you would use a different string here to let mainline OBoE know that it's
 	incompatible.
 	* `<version>` - The version of OBoE that the scenario was last edited with.
-	* `<os>` - The operating system on which the scenario was last edited.
 * `<game>` - Contains the bulk of global information about the scenario.
 * `<editor>` - Contains several details of the scenario that aren't relevant to gameplay,
 but are instead used by the scenario editor to enhance your editing experience.

diff --git a/rsrc/schemas/scenario.xsd b/rsrc/schemas/scenario.xsd
@@ -80,7 +80,6 @@
 		<xs:sequence>
 			<xs:element name="type" type="xs:string"/>
 			<xs:element name="version" type="xs:string"/>
-			<xs:element name="os" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="shopEntries">

diff --git a/src/scenedit/scen.fileio.cpp b/src/scenedit/scen.fileio.cpp
@@ -160,7 +160,6 @@ void writeScenarioToXml(ticpp::Printer&& data, cScenario& scenario) {
 	data.OpenElement("creator");
 	data.PushElement("type", "oboe");
 	data.PushElement("version", scenario.format_ed_version());
-	data.PushElement("os", get_os_version());
 	data.CloseElement("creator");
 	data.OpenElement("game");
 	data.PushElement("num-towns", scenario.towns.size());

diff --git a/test/files/scenario/bad_editor_node.xml b/test/files/scenario/bad_editor_node.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/bad_format.xml b/test/files/scenario/bad_format.xml
@@ -26,6 +26,5 @@
     <creator>
         <type>unknown</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
 </scenario>
diff --git a/test/files/scenario/bad_game_node.xml b/test/files/scenario/bad_game_node.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <bad/>

diff --git a/test/files/scenario/bad_graphics1.xml b/test/files/scenario/bad_graphics1.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/bad_graphics2.xml b/test/files/scenario/bad_graphics2.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/bad_graphics3.xml b/test/files/scenario/bad_graphics3.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/bad_graphics4.xml b/test/files/scenario/bad_graphics4.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/bad_graphics5.xml b/test/files/scenario/bad_graphics5.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/bad_snd_name.xml b/test/files/scenario/bad_snd_name.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/bad_townmod1.xml b/test/files/scenario/bad_townmod1.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/bad_townmod2.xml b/test/files/scenario/bad_townmod2.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/bad_townmod3.xml b/test/files/scenario/bad_townmod3.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/bad_townmod4.xml b/test/files/scenario/bad_townmod4.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/extra_teaser.xml b/test/files/scenario/extra_teaser.xml
@@ -27,7 +27,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/intro.xml b/test/files/scenario/intro.xml
@@ -27,7 +27,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/intro_overflow.xml b/test/files/scenario/intro_overflow.xml
@@ -32,7 +32,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/minimal.xml b/test/files/scenario/minimal.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/missing_editor.xml b/test/files/scenario/missing_editor.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/missing_game.xml b/test/files/scenario/missing_game.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game/>
 </scenario>
diff --git a/test/files/scenario/optional.xml b/test/files/scenario/optional.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>3</num-towns>

diff --git a/test/files/scenario/quest-bad_attr.xml b/test/files/scenario/quest-bad_attr.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest-bad_deadline.xml b/test/files/scenario/quest-bad_deadline.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest-bad_elem.xml b/test/files/scenario/quest-bad_elem.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest-bad_reward.xml b/test/files/scenario/quest-bad_reward.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest-extra_bank.xml b/test/files/scenario/quest-extra_bank.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest-missing_elem.xml b/test/files/scenario/quest-missing_elem.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest.xml b/test/files/scenario/quest.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/quest2.xml b/test/files/scenario/quest2.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/rect_bad_attr.xml b/test/files/scenario/rect_bad_attr.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <store-items bad='0'/>

diff --git a/test/files/scenario/rect_missing_bottom.xml b/test/files/scenario/rect_missing_bottom.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <store-items town='0' top='0' left='0' right='10'/>

diff --git a/test/files/scenario/rect_missing_left.xml b/test/files/scenario/rect_missing_left.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <store-items town='0' top='0' bottom='10' right='10'/>

diff --git a/test/files/scenario/rect_missing_right.xml b/test/files/scenario/rect_missing_right.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <store-items town='0' top='0' left='0' bottom='10'/>

diff --git a/test/files/scenario/rect_missing_top.xml b/test/files/scenario/rect_missing_top.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <store-items town='0' left='0' bottom='10' right='10'/>

diff --git a/test/files/scenario/rect_missing_town.xml b/test/files/scenario/rect_missing_town.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.5.3</version>
-        <os></os>
     </creator>
     <game>
         <store-items top='0' left='0' bottom='10' right='10'/>

diff --git a/test/files/scenario/shop-bad_entry.xml b/test/files/scenario/shop-bad_entry.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/shop-bad_item.xml b/test/files/scenario/shop-bad_item.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/shop-bad_node.xml b/test/files/scenario/shop-bad_node.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/shop-bad_spec.xml b/test/files/scenario/shop-bad_spec.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/shop-incomplete_spec.xml b/test/files/scenario/shop-incomplete_spec.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/shop-missing_node.xml b/test/files/scenario/shop-missing_node.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/shop.xml b/test/files/scenario/shop.xml
@@ -26,7 +26,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>

diff --git a/test/files/scenario/special_item-bad_attr.xml b/test/files/scenario/special_item-bad_attr.xml
@@ -22,7 +22,6 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os></os>
     </creator>
     <game>
         <num-towns>0</num-towns>