Entity script changes for per-player templates and an extra sanity check on prepareorder for build.
This was SVN commit r3864.
This commit is contained in:
parent
1e3f5f5d3e
commit
4af9cd2dce
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user