dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-17 13:53:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix a call to DeleteEntityAndReturn with undefined arguments, + some cleanup, refs #2706

Browse source 
This was SVN commit r18532.
This commit is contained in:
mimo 2016-07-19 18:25:31 +00:00
parent 01ff2fb0e0
commit fa7e0c10ba
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
binaries/data/mods/public/simulation/helpers/Transform.js
View file

@ -17,10 +17,10 @@ function ChangeEntityTemplate(oldEnt, newTemplate)
{
if (cmpPosition.IsInWorld())
{
var pos = cmpPosition.GetPosition2D();
let pos = cmpPosition.GetPosition2D();
cmpNewPosition.JumpTo(pos.x, pos.y);
}
var rot = cmpPosition.GetRotation();
let rot = cmpPosition.GetRotation();
cmpNewPosition.SetYRotation(rot.y);
cmpNewPosition.SetXZRotation(rot.x, rot.z);
cmpNewPosition.SetHeightOffset(cmpPosition.GetHeightOffset());
@ -63,7 +63,7 @@ function ChangeEntityTemplate(oldEnt, newTemplate)
var cmpNewUnitAI = Engine.QueryInterface(newEnt, IID_UnitAI);
if (cmpUnitAI && cmpNewUnitAI)
{
var pos = cmpUnitAI.GetHeldPosition();
let pos = cmpUnitAI.GetHeldPosition();
if (pos)
cmpNewUnitAI.SetHeldPosition(pos.x, pos.z);
if (cmpUnitAI.GetStanceName())
@ -85,7 +85,7 @@ function ChangeEntityTemplate(oldEnt, newTemplate)
Engine.DestroyEntity(oldEnt);
return newEnt;
};
}
function CanGarrisonedChangeTemplate(ent, template)
{
@ -116,7 +116,7 @@ function ObstructionsBlockingTemplateChange(ent, templateArg)
// Return false if no ownership as BuildRestrictions.CheckPlacement needs an owner and I have no idea if false or true is better
// Plus there are no real entities without owners currently.
if (!cmpBuildRestrictions || !cmpPosition || !cmpOwnership)
return DeleteEntityAndReturn(previewEntity, cmpPosition, pos, angle, cmpNewPosition, false);
return DeleteEntityAndReturn(previewEntity, cmpPosition, null, null, cmpNewPosition, false);
var pos = cmpPosition.GetPosition2D();
var angle = cmpPosition.GetRotation();
@ -170,36 +170,39 @@ function ObstructionsBlockingTemplateChange(ent, templateArg)
}
return DeleteEntityAndReturn(previewEntity, cmpPosition, pos, angle, cmpNewPosition, false);
};
}
function DeleteEntityAndReturn(ent, cmpPosition, position, angle, cmpNewPosition, ret)
{
// prevent preview from interfering in the world
cmpNewPosition.MoveOutOfWorld();
cmpPosition.JumpTo(position.x, position.y);
cmpPosition.SetYRotation(angle.y);
if (position !== null)
{
cmpPosition.JumpTo(position.x, position.y);
cmpPosition.SetYRotation(angle.y);
}
Engine.DestroyEntity(ent);
return ret;
};
}
function TransferGarrisonedUnits(oldEnt, newEnt)
{
// Transfer garrisoned units if possible, or unload them
var cmpGarrison = Engine.QueryInterface(oldEnt, IID_GarrisonHolder);
var cmpOldGarrison = Engine.QueryInterface(oldEnt, IID_GarrisonHolder);
var cmpNewGarrison = Engine.QueryInterface(newEnt, IID_GarrisonHolder);
if (!cmpNewGarrison || !cmpGarrison || !cmpGarrison.GetEntities().length)
return; // nothing to do as the code will by default unload all.
var garrisonedEntities = cmpGarrison.GetEntities().slice();
for (let j in garrisonedEntities)
for (let ent of garrisonedEntities)
{
var cmpUnitAI = Engine.QueryInterface(garrisonedEntities[j], IID_UnitAI);
cmpGarrison.Eject(garrisonedEntities[j]);
let cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
cmpOldGarrison.Eject(ent);
cmpUnitAI.Autogarrison(newEnt);
cmpNewGarrison.Garrison(garrisonedEntities[j]);
cmpNewGarrison.Garrison(ent);
}
};
}
Engine.RegisterGlobal("ChangeEntityTemplate", ChangeEntityTemplate);
Engine.RegisterGlobal("CanGarrisonedChangeTemplate", CanGarrisonedChangeTemplate);