Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

# Bug fixes

Browse Source 
This was SVN commit r4956.
This commit is contained in:
Matei 2007-03-16 02:57:51 +00:00
parent e0f3507ab1
commit faf8358b3c
3 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
binaries/data/mods/official/gui/test/functions_page_session_status_commands.js
View File

@ -308,7 +308,7 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells)
{ // If it's a list where each element is a value, (entity list)
for ( var i in attribute )
{
listArray[listArray.length] = i;
listArray[listArray.length] = lastPiece(i);
// Store any current quantity in the queue for this object.
// if (attribute[i].quantity)
// listArray[listArray.length].quantity = attribute[i].quantity;
@ -322,9 +322,9 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells)
// If cell sheet for each item is stored in attribute.sheet, transfer that across too.
if (arrayCells == true)
{
console.write (attribute[i].sheet);
//console.write (attribute[i].sheet);
listArray[listArray.length].sheet = new Object(attribute[i].sheet);
console.write (listArray[listArray.length].sheet);
//console.write (listArray[listArray.length].sheet);
}
// Store any current quantity in the queue for this object.
// if (attribute[i].quantity)
@ -418,6 +418,8 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells)
}
break;
default:
var itemName = "?";
//console.write(listArray[createLoop]);
switch (tab)
{
case "selection":
@ -425,11 +427,11 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells)
case "research":
// Get name of item to display in list.
// (These already know the full name of the entity tag, so we don't prefix it.)
var itemName = listArray[createLoop];
itemName = listArray[createLoop];
break;
default:
// Get name of item to display in list.
var itemName = selection[0].traits.id.civ_code + "_" + listArray[createLoop];
itemName = selection[0].traits.id.civ_code + "_" + listArray[createLoop];
break;
}
@ -439,16 +441,22 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells)
{
case "research":
// Store name of tech to display in list in this button's coordinate.
Crd[getCrd (listObject.name, true)].entity = getTechnology(itemName, selection[0].player);
var tech = getTechnology(itemName, selection[0].player);
Crd[getCrd (listObject.name, true)].entity = tech;
// Set tooltip.
listObject.tooltip = Crd[getCrd (listObject.name, true)].entity.generic + " (" + Crd[getCrd (listObject.name, true)].entity.specific + ")";
// Set portrait.
setPortrait (listObject.name,
Crd[getCrd (listObject.name, true)].entity.icon,
"Button",
Crd[getCrd (listObject.name, true)].entity.icon_cell);
if(!tech) {
listObject.tooltip = "Bad tech: " + itemName;
}
else {
// Set tooltip.
listObject.tooltip = Crd[getCrd (listObject.name, true)].entity.generic + " (" + Crd[getCrd (listObject.name, true)].entity.specific + ")";
// Set portrait.
setPortrait (listObject.name,
Crd[getCrd (listObject.name, true)].entity.icon,
"Button",
Crd[getCrd (listObject.name, true)].entity.icon_cell);
}
break;
default:
// Store name of entity to display in list in this button's coordinate.
@ -601,9 +609,12 @@ function refreshCommandButtons()
// Update production lists (both types of Construction, Train). (Tab button, persistent buttons, click them to do things.)
if (validProperty ("selection[0].actions.create.list"))
{
console.write("Got actions.create.list");
listRoot = selection[0].actions.create.list;
for (listTab in listRoot)
{
listTab = lastPiece(listTab);
console.write("Updating " + listTab);
if (listTab != "research") // Do research later.
updateTab (listTab, "production", "Tab", "listRoot[listTab]", "");
}

4
binaries/data/mods/official/gui/test/functions_sim_player.js
View File

@ -62,6 +62,7 @@ function refreshResources ()
var shouldRefresh = false;
for (var currResource in resourcePool)
{
currResource = lastPiece(currResource);
if( oldResources[currResource] != localPlayer.resources[currResource] )
{
oldResources[currResource] = localPlayer.resources[currResource].valueOf();
@ -76,6 +77,7 @@ function refreshResources ()
var resourceCount = 0;
for (var currResource in resourcePool)
{
currResource = lastPiece(currResource);
if(currResource != "housing")
{
// Pass the array index of the resource as the second parameter (as we'll need that to determine the centered screen position of each counter).
@ -94,7 +96,7 @@ function refreshResource (resourceName, resourceIndex)
// Refresh the onscreen counter for a given resource (called to recalculate the size of the coordinates, as these dynamically adjust depending on character length).
// Ensure resource name is title-case.
resourceName = toTitleCase (resourceName);
resourceName = toTitleCase (lastPiece(resourceName));
// Ignore the "Housing" resource ... It doesn't work like normal resources and doesn't have a counter to resize.
if (resourceName == "Housing")

12
binaries/data/mods/official/gui/test/functions_utility.js
View File

@ -78,4 +78,14 @@ function toTitleCase (string)
return (string);
}
// ====================================================================
// ====================================================================
// Get last piece of a dot-separated string
function lastPiece(x) {
var str = ""+x;
var idx = str.lastIndexOf('.');
if(idx >= 0) {
str = str.substring(idx+1, str.length);
}
return str;
}