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

Entity script changes for per-player templates and an extra sanity check on prepareorder for build.

Browse Source 
This was SVN commit r3864.
This commit is contained in:
Matei 2006-05-13 22:12:57 +00:00
parent 1e3f5f5d3e
commit 4af9cd2dce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/official/entities/template_entity_script.js
View File

@ -636,7 +636,7 @@ function damage( dmg, inflictor )
inflictor.traits.id.icon_cell++;
// Transmogrify him into his next rank.
inflictor.template = getEntityTemplate(inflictor.traits.promotion.newentity);
inflictor.template = getEntityTemplate(inflictor.traits.promotion.newentity, inflictor.player);
}
}
break;
@ -980,7 +980,7 @@ function entityEventPrepareOrder( evt )
break;
case ACTION_BUILD:
if ( !this.actions.build )
if ( !this.actions.build || !evt.target.building || evt.target.building=="" )
{
evt.preventDefault();
return;