From c7343fd2f574c651cce68b1b58c429192ecb9ea0 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 23 Aug 2012 18:22:28 +0000
Subject: [PATCH] - Updated the "LayoutMainMenu.xml" files to the new format

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1509 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../TableData/Layout/LayoutMainMenu.xml       | 16 --------
 .../TableData/Layout/LayoutMainMenu.xml       | 39 +++++++------------
 .../Data/TableData/Layout/LayoutMainMenu.xml  | 16 --------
 gamedir/Set JA2UB v1.13 Campaign.ini          | 11 ------
 4 files changed, 13 insertions(+), 69 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Layout/LayoutMainMenu.xml b/gamedir/Data-1.13/TableData/Layout/LayoutMainMenu.xml
index c8f8892b2..632f9c035 100644
--- a/gamedir/Data-1.13/TableData/Layout/LayoutMainMenu.xml
+++ b/gamedir/Data-1.13/TableData/Layout/LayoutMainMenu.xml
@@ -19,11 +19,7 @@ all tags with resolution are now obsolete but not removed for compability with o
 		<uiIndex>0</uiIndex>
 		<Description>Menu Buttons</Description>
 		<MainMenuX>320</MainMenuX>
-		<MainMenu800x600X>400</MainMenu800x600X>
-		<MainMenu1024x768X>512</MainMenu1024x768X>
 		<MainMenuY>210</MainMenuY>
-		<MainMenu800x600Y>270</MainMenu800x600Y>
-		<MainMenu1024x768Y>354</MainMenu1024x768Y>
 		<MainMenuYSpace>37</MainMenuYSpace>
 	</IMAGE>
 <!-- Background Images -->
@@ -32,35 +28,23 @@ all tags with resolution are now obsolete but not removed for compability with o
 		<Visible>1</Visible>
 		<Description>BackGround</Description>
 		<FileName>LOADSCREENS\MainMenuBackground.sti</FileName>
-		<FileName800x600>LOADSCREENS\MainMenuBackground_800x600.sti</FileName800x600>
-		<FileName1024x768>LOADSCREENS\MainMenuBackground_1024x768.sti</FileName1024x768>
 		<FitToScreen>1</FitToScreen>
 		<StretchImage>0</StretchImage>
 		<CenterImage>0</CenterImage>
 		<ImagePositionRelative>0</ImagePositionRelative>
 		<ImagePositionX>0</ImagePositionX>
 		<ImagePositionY>0</ImagePositionY>
-		<ImagePosition800x600X>0</ImagePosition800x600X>
-		<ImagePosition800x600Y>0</ImagePosition800x600Y>
-		<ImagePosition1024x768X>0</ImagePosition1024x768X>
-		<ImagePosition1024x768Y>0</ImagePosition1024x768Y>
 	</IMAGE>
 	<IMAGE>
 		<uiIndex>2</uiIndex>
 		<Visible>1</Visible>
 		<Description>Ja2LogoImage</Description>
 		<FileName>LOADSCREENS\Ja2Logo.sti</FileName>
-		<FileName800x600>LOADSCREENS\Ja2Logo.sti</FileName800x600>
-		<FileName1024x768>LOADSCREENS\Ja2Logo.sti</FileName1024x768>
 		<FitToScreen>0</FitToScreen>
 		<StretchImage>0</StretchImage>
 		<CenterImage>1</CenterImage>
 		<ImagePositionRelative>1</ImagePositionRelative>
 		<ImagePositionX>188</ImagePositionX>
 		<ImagePositionY>70</ImagePositionY>
-		<ImagePosition800x600X>268</ImagePosition800x600X>
-		<ImagePosition800x600Y>70</ImagePosition800x600Y>
-		<ImagePosition1024x768X>380</ImagePosition1024x768X>
-		<ImagePosition1024x768Y>154</ImagePosition1024x768Y>
 	</IMAGE>
 </MAINMENU>
\ No newline at end of file
diff --git a/gamedir/Data-UB/Data-Files/TableData/Layout/LayoutMainMenu.xml b/gamedir/Data-UB/Data-Files/TableData/Layout/LayoutMainMenu.xml
index f78dbb45b..bb24a54a8 100644
--- a/gamedir/Data-UB/Data-Files/TableData/Layout/LayoutMainMenu.xml
+++ b/gamedir/Data-UB/Data-Files/TableData/Layout/LayoutMainMenu.xml
@@ -5,6 +5,13 @@ X800 Y600
 
 ImagePositionXxxx = (X - 640) / 2
 ImagePositionYyyy = (Y - 480) / 2
+
+StretchImage		if 1 the image is stretched to the screen size
+CenterImage		if 1 the image is centered in X
+ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
+
+all tags with resolution are now obsolete but not removed for compability with older versions
+
 -->
 <MAINMENU>
 <!-- Menu Buttons uiIndex = 0 (required!) -->
@@ -12,40 +19,20 @@ ImagePositionYyyy = (Y - 480) / 2
 		<uiIndex>0</uiIndex>
 		<Description>Menu Buttons</Description>
 		<MainMenuX>320</MainMenuX>
-		<MainMenu800x600X>400</MainMenu800x600X>
-		<MainMenu1024x768X>512</MainMenu1024x768X>
 		<MainMenuY>210</MainMenuY>
-		<MainMenu800x600Y>270</MainMenu800x600Y>
-		<MainMenu1024x768Y>354</MainMenu1024x768Y>
 		<MainMenuYSpace>37</MainMenuYSpace>
 	</IMAGE>
-<!-- Optional Image -->
+<!-- Background Images -->
 	<IMAGE>
 		<uiIndex>1</uiIndex>
 		<Visible>1</Visible>
 		<Description>BackGround</Description>
-		<FileName>Interface\MM24Background.sti</FileName>
-		<FileName800x600>Interface\MM24Background_800x600.sti</FileName800x600>
-		<FileName1024x768>Interface\MM24Background_1024x768.sti</FileName1024x768>
+		<FileName>LOADSCREENS\MainMenuBackground.sti</FileName>
+		<FitToScreen>1</FitToScreen>
+		<StretchImage>0</StretchImage>
+		<CenterImage>0</CenterImage>
+		<ImagePositionRelative>0</ImagePositionRelative>
 		<ImagePositionX>0</ImagePositionX>
 		<ImagePositionY>0</ImagePositionY>
-		<ImagePosition800x600X>0</ImagePosition800x600X>
-		<ImagePosition800x600Y>0</ImagePosition800x600Y>
-		<ImagePosition1024x768X>0</ImagePosition1024x768X>
-		<ImagePosition1024x768Y>0</ImagePosition1024x768Y>
-	</IMAGE>
-	<IMAGE>
-		<uiIndex>2</uiIndex>
-		<Visible>1</Visible>
-		<Description>Ja2LogoImage</Description>
-		<FileName>LOADSCREENS\Ja2Logo.sti</FileName>
-		<FileName800x600>LOADSCREENS\Ja2Logo.sti</FileName800x600>
-		<FileName1024x768>LOADSCREENS\Ja2Logo.sti</FileName1024x768>
-		<ImagePositionX>188</ImagePositionX>
-		<ImagePositionY>10</ImagePositionY>
-		<ImagePosition800x600X>268</ImagePosition800x600X>
-		<ImagePosition800x600Y>70</ImagePosition800x600Y>
-		<ImagePosition1024x768X>380</ImagePosition1024x768X>
-		<ImagePosition1024x768Y>154</ImagePosition1024x768Y>
 	</IMAGE>
 </MAINMENU>
\ No newline at end of file
diff --git a/gamedir/Data/TableData/Layout/LayoutMainMenu.xml b/gamedir/Data/TableData/Layout/LayoutMainMenu.xml
index c8f8892b2..632f9c035 100644
--- a/gamedir/Data/TableData/Layout/LayoutMainMenu.xml
+++ b/gamedir/Data/TableData/Layout/LayoutMainMenu.xml
@@ -19,11 +19,7 @@ all tags with resolution are now obsolete but not removed for compability with o
 		<uiIndex>0</uiIndex>
 		<Description>Menu Buttons</Description>
 		<MainMenuX>320</MainMenuX>
-		<MainMenu800x600X>400</MainMenu800x600X>
-		<MainMenu1024x768X>512</MainMenu1024x768X>
 		<MainMenuY>210</MainMenuY>
-		<MainMenu800x600Y>270</MainMenu800x600Y>
-		<MainMenu1024x768Y>354</MainMenu1024x768Y>
 		<MainMenuYSpace>37</MainMenuYSpace>
 	</IMAGE>
 <!-- Background Images -->
@@ -32,35 +28,23 @@ all tags with resolution are now obsolete but not removed for compability with o
 		<Visible>1</Visible>
 		<Description>BackGround</Description>
 		<FileName>LOADSCREENS\MainMenuBackground.sti</FileName>
-		<FileName800x600>LOADSCREENS\MainMenuBackground_800x600.sti</FileName800x600>
-		<FileName1024x768>LOADSCREENS\MainMenuBackground_1024x768.sti</FileName1024x768>
 		<FitToScreen>1</FitToScreen>
 		<StretchImage>0</StretchImage>
 		<CenterImage>0</CenterImage>
 		<ImagePositionRelative>0</ImagePositionRelative>
 		<ImagePositionX>0</ImagePositionX>
 		<ImagePositionY>0</ImagePositionY>
-		<ImagePosition800x600X>0</ImagePosition800x600X>
-		<ImagePosition800x600Y>0</ImagePosition800x600Y>
-		<ImagePosition1024x768X>0</ImagePosition1024x768X>
-		<ImagePosition1024x768Y>0</ImagePosition1024x768Y>
 	</IMAGE>
 	<IMAGE>
 		<uiIndex>2</uiIndex>
 		<Visible>1</Visible>
 		<Description>Ja2LogoImage</Description>
 		<FileName>LOADSCREENS\Ja2Logo.sti</FileName>
-		<FileName800x600>LOADSCREENS\Ja2Logo.sti</FileName800x600>
-		<FileName1024x768>LOADSCREENS\Ja2Logo.sti</FileName1024x768>
 		<FitToScreen>0</FitToScreen>
 		<StretchImage>0</StretchImage>
 		<CenterImage>1</CenterImage>
 		<ImagePositionRelative>1</ImagePositionRelative>
 		<ImagePositionX>188</ImagePositionX>
 		<ImagePositionY>70</ImagePositionY>
-		<ImagePosition800x600X>268</ImagePosition800x600X>
-		<ImagePosition800x600Y>70</ImagePosition800x600Y>
-		<ImagePosition1024x768X>380</ImagePosition1024x768X>
-		<ImagePosition1024x768Y>154</ImagePosition1024x768Y>
 	</IMAGE>
 </MAINMENU>
\ No newline at end of file
diff --git a/gamedir/Set JA2UB v1.13 Campaign.ini b/gamedir/Set JA2UB v1.13 Campaign.ini
index 7fefa7dd5..f33747f52 100644
--- a/gamedir/Set JA2UB v1.13 Campaign.ini	
+++ b/gamedir/Set JA2UB v1.13 Campaign.ini	
@@ -28,14 +28,3 @@ EXE_EDITOR=MapEditor_UB_5423.exe
 Name=None
 CONFIG_MOD1=None
 PROFIL_MOD=Profiles
-;------------------
-;    Campaigns
-;------------------
-
-[Addon1]
-Name=Campaign : SOG Vietnam 69
-CONFIG_MOD1=Data-UB\Addons\Data-Old-UB
-CONFIG_MOD2=Data-UB\Addons\Data-Mod-SOG69-Vietnam
-PROFIL_MOD=Profiles\UserProfile_JA2113_SOG69-Vietnam
-DIR=Data-UB\Addons\Data-Mod-SOG69-Vietnam
-OLD_UB_ITEMS=1
\ No newline at end of file