Index: ps/trunk/binaries/data/mods/public/gui/common/init.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/init.xml	(revision 19779)
+++ ps/trunk/binaries/data/mods/public/gui/common/init.xml	(nonexistent)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>
-
-<!DOCTYPE objects SYSTEM "../gui.dtd">
-
-<objects>
-
-		<!--
-		==========================================
-		- INCLUDE SCRIPT - UTILITY FUNCTIONS
-		==========================================
-		-->
-
-	<script file="gui/common/functions_utility.js" />
-
-	<!--
-	==========================================
-	- INCLUDE SCRIPT - GLOBAL OBJECT FUNCTIONS
-	==========================================
-	-->
-
-	<script file="gui/common/functions_global_object.js" />
-
-</objects>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/init.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/loading/loading.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/loading/loading.xml	(revision 19779)
+++ ps/trunk/binaries/data/mods/public/gui/loading/loading.xml	(revision 19780)
@@ -1,50 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 ==========================================
 - LOADING SCREEN -
 ==========================================
 -->
 <objects>
 
-	<script file="gui/loading/loading.js"/>
+	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_utility_error.js"/>
 
+	<script file="gui/loading/loading.js"/>
+
 	<object type="image" style="ModernWindow">
 
 		<!-- LOADING SCREEN progress bar -->
 		<object size="50%-256 4 50%+256 36" type="image" sprite="LoadingProgressBarBackground">
 			<object name="progressbar"
 				type="progressbar"
 				style="LoadingProgressbar"
 				size="56 5 456 100%-5"
 			>
 				<object name="progressbar_left" size="-8 0 8 100%" type="image" sprite="LoadingProgressBarLeft"/>
 				<object name="progressbar_right" size="8 0 24 100%" type="image" sprite="LoadingProgressBarRight"/>
 				<action on="Progress">displayProgress();</action>
 				<object name="progressText" size="0 0 100% 100%" type="text" style="LoadingBarText"/>
 			</object>
 		</object>
 
 		<!-- LOADING SCREEN TEXT -->
 		<object name="loadingMapName" size="50%-256 36 50%+256 50%-196" type="text" style="LargeTitleText"/>
 
 		<!-- LOADING SCREEN TIP IMAGE-->
 		<object size="50%-452 50%-196 50%+68 50%+196" type="image" sprite="LoadingTipImage">
 			<object name="tipImage" size="4 4 516 516" type="image">
 				<object name="tipImageCover" size="0 0 100% 100%" type="image" sprite="LoadingTipImageCover"/>
 			</object>
 		</object>
 
 		<!-- LOADING SCREEN TIP TEXT-->
 		<object size="50%+128 50%-193 50%+448 50%+193" type="image" sprite="LoadingTipText">
 			<object name="tipTitle" size="30 30 100% 50" type="text" style="LoadingTipTitleText"/>
 			<object name="tipText" size="30 50 100%-30 100%" type="text" style="LoadingTipText"/>
 		</object>
 
 		<!-- LOADING SCREEN QUOTE (needs increased z value to overcome the transparent area of the tip image above it -->
 		<object size="50%-448 50%+230 50%+448 100%-16" z="20">
 			<object name="quoteText" size="0 0 100% 100%" type="text" style="LoadingText"/>
 		</object>
 	</object>
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/options/options.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.xml	(revision 19779)
+++ ps/trunk/binaries/data/mods/public/gui/options/options.xml	(revision 19780)
@@ -1,107 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 ==========================================
 - Options Window -
 ==========================================
 -->
 
 <objects>
+	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/options/options.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
 
 	<!-- Settings Window -->
 	<object name="options" type="image" style="ModernDialog" size="50%-476 50%-316 50%+476 50%+316">
 		<object style="ModernLabelText" type="text" size="50%-128 -16 50%+128 16">
 			<translatableAttribute id="caption">Game Options</translatableAttribute>
 		</object>
 		<object name="GeneralSettings" type="image" sprite="ModernDarkBoxGold" size="16 16 332 100%-52">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">General</translatableAttribute>
 			</object>
 			<repeat count="23">
 				<object name="generalSetting[n]" size="0 25 100% 50" hidden="true">
 					<object name="generalSettingLabel[n]" size="0 0 65% 100%" type="text" style="ModernLabelText" text_align="left"/>
 					<object name="generalSettingTickbox[n]" size="90% 5 100% 100%+5" type="checkbox" style="ModernTickBox" hidden="true"/>
 					<object name="generalSettingInput[n]" size="70% 0 100%-8 100%" type="input" style="ModernInput" hidden="true"/>
 					<object name="generalSettingDropdown[n]" size="70% 0 100%-8 100%" type="dropdown" style="ModernDropDown" hidden="true"/>
 				</object>
 			</repeat>
 		</object>
 		<object name="GraphicsSettings" type="image" sprite="ModernDarkBoxGold" size="340 16 632 100%-52">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Graphics Settings</translatableAttribute>
 			</object>
 			<repeat count="21">
 				<object name="graphicsSetting[n]" size="0 25 100% 50" hidden="true">
 					<object name="graphicsSettingLabel[n]" size="0 0 65% 100%" type="text" style="ModernLabelText" text_align="left"/>
 					<object name="graphicsSettingTickbox[n]" size="90% 5 100% 100%+5" type="checkbox" style="ModernTickBox" hidden="true"/>
 					<object name="graphicsSettingSlider[n]" size="70% 0 100%-8 100%" type="slider" style="ModernSlider" hidden="true"/>
 					<object name="graphicsSettingInput[n]" size="70% 0 100%-8 100%" type="input" style="ModernInput" hidden="true"/>
 					<object name="graphicsSettingDropdown[n]" size="70% 0 100%-8 100%" type="dropdown" style="ModernDropDown" hidden="true"/>
 				</object>
 			</repeat>
 		</object>
 		<object name="SoundSettings" type="image" sprite="ModernDarkBoxGold" size="640 16 936 40%">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Sound Settings</translatableAttribute>
 			</object>
 			<repeat count="10">
 				<object name="soundSetting[n]" size="0 25 100% 50" hidden="true">
 					<object name="soundSettingLabel[n]" size="0 0 65% 100%" type="text" style="ModernLabelText" text_align="left"/>
 					<object name="soundSettingTickbox[n]" size="90% 5 100% 100%+5" type="checkbox" style="ModernTickBox" hidden="true"/>
 					<object name="soundSettingSlider[n]" size="70% 0 100%-8 100%" type="slider" style="ModernSlider" hidden="true"/>
 					<object name="soundSettingDropdown[n]" size="70% 0 100%-8 100%" type="dropdown" style="ModernDropDown" hidden="true"/>
 				</object>
 			</repeat>
 		</object>
 		<object name="LobbySettings" type="image" sprite="ModernDarkBoxGold" size="640 40%+8 936 65%">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Lobby Settings</translatableAttribute>
 			</object>
 			<repeat count="5">
 				<object name="lobbySetting[n]" size="0 25 100% 50" hidden="true">
 					<object name="lobbySettingLabel[n]" size="0 0 65% 100%" type="text" style="ModernLabelText" text_align="left"/>
 					<object name="lobbySettingTickbox[n]" size="90% 5 100% 100%+5" type="checkbox" style="ModernTickBox" hidden="true"/>
 					<object name="lobbySettingInput[n]" size="70% 0 100%-8 100%" type="input" style="ModernInput" hidden="true"/>
 					<object name="lobbySettingDropdown[n]" size="70% 0 100%-8 100%" type="dropdown" style="ModernDropDown" hidden="true"/>
 				</object>
 			</repeat>
 		</object>
 		<object name="NotificationsSettings" type="image" sprite="ModernDarkBoxGold" size="640 65%+8 936 100%-52">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Chat Notification Settings</translatableAttribute>
 			</object>
 			<repeat count="10">
 				<object name="notificationSetting[n]" size="0 25 100% 50" hidden="true">
 					<object name="notificationSettingLabel[n]" size="0 0 65% 100%" type="text" style="ModernLabelText" text_align="left"/>
 					<object name="notificationSettingTickbox[n]" size="90% 5 100% 100%+5" type="checkbox" style="ModernTickBox" hidden="true"/>
 					<object name="notificationSettingInput[n]" size="70% 0 100%-8 100%" type="input" style="ModernInput" hidden="true"/>
 					<object name="notificationSettingDropdown[n]" size="50% 0 100%-8 100%" type="dropdown" style="ModernDropDown" hidden="true"/>
 				</object>
 			</repeat>
 		</object>
 		<object type="button" style="ModernButtonRed" size="50%-236 100%-44 50%-136 100%-16">
 			<translatableAttribute id="caption">Reset</translatableAttribute>
 			<translatableAttribute id="tooltip">Resets user settings to their game default</translatableAttribute>
 			<action on="Press">setDefaults();</action>
 		</object>
 		<object name="revertChanges" type="button" style="ModernButtonRed" size="50%-104 100%-44 50%-4 100%-16">
 			<translatableAttribute id="caption">Revert</translatableAttribute>
 			<translatableAttribute id="tooltip">Reverts to previous saved settings</translatableAttribute>
 			<action on="Press">revertChanges();</action>
 		</object>
 		<object name="saveChanges" type="button" style="ModernButtonRed" size="50%+4 100%-44 50%+104 100%-16">
 			<translatableAttribute id="caption">Save</translatableAttribute>
 			<translatableAttribute id="tooltip">Saves changes</translatableAttribute>
 			<action on="Press">saveChanges();</action>
 		</object>
 		<object type="button" style="ModernButtonRed" size="50%+136 100%-44 50%+236 100%-16">
 			<translatableAttribute id="caption">Close</translatableAttribute>
 			<translatableAttribute id="tooltip">Unsaved changes affect this session only</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
 	</object>
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/page_loading.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/page_loading.xml	(revision 19779)
+++ ps/trunk/binaries/data/mods/public/gui/page_loading.xml	(revision 19780)
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
 	<include>common/modern/setup.xml</include>
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
-	<include>common/init.xml</include>
 
 	<include>loading/styles.xml</include>
 	<include>loading/sprites.xml</include>
 	<include>loading/loading.xml</include>
 	<include>common/global.xml</include>
 </page>
Index: ps/trunk/binaries/data/mods/public/gui/page_options.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/page_options.xml	(revision 19779)
+++ ps/trunk/binaries/data/mods/public/gui/page_options.xml	(revision 19780)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
 	<include>common/modern/setup.xml</include>
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
-	<include>common/init.xml</include>
 	<include>common/global.xml</include>
 
 	<include>options/options.xml</include>
 </page>
Index: ps/trunk/binaries/data/mods/public/gui/page_pregame.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/page_pregame.xml	(revision 19779)
+++ ps/trunk/binaries/data/mods/public/gui/page_pregame.xml	(revision 19780)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
 	<include>common/modern/setup.xml</include>
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
 	<include>common/setup.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
-	<include>common/init.xml</include>
 
 	<include>pregame/backgrounds/</include>
 	<include>pregame/sprites.xml</include>
 	<include>pregame/styles.xml</include>
 	<include>pregame/mainmenu.xml</include>
 	<include>common/global.xml</include>
 </page>