forked from 0ad/0ad
Cleaned up loading files
Changed single player start game text This was SVN commit r8735.
This commit is contained in:
parent
e53616f857
commit
c922912ac5
@ -35,7 +35,7 @@ function init(data)
|
||||
}
|
||||
|
||||
// Set tip image
|
||||
getGUIObjectByName("loadingTipImage").sprite = sprite;
|
||||
getGUIObjectByName("tipImage").sprite = sprite;
|
||||
|
||||
// Set tip text
|
||||
if (tipText)
|
||||
@ -43,8 +43,8 @@ function init(data)
|
||||
var index = tipText.indexOf("\n");
|
||||
tipTextTitle = tipText.substring(0, index);
|
||||
tipTextMessage = tipText.substring(index);
|
||||
getGUIObjectByName("loadingTipTitle").caption = tipTextTitle? tipTextTitle : "";
|
||||
getGUIObjectByName("loadingTipText").caption = tipTextMessage? tipTextMessage : "";
|
||||
getGUIObjectByName("tipTitle").caption = tipTextTitle? tipTextTitle : "";
|
||||
getGUIObjectByName("tipText").caption = tipTextMessage? tipTextMessage : "";
|
||||
}
|
||||
|
||||
// janwas: main loop now sets progress / description, but that won't
|
||||
@ -56,37 +56,35 @@ function init(data)
|
||||
switch (data.attribs.mapType)
|
||||
{
|
||||
case "scenario":
|
||||
//ldTitleBar.caption = "Loading Scenario";
|
||||
loadingMapName.caption = "Loading \"" + mapName + "\"";
|
||||
break;
|
||||
|
||||
case "random":
|
||||
//ldTitleBar.caption = "Loading Random Map";
|
||||
loadingMapName.caption = "Generating \"" + mapName + "\"";
|
||||
break;
|
||||
|
||||
default:
|
||||
error("Unkown map type: "+data.attribs.mapType);
|
||||
error("Unkown map type: " + data.attribs.mapType);
|
||||
}
|
||||
}
|
||||
|
||||
getGUIObjectByName("progressText").caption = "";
|
||||
getGUIObjectByName("progressBar").caption = 0;
|
||||
getGUIObjectByName("progressbar").caption = 0;
|
||||
|
||||
// Pick a random quote of the day (each line is a separate tip).
|
||||
var quoteArray = readFileLines("gui/text/quotes.txt");
|
||||
getGUIObjectByName("loadingQuoteText").caption = quoteArray[getRandom(0, quoteArray.length-1)];
|
||||
getGUIObjectByName("quoteText").caption = quoteArray[getRandom(0, quoteArray.length-1)];
|
||||
}
|
||||
|
||||
// ====================================================================
|
||||
function displayProgress()
|
||||
{
|
||||
getGUIObjectByName("progressBar").caption = g_Progress; // display current progress
|
||||
getGUIObjectByName("progressbar").caption = g_Progress; // display current progress
|
||||
getGUIObjectByName("progressText").caption = g_LoadDescription; // display current progess details
|
||||
|
||||
// Keep curved right edge of progress bar in sync with the rest of the progress bar
|
||||
var middle = getGUIObjectByName("progressBar");
|
||||
var rightSide = getGUIObjectByName("loadingProgressbar_right");
|
||||
var middle = getGUIObjectByName("progressbar");
|
||||
var rightSide = getGUIObjectByName("progressbar_right");
|
||||
|
||||
var middleLength = middle.size.right - middle.size.left;
|
||||
var increment = Math.round(g_Progress*middleLength/100);
|
||||
|
@ -15,15 +15,15 @@
|
||||
<object size="50%-400 30 50%+400 150">
|
||||
<object name="loadingMapName" size="0 0 100% 32" type="text" style="loadingPageTitleText"/>
|
||||
|
||||
<!-- LOADING SCREEN PROGRESSBAR -->
|
||||
<object size="50%-256 48 50%+256 80" type="image" sprite="loadingBarBackground">
|
||||
<object name="progressBar"
|
||||
<!-- LOADING SCREEN progressbar -->
|
||||
<object size="50%-256 48 50%+256 80" type="image" sprite="loadingProgressBarBackground">
|
||||
<object name="progressbar"
|
||||
type="progressbar"
|
||||
style="loadingProgressBar"
|
||||
style="loadingProgressbar"
|
||||
size="56 5 456 100%-5"
|
||||
>
|
||||
<object name="loadingProgressbar_left" size="0%-12 0 0 100%" type="image" sprite="loadingProgressbar_left"/>
|
||||
<object name="loadingProgressbar_right" size="0 0 12 100%" type="image" sprite="loadingProgressbar_right"/>
|
||||
<object name="progressbar_left" size="0%-12 0 0 100%" type="image" sprite="loadingProgressbar_left"/>
|
||||
<object name="progressbar_right" size="0 0 12 100%" type="image" sprite="loadingProgressbar_right"/>
|
||||
<action on="Progress">displayProgress();</action>
|
||||
</object>
|
||||
</object>
|
||||
@ -34,21 +34,21 @@
|
||||
|
||||
<!-- LOADING SCREEN TIP IMAGE-->
|
||||
<object size="50%-452 50%-196 50%+68 50%+196" type="image" sprite="loadingTipImage">
|
||||
<object name="loadingTipImage" size="4 4 516 516" type="image">
|
||||
<object name="loadingTipImageCover" size="0 0 100% 100%" type="image" sprite="loadingTipImageCover"/>
|
||||
<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="loadingTipTitle" size="30 30 100% 50" type="text" style="loadingTipTitleText"/>
|
||||
<object name="loadingTipText" size="30 50 100%-30 100%" type="text" style="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="loadingQuoteTitleText" size="0 0 100% 30" type="text" style="loadingTitleText">Quote of the Day:</object>
|
||||
<object name="loadingQuoteText" size="0 30 100% 100%" type="text" style="loadingText"></object>
|
||||
<object name="quoteTitleText" size="0 0 100% 30" type="text" style="loadingTitleText">Quote of the Day:</object>
|
||||
<object name="quoteText" size="0 30 100% 100%" type="text" style="loadingText"></object>
|
||||
</object>
|
||||
|
||||
</objects>
|
||||
|
@ -63,7 +63,7 @@
|
||||
</sprite>
|
||||
|
||||
<!-- PROGRESS BAR BACKGROUND-->
|
||||
<sprite name="loadingBarBackground">
|
||||
<sprite name="loadingProgressBarBackground">
|
||||
<image
|
||||
texture="loading/progressbar/progressbar_background_left.png"
|
||||
size="0%+0 0% 64 0%+32"
|
||||
|
@ -44,7 +44,7 @@
|
||||
text_valign="top"
|
||||
/>
|
||||
|
||||
<style name="loadingProgressBar"
|
||||
<style name="loadingProgressbar"
|
||||
sprite_bar="loadingProgressbar_middle"
|
||||
ghost="true"
|
||||
tooltip_style="snToolTip"
|
||||
|
@ -120,7 +120,7 @@ Watch for updates or get involved in the development: http://wildfiregames.com/0
|
||||
size="51.8554688% 22.9166667% 68.359375% 43.2291667%"
|
||||
sprite_over="pgSinglePlayerOver"
|
||||
sprite_disabled="pgSinglePlayerDisabled"
|
||||
tooltip="Want to move some Dudes around or test something? Click here to start a new game on the default map."
|
||||
tooltip="Click here to start a new single player game. (There is no computer opponent currently available.)"
|
||||
>
|
||||
<action on="Press"><![CDATA[
|
||||
// Open Session Setup window.
|
||||
|
Loading…
Reference in New Issue
Block a user