mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-12 02:36:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix soundGroup paths for "lumbering"

Browse Source 
*.js: update constants to their new values as defined by dacian's
netcode

This was SVN commit r6031.
This commit is contained in:
janwas
2008-06-16 18:41:19 +00:00
parent 028a92375f
commit 67d43e45ab
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/official/audio/groups/lumbering.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<Threshold>1</Threshold>
<Decay>3</Decay>
<Replacement>chop_20.ogg</Replacement>
<Path>/audio/resource/lumbering/</Path>
<Path>audio/resource/lumbering/</Path>
<Sound>chop_10.ogg</Sound>
<Sound>chop_11.ogg</Sound>
<Sound>chop_12.ogg</Sound>
binaries/data/mods/official/entities/template_unit_infantry.xml
+1 -1
View File
@@ -102,7 +102,7 @@
<Walk>infantry_walk.xml</Walk>
<Run>infantry_run.xml</Run>
<Death>male_death.xml</Death>
<Gather_Wood>chopping.xml</Gather_Wood>
<Gather_Wood>audio/resource/lumbering/lumbering.xml</Gather_Wood>
<Gather_Stone>mining.xml</Gather_Stone>
</SoundGroups>
binaries/data/mods/official/gui/test/functions_page_session_status_commands.js
+4 -4
View File
@@ -480,11 +480,11 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells)
{
case "train":
// TODO: Remove this item from the production queue if right-clicked.
issueCommand(selection, true, NMT_Produce, PRODUCTION_TRAIN, ""+(Crd[getCrd (this.name, true)].entity));
issueCommand(selection, true, NMT_PRODUCE, PRODUCTION_TRAIN, ""+(Crd[getCrd (this.name, true)].entity));
break;
case "research":
// TODO: Remove this item from the production queue if right-clicked.
issueCommand(selection, true, NMT_Produce, PRODUCTION_RESEARCH, ""+(Crd[getCrd (this.name, true)].entity.name));
issueCommand(selection, true, NMT_PRODUCE, PRODUCTION_RESEARCH, ""+(Crd[getCrd (this.name, true)].entity.name));
break;
case "barter":
// Buy a quantity of this resource if left-clicked.
@@ -1024,7 +1024,7 @@ console.write (snStatusPaneCommand[tab][list].type);
setCursor ("action-patrol");
selectLocation(
function (x, y) {
issueCommand (selection, NMT_Patrol, x, y);
issueCommand (selection, NMT_PATROL, x, y);
}
);
break;
@@ -1032,7 +1032,7 @@ console.write (snStatusPaneCommand[tab][list].type);
setCursor ("action-attack");
selectEntity(
function (target) {
issueCommand (selection, NMT_AttackMelee, target);
issueCommand (selection, NMT_ATTACK_MELEE, target);
}
);
break;
binaries/data/mods/official/gui/test/functions_sim_entity.js
+7 -7
View File
@@ -49,22 +49,22 @@ function worldClickHandler(event)
switch (cmd)
{
// location target commands
case NMT_Goto:
case NMT_Run:
case NMT_Patrol:
case NMT_GOTO:
case NMT_RUN:
case NMT_PATROL:
if (event.queued)
{
cmd = NMT_AddWaypoint;
cmd = NMT_ADD_WAYPOINT;
}
args[0]=event.x;
args[1]=event.y;
break;
case NMT_AddWaypoint:
case NMT_ADD_WAYPOINT:
args[0]=event.x;
args[1]=event.y;
break;
// entity target commands
case NMT_Generic:
case NMT_GENERIC:
args[0]=event.entity;
if ( event.clicks == 1)
args[1]=event.action;
@@ -72,7 +72,7 @@ function worldClickHandler(event)
args[1]=event.secondaryAction;
break;
//TODO: get rid of order() calls.
case NMT_NotifyRequest:
case NMT_NOTIFY_REQUEST:
if (event.clicks == 1)
action = event.action;
else
binaries/data/mods/official/scripts/entity_functions.js
+12 -12
View File
@@ -1174,14 +1174,14 @@ function entityEventTargetChanged( evt )
return;
}
evt.defaultOrder = NMT_Goto;
evt.defaultOrder = NMT_GOTO;
evt.defaultCursor = "arrow-default";
evt.defaultAction = ACTION_NONE;
evt.secondaryAction = ACTION_NONE;
evt.secondaryCursor = "arrow-default";
if ( this.actions && this.actions.run && this.actions.run.speed > 0 )
{
evt.secondaryOrder = NMT_Run;
evt.secondaryOrder = NMT_RUN;
}
if( evt.target && this.actions )
@@ -1191,11 +1191,11 @@ function entityEventTargetChanged( evt )
evt.target.traits.health &&
evt.target.traits.health.max != 0 )
{
evt.defaultOrder = NMT_Generic;
evt.defaultOrder = NMT_GENERIC;
evt.defaultAction = this.getAttackAction( evt.target );
evt.defaultCursor = "action-attack";
evt.secondaryOrder = NMT_Generic;
evt.secondaryOrder = NMT_GENERIC;
evt.secondaryAction = this.getAttackAction( evt.target );
evt.secondaryCursor = "action-attack";
}
@@ -1208,8 +1208,8 @@ function entityEventTargetChanged( evt )
if (evt.target.actions.move)
{
//Send an empty order
evt.defaultOrder = NMT_NotifyRequest;
evt.secondaryOrder = NMT_NotifyRequest;
evt.defaultOrder = NMT_NOTIFY_REQUEST;
evt.secondaryOrder = NMT_NOTIFY_REQUEST;
evt.defaultAction = NOTIFY_ESCORT;
evt.secondaryAction = NOTIFY_ESCORT;
@@ -1218,12 +1218,12 @@ function entityEventTargetChanged( evt )
if ( canGather( this, evt.target ) )
{
evt.defaultOrder = NMT_Generic;
evt.defaultOrder = NMT_GENERIC;
evt.defaultAction = ACTION_GATHER;
// Set cursor (eg "action-gather-fruit").
evt.defaultCursor = "action-gather-" + evt.target.traits.supply.subType;
evt.secondaryOrder = NMT_Generic;
evt.secondaryOrder = NMT_GENERIC;
evt.secondaryAction = ACTION_GATHER;
// Set cursor (eg "action-gather-fruit").
evt.secondaryCursor = "action-gather-" + evt.target.traits.supply.subType;
@@ -1231,22 +1231,22 @@ function entityEventTargetChanged( evt )
if ( canBuild( this, evt.target ) )
{
evt.defaultOrder = NMT_Generic;
evt.defaultOrder = NMT_GENERIC;
evt.defaultAction = ACTION_BUILD;
evt.defaultCursor = "action-build";
evt.secondaryOrder = NMT_Generic;
evt.secondaryOrder = NMT_GENERIC;
evt.secondaryAction = ACTION_BUILD;
evt.secondaryCursor = "action-build";
}
if ( canRepair( this, evt.target ) )
{
evt.defaultOrder = NMT_Generic;
evt.defaultOrder = NMT_GENERIC;
evt.defaultAction = ACTION_REPAIR;
evt.defaultCursor = "action-build";
evt.secondaryOrder = NMT_Generic;
evt.secondaryOrder = NMT_GENERIC;
evt.secondaryAction = ACTION_REPAIR;
evt.secondaryCursor = "action-build";
}